From f0fb3407d2bac6523f0f293d18642393ba3c2a7c Mon Sep 17 00:00:00 2001
From: Luna <rinnray@gliroid.com>
Date: Thu, 25 Aug 2022 17:35:43 +0200
Subject: [PATCH 001/884] Fixed Doom acario theme (#3533) (#3539)

Changed the `namespace` style to fix the issue (#3533).

I also made the theme look a little closer to how it looks in Emacs, I did however opt to still have it slightly different as I found it easier to read with my port than on the original in Emacs.
I also sorted most keys (mainly from line 8 to 28) for the theme to be in alphabetical order, so it's easier to have a quick glance where they are.
---
 runtime/themes/doom_acario_dark.toml | 61 +++++++++++++++-------------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/runtime/themes/doom_acario_dark.toml b/runtime/themes/doom_acario_dark.toml
index 5fb8272f..ba7c28e8 100644
--- a/runtime/themes/doom_acario_dark.toml
+++ b/runtime/themes/doom_acario_dark.toml
@@ -2,38 +2,42 @@
 #
 # This was made based on
 # https://github.com/doomemacs/themes/blob/master/themes/doom-acario-dark-theme.el
-# I've done my best to make it work completely, but there's still some things that differ from the emacs version.
+# I've done my best to make it look like the Emacs theme, there are still things that looks different from the original.
+# But I've decided to keep it like that as I found it to be easier to read when there's a lot going on i.e lots of variables, strings and functions close to each other.
 
-type = { fg = 'blue' }
-constructor = { fg = 'red' }
-constant = { fg = 'magenta' }
-'constant.numeric' = { fg = 'orange' }
-string = { fg = 'green' }
-comment = { fg = 'gray', modifiers = ['italic'] }
+'attribute' = { fg = 'blue' }
+'comment' = { fg = 'gray', modifiers = ['italic'] }
 'comment.block' = { fg = 'green', modifiers = ['italic'] }
 'comment.block.documentation' = { fg = 'green', modifiers = ['italic'] }
-variable = { fg = 'cyan' }
-'variable.parameter' = { fg = 'blue' }
-label = { fg = 'green' }
-keyword = { fg = 'red' }
-operator = { fg = 'blue' }
-function = { fg = 'yellow' }
-tag = { fg = 'cyan' }
-attribute = { fg = 'blue' }
-attribute = { fg = 'blue' }
-namespace = { fg = 'red' }
+'constant' = { fg = 'magenta' }
+'constant.numeric' = { fg = 'orange' }
+'constructor' = { fg = 'red' }
+'function' = { fg = 'yellow' }
+'function.builtin' = { fg = 'blue' }
+'function.method' = { fg = 'white' }
+'keyword' = { fg = 'red' }
+'label' = { fg = 'green' }
+'namespace' = { fg = 'white' }
+'operator' = { fg = 'blue' }
+'punctuation.bracket' = { fg = 'blue' }
+'punctuation.delimiter' = { fg = 'white', modifiers = ['bold'] }
+'string' = { fg = 'green' }
+'tag' = { fg = 'cyan' }
+'type' = { fg = 'blue' }
+'variable' = { fg = 'cyan' }
+'variable.parameter' = { fg = 'white' }
 
+'markup.bold' = { fg = 'orange', modifiers = ['bold'] }
+'markup.italic' = { fg = 'magenta', modifiers = ['italic'] }
 'markup.heading' = { fg = 'red' }
-'markup.list' = { fg = 'red' }
-'markup.raw.inline' = { fg = 'green', bg = 'base4' }
-'markup.raw.block' = { fg = 'green', bg = 'base4' }
-'markup.link' = { fg = 'orange' } 
+'markup.link' = { fg = 'orange' }
 'markup.link.url' = { fg = 'magenta' }
 'markup.link.text' = { fg = 'orange' }
 'markup.link.label' = { fg = 'green' }
+'markup.list' = { fg = 'red' }
 'markup.quote' = { fg = 'green', modifiers = ['italic'] }
-'markup.bold' = { fg = 'orange', modifiers = ['bold'] }
-'markup.italic' = { fg = 'magenta', modifiers = ['italic'] }
+'markup.raw.block' = { fg = 'green', bg = 'base4' }
+'markup.raw.inline' = { fg = 'green', bg = 'base4' }
 
 'diff.plus' = { fg = 'green' }
 'diff.minus' = { fg = 'red' }
@@ -61,19 +65,20 @@ namespace = { fg = 'red' }
 'ui.menu.selected' = { bg = 'base3', fg = 'fg' }
 'ui.selection' = { bg = 'base2' }
 
-warning = { fg = 'orange' }
-error = { fg = 'red', modifiers = ['bold'] }
-info = { fg = 'blue', modifiers = ['bold'] }
-hint = { fg = 'blue', modifiers = ['bold'] }
+'warning' = { fg = 'orange' }
+'error' = { fg = 'red', modifiers = ['bold'] }
+'info' = { fg = 'blue', modifiers = ['bold'] }
+'hint' = { fg = 'blue', modifiers = ['bold'] }
 
 'diagnostic'= { fg = 'red', modifiers = ['underlined'] }
+'diagnostic.error'= { fg = 'red', modifiers = ['underlined'] }
 'diagnostic.info'= { fg = 'blue', modifiers = ['underlined'] }
 'diagnostic.warning'= { fg = 'yellow', modifiers = ['underlined'] }
-'diagnostic.error'= { fg = 'red', modifiers = ['underlined'] }
 
 'special' = { fg = 'orange' }
 
 [palette]
+white = '#ffffff'
 black = '#000000'
 red = '#D83441'
 green = '#79D836'

From 86a8ea57bb3cb651cf9bee3fd1ae37f7e134c526 Mon Sep 17 00:00:00 2001
From: ath3 <45574139+ath3@users.noreply.github.com>
Date: Fri, 26 Aug 2022 00:59:02 +0200
Subject: [PATCH 002/884] Pascal support (#3542)

---
 book/src/generated/lang-support.md     |   1 +
 languages.toml                         |  14 +
 runtime/queries/pascal/highlights.scm  | 382 +++++++++++++++++++++++++
 runtime/queries/pascal/injections.scm  |   2 +
 runtime/queries/pascal/textobjects.scm |  10 +
 5 files changed, 409 insertions(+)
 create mode 100644 runtime/queries/pascal/highlights.scm
 create mode 100644 runtime/queries/pascal/injections.scm
 create mode 100644 runtime/queries/pascal/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 8c1d8208..8d8275ab 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -76,6 +76,7 @@
 | odin | ✓ |  |  | `ols` |
 | openscad | ✓ |  |  | `openscad-language-server` |
 | org | ✓ |  |  |  |
+| pascal | ✓ | ✓ |  | `pasls` |
 | perl | ✓ | ✓ | ✓ |  |
 | php | ✓ | ✓ | ✓ | `intelephense` |
 | prisma | ✓ |  |  | `prisma-language-server` |
diff --git a/languages.toml b/languages.toml
index 0bcc6ef2..986b927e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1691,3 +1691,17 @@ roots = ["edgedb.toml"]
 [[grammar]]
 name ="esdl"
 source = { git = "https://github.com/greym0uth/tree-sitter-esdl", rev = "b840c8a8028127e0a7c6e6c45141adade2bd75cf" }
+
+[[language]]
+name = "pascal"
+scope = "source.pascal"
+injection-regex = "pascal"
+file-types = ["pas", "pp", "inc", "lpr", "lfm"]
+roots = []
+comment-token = "//"
+indent = { tab-width = 2, unit = "  " }
+language-server = { command = "pasls", args = [] }
+
+[[grammar]]
+name = "pascal"
+source = { git = "https://github.com/Isopod/tree-sitter-pascal", rev = "2fd40f477d3e2794af152618ccfac8d92eb72a66" }
diff --git a/runtime/queries/pascal/highlights.scm b/runtime/queries/pascal/highlights.scm
new file mode 100644
index 00000000..5368a22b
--- /dev/null
+++ b/runtime/queries/pascal/highlights.scm
@@ -0,0 +1,382 @@
+; -- Identifier type inferrence
+
+; VERY QUESTIONABLE: Highlighting of identifiers based on spelling
+(exprBinary ((identifier) @constant
+ (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+(exprUnary ((identifier) @constant
+ (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+(assignment rhs: ((identifier) @constant
+ (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+(exprBrackets ((identifier) @constant
+ (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+(exprParens ((identifier) @constant
+ (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+(exprDot rhs: ((identifier) @constant
+ (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+(exprTpl args: ((identifier) @constant
+ (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+(exprArgs ((identifier) @constant
+ (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+(declEnumValue ((identifier) @constant
+ (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+(defaultValue ((identifier) @constant
+ (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+
+; -- Break, Continue & Exit
+; (Not ideal: ideally, there would be a way to check if these special
+; identifiers are shadowed by a local variable)
+(statement ((identifier) @keyword.control.return
+ (#match? @keyword.control.return "^[eE][xX][iI][tT]$")))
+(statement (exprCall entity: ((identifier) @keyword.control.return
+ (#match? @keyword.control.return "^[eE][xX][iI][tT]$"))))
+(statement ((identifier) @keyword.control.repeat
+ (#match? @keyword.control.repeat "^[bB][rR][eE][aA][kK]$")))
+(statement ((identifier) @keyword.control.repeat
+ (#match? @keyword.control.repeat "^[cC][oO][nN][tT][iI][nN][uU][eE]$")))
+
+; -- Heuristic for procedure/function calls without parentheses
+; (If a statement consists only of an identifier, assume it's a procedure)
+; (This will still not match all procedure calls, and also may produce false
+; positives in rare cases, but only for nonsensical code)
+
+(statement (exprDot rhs: (exprTpl entity: (identifier) @function)))
+(statement (exprTpl entity: (identifier) @function))
+(statement (exprDot rhs: (identifier) @function))
+(statement (identifier) @function)
+
+; -- Procedure name in calls with parentheses
+; (Pascal doesn't require parentheses for procedure calls, so this will not
+; detect all calls)
+
+(inherited) @function
+
+; foo.bar<t>
+(exprCall entity: (exprDot rhs: (exprTpl entity: (identifier) @function)))
+; foo.bar
+(exprCall entity: (exprDot rhs: (identifier) @function))
+; foobar<t>
+(exprCall entity: (exprTpl entity: (identifier) @function))
+; foobar
+(exprCall entity: (identifier) @function)
+
+; -- Fields
+
+(declSection (declVars (declVar   name:(identifier) @variable.other.member)))
+(declSection (declField name:(identifier) @variable.other.member))
+(declClass   (declField name:(identifier) @variable.other.member))
+(exprDot rhs: (exprDot)    @variable.other.member)
+(exprDot rhs: (identifier) @variable.other.member)
+
+(recInitializerField name:(identifier) @variable.other.member)
+
+; -- Variable & constant declarations
+; (This is only questionable because we cannot detect types of identifiers
+; declared in other units, so the results will be inconsistent)
+
+(declVar name: (identifier) @variable)
+(declConst name: (identifier) @constant)
+(declEnumValue name: (identifier) @constant)
+
+; -- Constant usage
+
+[
+	(caseLabel)
+	(label)
+] @constant
+
+(procAttribute (identifier) @constant)
+(procExternal (identifier) @constant)
+
+; -- Type usage
+
+(typeref) @type
+
+; -- Exception parameters
+
+(exceptionHandler variable: (identifier) @variable.parameter)
+
+; -- Template parameters
+
+(genericArg	type: (typeref) @type)
+(genericArg	name: (identifier) @variable.parameter)
+
+(declProc name: (genericDot lhs: (identifier) @type))
+(declType (genericDot (identifier) @type))
+
+(genericDot (genericTpl (identifier) @type))
+(genericDot (genericDot (identifier) @type))
+
+(genericTpl entity: (genericDot (identifier) @type))
+(genericTpl entity: (identifier) @type)
+
+; -- Function parameters
+
+(declArg name: (identifier) @variable.parameter)
+
+; Treat property declarations like functions
+
+(declProp name: (identifier) @function)
+(declProp getter: (identifier) @variable.other.member)
+(declProp setter: (identifier) @variable.other.member)
+
+; -- Procedure & function declarations
+
+; foo.bar<t>
+(declProc name: (genericDot rhs: (genericTpl entity: (identifier) @function)))
+; foo.bar
+(declProc name: (genericDot rhs: (identifier) @function))
+; foobar<t>
+(declProc name: (genericTpl entity: (identifier) @function))
+; foobar
+(declProc name: (identifier) @function)
+
+; -- Type declaration
+
+(declType name: (genericTpl entity: (identifier) @type))
+(declType name: (identifier) @type)
+
+; -- Comments
+
+(comment)         @comment
+(pp)              @function.macro
+
+; -- Variables
+
+(exprBinary (identifier) @variable)
+(exprUnary (identifier) @variable)
+(assignment (identifier) @variable)
+(exprBrackets (identifier) @variable)
+(exprParens (identifier) @variable)
+(exprDot (identifier) @variable)
+(exprTpl (identifier) @variable)
+(exprArgs (identifier) @variable)
+(defaultValue (identifier) @variable)
+
+; -- Literals
+
+(literalNumber)   @constant.builtin.numeric
+(literalString)   @string
+
+; -- Builtin constants
+
+[
+	(kTrue)
+	(kFalse)
+] @constant.builtin.boolean
+
+[
+	(kNil)
+] @constant.builtin
+
+; -- Punctuation & operators
+
+[
+	(kOr)
+	(kXor)
+	(kDiv)
+	(kMod)
+	(kAnd)
+	(kShl)
+	(kShr)
+	(kNot)
+	(kIs)
+	(kAs)
+	(kIn)
+] @keyword.operator
+
+[
+	(kDot)
+	(kAdd)
+	(kSub)
+	(kMul)
+	(kFdiv)
+	(kAssign)
+	(kAssignAdd)
+	(kAssignSub)
+	(kAssignMul)
+	(kAssignDiv)
+	(kEq)
+	(kLt)
+	(kLte)
+	(kGt)
+	(kGte)
+	(kNeq)
+	(kAt)
+	(kHat)
+] @operator
+
+[
+	".."
+] @punctuation.special
+
+[
+	";"
+	","
+	":"
+	(kEndDot)
+] @punctuation.delimiter
+
+[
+	"("
+	")"
+	"["
+	"]"
+] @punctuation.bracket
+
+; -- Attributes
+
+(procAttribute (kPublic) @attribute)
+
+[
+	(kDefault)
+	(kIndex)
+	(kNodefault)
+	(kStored)
+
+	(kStatic)
+	(kVirtual)
+	(kAbstract)
+	(kSealed)
+	(kDynamic)
+	(kOverride)
+	(kOverload)
+	(kReintroduce)
+	(kInline)
+
+	(kForward)
+
+	(kStdcall)
+	(kCdecl)
+	(kCppdecl)
+	(kPascal)
+	(kRegister)
+	(kMwpascal)
+	(kExternal)
+	(kName)
+	(kMessage)
+	(kDeprecated)
+	(kExperimental)
+	(kPlatform)
+	(kUnimplemented)
+	(kCvar)
+	(kExport)
+	(kFar)
+	(kNear)
+	(kSafecall)
+	(kAssembler)
+	(kNostackframe)
+	(kInterrupt)
+	(kNoreturn)
+	(kIocheck)
+	(kLocal)
+	(kHardfloat)
+	(kSoftfloat)
+	(kMs_abi_default)
+	(kMs_abi_cdecl)
+	(kSaveregisters)
+	(kSysv_abi_default)
+	(kSysv_abi_cdecl)
+	(kVectorcall)
+	(kVarargs)
+	(kWinapi)
+	(kAlias)
+	(kDelayed)
+
+	(rttiAttributes)
+	(procAttribute)
+
+] @attribute
+
+; -- Keywords
+[
+	(kProgram)
+	(kLibrary)
+	(kUnit)
+	(kUses)
+
+	(kBegin)
+	(kEnd)
+	(kAsm)
+
+	(kVar)
+	(kThreadvar)
+	(kConst)
+	(kResourcestring)
+	(kConstref)
+	(kOut)
+	(kType)
+	(kLabel)
+	(kExports)
+
+	(kAbsolute)
+
+	(kProperty)
+	(kRead)
+	(kWrite)
+	(kImplements)
+
+	(kClass)
+	(kInterface)
+	(kObject)
+	(kRecord)
+	(kObjcclass)
+	(kObjccategory)
+	(kObjcprotocol)
+	(kArray)
+	(kFile)
+	(kString)
+	(kSet)
+	(kOf)
+	(kHelper)
+	(kPacked)
+
+	(kInherited)
+
+	(kGeneric)
+	(kSpecialize)
+
+	(kFunction)
+	(kProcedure)
+	(kConstructor)
+	(kDestructor)
+	(kOperator)
+	(kReference)
+
+	(kInterface)
+	(kImplementation)
+	(kInitialization)
+	(kFinalization)
+
+	(kPublished)
+	(kPublic)
+	(kProtected)
+	(kPrivate)
+	(kStrict)
+	(kRequired)
+	(kOptional)
+
+	(kTry)
+	(kExcept)
+	(kFinally)
+	(kRaise)
+	(kOn)
+	(kCase)
+	(kWith)
+	(kGoto)
+] @keyword
+
+[
+	(kFor)
+	(kTo)
+	(kDownto)
+	(kDo)
+	(kWhile)
+	(kRepeat)
+	(kUntil)
+] @keyword.control.repeat
+
+[
+	(kIf)
+	(kThen)
+	(kElse)
+] @keyword.control.conditional
diff --git a/runtime/queries/pascal/injections.scm b/runtime/queries/pascal/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/pascal/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/pascal/textobjects.scm b/runtime/queries/pascal/textobjects.scm
new file mode 100644
index 00000000..56dbe540
--- /dev/null
+++ b/runtime/queries/pascal/textobjects.scm
@@ -0,0 +1,10 @@
+
+(declType (declClass (declSection) @class.inside)) @class.around
+
+(defProc body: (_) @function.inside) @function.around
+
+(declArgs (_) @parameter.inside) @parameter.around
+(exprArgs (_) @parameter.inside) @parameter.around
+
+(comment) @comment.inside
+(comment)+ @comment.around

From e06678278267a76a1d9e29b36d4734bcb39eabec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustavo=20Bogar=C3=ADn?= <votagusvotag@outlook.com>
Date: Sat, 27 Aug 2022 10:24:47 -0400
Subject: [PATCH 003/884] Add c-sharp textobjects (#3494)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Gustavo Bogarín <gbogarin@outlook.com>
Co-authored-by: Gustavo Bogarín <gbogarin@posibillian.tech>
---
 book/src/generated/lang-support.md      |  2 +-
 languages.toml                          |  2 +-
 runtime/queries/c-sharp/highlights.scm  | 15 +++++++++++++--
 runtime/queries/c-sharp/textobjects.scm | 21 +++++++++++++++++++++
 4 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 runtime/queries/c-sharp/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 8d8275ab..9a1d5b92 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -4,7 +4,7 @@
 | bash | ✓ |  |  | `bash-language-server` |
 | beancount | ✓ |  |  |  |
 | c | ✓ | ✓ | ✓ | `clangd` |
-| c-sharp | ✓ |  |  | `OmniSharp` |
+| c-sharp | ✓ | ✓ |  | `OmniSharp` |
 | cairo | ✓ |  |  |  |
 | clojure | ✓ |  |  | `clojure-lsp` |
 | cmake | ✓ | ✓ | ✓ | `cmake-language-server` |
diff --git a/languages.toml b/languages.toml
index 986b927e..d125ae88 100644
--- a/languages.toml
+++ b/languages.toml
@@ -235,7 +235,7 @@ language-server = { command = "OmniSharp", args = [ "--languageserver" ] }
 
 [[grammar]]
 name = "c-sharp"
-source = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "53a65a908167d6556e1fcdb67f1ee62aac101dda" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "9c494a503c8e2044bfffce57f70b480c01a82f03" }
 
 [[language]]
 name = "go"
diff --git a/runtime/queries/c-sharp/highlights.scm b/runtime/queries/c-sharp/highlights.scm
index 6b94dd8c..dbb7c778 100644
--- a/runtime/queries/c-sharp/highlights.scm
+++ b/runtime/queries/c-sharp/highlights.scm
@@ -228,8 +228,19 @@
   "let"
 ] @keyword
 
-(preprocessor_call) @keyword.directive
-(preprocessor_call (_) @keyword.directive)
+(nullable_directive) @keyword.directive
+(define_directive) @keyword.directive
+(undef_directive) @keyword.directive
+(if_directive) @keyword.directive
+(else_directive) @keyword.directive
+(elif_directive) @keyword.directive
+(endif_directive) @keyword.directive
+(region_directive) @keyword.directive
+(endregion_directive) @keyword.directive
+(error_directive) @keyword.directive
+(warning_directive) @keyword.directive
+(line_directive) @keyword.directive
+(pragma_directive) @keyword.directive
 
 ;; Linq
 (from_clause (identifier) @variable)
diff --git a/runtime/queries/c-sharp/textobjects.scm b/runtime/queries/c-sharp/textobjects.scm
new file mode 100644
index 00000000..c5afe5f4
--- /dev/null
+++ b/runtime/queries/c-sharp/textobjects.scm
@@ -0,0 +1,21 @@
+[
+  (class_declaration body: (_) @class.inside)
+  (struct_declaration body: (_) @class.inside)
+  (interface_declaration body: (_) @class.inside)
+  (enum_declaration body: (_) @class.inside)
+  (delegate_declaration)
+  (record_declaration body: (_) @class.inside)
+  (record_struct_declaration body: (_) @class.inside)
+] @class.around
+
+(constructor_declaration body: (_) @function.inside) @function.around
+
+(destructor_declaration body: (_) @function.inside) @function.around
+
+(method_declaration body: (_) @function.inside) @function.around
+
+(property_declaration (_) @function.inside) @function.around
+
+(parameter (_) @parameter.inside) @parameter.around
+
+(comment)+ @comment.around

From db18206795ba6ccb0400e15c05c0f61f755d265e Mon Sep 17 00:00:00 2001
From: David <12832280+David-Else@users.noreply.github.com>
Date: Sun, 28 Aug 2022 22:03:39 +0100
Subject: [PATCH 004/884] Fix rust text objects (#3590)

---
 runtime/queries/rust/textobjects.scm | 62 ++++++----------------------
 1 file changed, 12 insertions(+), 50 deletions(-)

diff --git a/runtime/queries/rust/textobjects.scm b/runtime/queries/rust/textobjects.scm
index 94c8c9f8..7005d9c7 100644
--- a/runtime/queries/rust/textobjects.scm
+++ b/runtime/queries/rust/textobjects.scm
@@ -1,58 +1,20 @@
-(
-  [
-    (attribute_item)+
-    (line_comment)+
-  ]*
-  .
-  (function_item
-    body: (_) @function.inside)) @function.around
+(function_item
+  body: (_) @function.inside) @function.around(closure_expression body: (_) @function.inside) @function.around
 
-(closure_expression body: (_) @function.inside) @function.around
+(struct_item
+  body: (_) @class.inside) @class.around
 
-(
-  [
-    (attribute_item)+
-    (line_comment)+
-  ]*
-  .
-  (struct_item
-    body: (_) @class.inside)) @class.around
+(enum_item
+  body: (_) @class.inside) @class.around
 
-(
-  [
-    (attribute_item)+
-    (line_comment)+
-  ]*
-  .
-  (enum_item
-    body: (_) @class.inside)) @class.around
+(union_item
+  body: (_) @class.inside) @class.around
 
-(
-  [
-    (attribute_item)+
-    (line_comment)+
-  ]*
-  .
-  (union_item
-    body: (_) @class.inside)) @class.around
+(trait_item
+  body: (_) @class.inside) @class.around
 
-(
-  [
-    (attribute_item)+
-    (line_comment)+
-  ]*
-  .
-  (trait_item
-    body: (_) @class.inside)) @class.around
-
-(
-  [
-    (attribute_item)+
-    (line_comment)+
-  ]*
-  .
-  (impl_item
-    body: (_) @class.inside)) @class.around
+(impl_item
+  body: (_) @class.inside) @class.around
 
 (parameters 
   ((_) @parameter.inside . ","? @parameter.around) @parameter.around)

From abb9f139c51ddcd11b7bac366addd337629c8ffd Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <socvirnyl.estela@gmail.com>
Date: Mon, 29 Aug 2022 07:58:05 +0800
Subject: [PATCH 005/884] update colors for papercolor-light (#3585)

* theme: add papercolor light

* fix typo

* add markup highlighting

* theme: added diff colors

forgot to add it to PaperColor Light

* fix some ui colors

* assign more color for markup headings

* change heading color to bright7
---
 runtime/themes/papercolor-light.toml | 30 ++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/runtime/themes/papercolor-light.toml b/runtime/themes/papercolor-light.toml
index aaa170c2..dc4d7df5 100644
--- a/runtime/themes/papercolor-light.toml
+++ b/runtime/themes/papercolor-light.toml
@@ -1,19 +1,34 @@
 # Palette based on https://github.com/NLKNguyen/papercolor-theme
 # Author: Soc Virnyl Estela <socvirnyl.estela@gmail.com>
 
+"ui.linenr.selected" = { fg = "linenr_fg_selected" }
 "ui.background" = {bg="background"}
 "ui.text" = "foreground"
+"ui.text.focus" = { fg = "selection_background", modifiers = ["bold"]}
 "ui.selection" = {bg="selection_background", fg="selection_foreground"}
+"ui.cursorline" = {bg="cursorline_background"}
 "ui.statusline" = {bg="paper_bar_bg", fg="regular0"}
-"ui.statusline.inactive" = {bg="background", fg="bright2"}
+"ui.statusline.select" = {bg="background", fg="bright7"}
+"ui.statusline.normal" = {bg="background", fg="bright3"}
+"ui.statusline.inactive" = {bg="background", fg="bright0"}
 "ui.virtual" = "indent"
 "ui.virtual.whitespace" = { fg = "regular5" }
-"ui.cursor.match" = {bg = "foreground", fg = "regular4"}
-"ui.cursor" = {bg = "foreground", fg = "background"}
-"ui.window" = {bg = "background", fg = "bright3"}
-"ui.menu.selected" = {bg = "selection_background"}
+"ui.virtual.ruler" = {bg="cursorline_background"}
+"ui.cursor.match" = {bg = "regular5", fg = "regular0"}
+"ui.cursor" = {bg = "regular5", fg = "background"}
+"ui.window" = {bg = "#D0D0D0", fg = "bright2"}
+"ui.help" = {bg = "background", fg = "bright2"}
+"ui.popup" = {bg = "#D0D0D0", fg = "bright7"}
+"ui.menu" = {bg = "#D0D0D0", fg = "bright7"}
+"ui.menu.selected" = {bg = "selection_background", fg="selection_foreground"}
 
-"markup.heading" = { fg = "bright2", modifiers = ["bold"] }
+"markup.heading" = { fg = "bright7", modifiers = ["bold"] }
+"markup.heading.1" = { fg = "bright2", modifiers = ["bold"] }
+"markup.heading.2" = { fg = "bright4", modifiers = ["bold"] }
+"markup.heading.3" = { fg = "bright3", modifiers = ["bold"] }
+"markup.heading.4" = { fg = "bright4", modifiers = ["bold"] }
+"markup.heading.5" = { fg = "bright4", modifiers = ["bold"] }
+"markup.heading.6" = { fg = "bright4", modifiers = ["bold"] }
 "markup.list" = "regular4"
 "markup.bold" = { fg = "foreground", modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
@@ -40,6 +55,7 @@
 "function.builtin" = { fg = "regular4", modifiers = ["bold"]}
 "function.macro" = { fg = "regular1" }
 "comment" = { fg = "bright0", modifiers = ["dim"] }
+"ui.linenr" = { fg = "bright0" }
 "module" = "#af0000"
 "constant" = "#5f8700"
 "constant.builtin" = "#5f8700"
@@ -80,6 +96,7 @@ bright6="#4c7a5d"
 bright7="#005faf"
 selection_foreground="#eeeeee"
 selection_background="#0087af"
+cursorline_background="#fdfdfd"
 paper_bar_bg="#005F87"
 black="#eeeeee"
 red="#d70000"
@@ -97,3 +114,4 @@ light-magenta="#d75f00"
 light-cyan="#4c7a4d"
 light-gray="#005faf"
 white="#444444"
+linenr_fg_selected="#AF634D"

From eeb0a9f504c689a0be6f0dc09035567e3aa753ad Mon Sep 17 00:00:00 2001
From: Kristoffer Flottorp <2630397+krfl@users.noreply.github.com>
Date: Mon, 29 Aug 2022 02:23:54 +0200
Subject: [PATCH 006/884] Add fleetish theme. Based on the unreleased JetBrains
 Fleet editor (#3591)

Co-authored-by: krfl <kr.fl@outlook.com>
---
 runtime/themes/fleetish.toml | 115 +++++++++++++++++++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 runtime/themes/fleetish.toml

diff --git a/runtime/themes/fleetish.toml b/runtime/themes/fleetish.toml
new file mode 100644
index 00000000..879b8750
--- /dev/null
+++ b/runtime/themes/fleetish.toml
@@ -0,0 +1,115 @@
+# Author: Kristoffer Flottorp <kr.fl@outlook.com>
+# Based on a few screenshots of Jetbrains Fleet
+
+"type" = { fg = "orange" } # .builtin
+"constructor" = { fg = "orange" }
+"constant" = { fg = "green" }
+# "constant.builtin" = {} # .boolean
+"constant.builtin.boolean" = { fg = "green" } # .boolean
+# "constant.character" = {} #.escape
+"constant.numeric" = { fg = "yellow" } # .integer / .float
+"string" = { fg = "pink" } # .regexp
+# "string.special" = {} #.path / .url / .symbol
+"string.special" = { modifier = ["underline"] } #.path / .url / .symbol
+"comment" = { fg = "dark_gray" } # .line
+# "comment.block" = {} # .documentation
+"variable" = { fg = "light" } # .builtin / .parameter
+# "variable.other" = {} # .member
+"variable.other.member" = { fg = "purple" }
+"label" = { fg = "orange" }
+# "punctuation" = {} # .delimiter / .bracket
+"keyword" = { fg = "green" } # .operator / .directive / .function
+# "keyword.control" = { fg = "orange" } # .conditional / .repeat / .import / .return / .exception
+"operator" = { fg = "light" }
+"function" = { fg = "blue" } # .builtin / .method / .macro / .special
+"function.macro" = { fg = "yellow" }
+"function.special" = { fg = "yellow" }
+"tag" = { fg = "yellow" }
+"special" = { fg = "yellow" }
+"namespace" = { fg = "light" }
+"markup" = { fg = "purple" } # .bold / .italic / .quote
+"markup.heading" = { fg = "light" } # .marker / .1 / .2 / .3 / .4 / .5 / .6
+"markup.heading.1" = { fg = "orange" }
+"markup.heading.2" = { fg = "yellow" }
+"markup.heading.3" = { fg = "pink" }
+"markup.heading.4" = { fg = "purple" }
+"markup.heading.5" = { fg = "green" }
+"markup.heading.6" = { fg = "blue" }
+"markup.list" = { fg = "green" } # .unnumbered / .numbered
+"markup.link" = { fg = "yellow" } # .url / .label / .text
+"markup.raw" = { fg = "pink" } # .inline / .block
+# "diff" = {} # .plus / .minus
+"diff.plus" = { fg = "green" }
+"diff.minus" = { fg = "orange" }
+"diff.delta" = { fg = "purple" } # .moved
+
+# used in theming
+# "markup.normal" = {} # .completion / .hover
+# "markup.heading" = {} # .completion / .hover
+# "markup.raw.inline" = {} # .completion / .hover
+
+# ui specific
+"ui.background" = { bg = "darkest" } # .separator
+"ui.cursor" = { bg = "dark_gray", modifiers = ["reversed"] } # .insert / .select / .match / .primary
+"ui.cursor.match" = { fg = "light", bg = "blue_accent" } # .insert / .select / .match / .primary
+"ui.cursorline" = { bg = "darker" }
+"ui.linenr" = { fg = "dark_gray" } # .selected
+"ui.linenr.selected" = { fg = "light_gray", bg = "darker" }
+"ui.statusline" = { fg = "light", bg = "darker" } # .inactive / .normal / .insert / .select
+"ui.statusline.inactive" = { fg = "dark", bg = "darker" } # .inactive / .normal / .insert / .select
+"ui.statusline.normal" = { fg = "lightest", bg = "darker"} # .inactive / .normal / .insert / .select
+"ui.statusline.insert" = { fg = "lightest", bg = "blue_accent" } # .inactive / .normal / .insert / .select
+"ui.statusline.select" = { fg = "lightest", bg = "orange_accent" } # .inactive / .normal / .insert / .select
+"ui.popup" = { fg = "light", bg = "dark" } # .info
+"ui.window" = { fg = "dark", bg = "darkest" }
+"ui.help" = { fg = "light", bg = "dark" }
+"ui.text" = { fg = "light" } # .focus / .info
+# "ui.virtual" = {} # .ruler / .whitespace
+"ui.virtual.ruler" = { bg = "darker"}
+"ui.menu" = { fg = "light", bg = "dark" } # .selected
+"ui.menu.selected" = { fg = "lightest", bg = "blue_accent" } # .selected
+"ui.selection" = { bg = "select" } # .primary
+"hint" = { fg = "blue_accent"}
+"info" = { fg = "yellow_accent" }
+"warning" = { fg = "orange_accent" }
+"error" = { fg = "diff_red_accent" }
+"diagnostic" = { fg = "orange", bg = "darkest" } # .hint / .info / .warning / .error
+"diagnostic.hint" = { fg = "lightest", bg = "blue_accent" }
+"diagnostic.info" = { fg = "lightest", bg = "purple_accent" }
+"diagnostic.warning" = { fg = "lightest", bg = "yellow_accent" }
+"diagnostic.error" = { fg = "lightest", bg = "orange_accent" }
+
+[palette]
+darkest = "#0F0F0F"
+darker = "#222222"
+dark = "#383838"
+select = "#102F5B"
+
+light = "#F0F0F0"
+lightest = "#FFFFFF"
+
+dark_gray = "#5B5B5B"
+light_gray = "#757575"
+purple = "#A096F9"
+blue = "#52A7F6"
+pink = "#E878DE"
+green = "#78D0BD"
+orange = "#ECA775"
+yellow = "#F9CA6A"
+
+purple_accent = "#6363EE"
+blue_accent = "#2197F3"
+pink_accent = "#E44C7A"
+green_accent = "#00AF99"
+orange_accent = "#EE7F25"
+
+# variables intended for future updates
+checkmark = "#44B254"
+
+diff_blue_accent = "#0079FF"
+diff_blue_bg = "#072037"
+diff_blue_fg = "#0079FF"
+
+diff_red_accent = "#EE113C"
+diff_red_bg = "#390B14"
+diff_red_fg = "#EC123B"

From 51b62230da81913564692482d8f365e27d6f6cec Mon Sep 17 00:00:00 2001
From: unrelentingtech <hello@unrelenting.technology>
Date: Mon, 29 Aug 2022 03:24:22 +0300
Subject: [PATCH 007/884] Add wezterm to get_terminal_provider (#3588)

https://github.com/wez/wezterm is a terminal emulator with its own built-in multiplexer
---
 helix-view/src/editor.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 520a425c..0bf7ebd0 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -211,6 +211,13 @@ pub fn get_terminal_provider() -> Option<TerminalConfig> {
         });
     }
 
+    if env_var_is_set("WEZTERM_UNIX_SOCKET") && exists("wezterm") {
+        return Some(TerminalConfig {
+            command: "wezterm".to_string(),
+            args: vec!["cli".to_string(), "split-pane".to_string()],
+        });
+    }
+
     None
 }
 

From f38ede8631b083c1c74d31b7658ad162d31c3972 Mon Sep 17 00:00:00 2001
From: Charlie Groves <c@sevorg.org>
Date: Mon, 29 Aug 2022 00:48:49 +0000
Subject: [PATCH 008/884] Add bracketed paste (#3233)

---
 helix-term/src/application.rs   | 22 +++++++++++-------
 helix-term/src/commands.rs      | 41 ++++++++++++++-------------------
 helix-term/src/compositor.rs    |  6 ++---
 helix-term/src/ui/completion.rs |  2 +-
 helix-term/src/ui/editor.rs     | 23 +++++++++++++++---
 helix-term/src/ui/menu.rs       |  4 ++--
 helix-term/src/ui/overlay.rs    |  2 +-
 helix-term/src/ui/picker.rs     | 20 ++++++++++------
 helix-term/src/ui/popup.rs      |  4 ++--
 helix-term/src/ui/prompt.rs     |  8 +++++--
 helix-view/src/input.rs         |  7 +++---
 11 files changed, 82 insertions(+), 57 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 21be7db0..3124beb0 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -29,7 +29,10 @@ use std::{
 use anyhow::{Context, Error};
 
 use crossterm::{
-    event::{DisableMouseCapture, EnableMouseCapture, Event as CrosstermEvent},
+    event::{
+        DisableBracketedPaste, DisableMouseCapture, EnableBracketedPaste, EnableMouseCapture,
+        Event as CrosstermEvent,
+    },
     execute, terminal,
     tty::IsTty,
 };
@@ -425,14 +428,13 @@ impl Application {
             scroll: None,
         };
         // Handle key events
-        let should_redraw = match event {
-            Ok(CrosstermEvent::Resize(width, height)) => {
+        let should_redraw = match event.unwrap() {
+            CrosstermEvent::Resize(width, height) => {
                 self.compositor.resize(width, height);
                 self.compositor
-                    .handle_event(Event::Resize(width, height), &mut cx)
+                    .handle_event(&Event::Resize(width, height), &mut cx)
             }
-            Ok(event) => self.compositor.handle_event(event.into(), &mut cx),
-            Err(x) => panic!("{}", x),
+            event => self.compositor.handle_event(&event.into(), &mut cx),
         };
 
         if should_redraw && !self.editor.should_close() {
@@ -788,7 +790,7 @@ impl Application {
     async fn claim_term(&mut self) -> Result<(), Error> {
         terminal::enable_raw_mode()?;
         let mut stdout = stdout();
-        execute!(stdout, terminal::EnterAlternateScreen)?;
+        execute!(stdout, terminal::EnterAlternateScreen, EnableBracketedPaste)?;
         execute!(stdout, terminal::Clear(terminal::ClearType::All))?;
         if self.config.load().editor.mouse {
             execute!(stdout, EnableMouseCapture)?;
@@ -821,7 +823,11 @@ impl Application {
             // probably not a good idea to `unwrap()` inside a panic handler.
             // So we just ignore the `Result`s.
             let _ = execute!(std::io::stdout(), DisableMouseCapture);
-            let _ = execute!(std::io::stdout(), terminal::LeaveAlternateScreen);
+            let _ = execute!(
+                std::io::stdout(),
+                terminal::LeaveAlternateScreen,
+                DisableBracketedPaste
+            );
             let _ = terminal::disable_raw_mode();
             hook(info);
         }));
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 16f7e601..ffcccec3 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3369,13 +3369,7 @@ enum Paste {
     Cursor,
 }
 
-fn paste_impl(
-    values: &[String],
-    doc: &mut Document,
-    view: &View,
-    action: Paste,
-    count: usize,
-) -> Option<Transaction> {
+fn paste_impl(values: &[String], doc: &mut Document, view: &View, action: Paste, count: usize) {
     let repeat = std::iter::repeat(
         values
             .last()
@@ -3418,8 +3412,17 @@ fn paste_impl(
         };
         (pos, pos, values.next())
     });
+    doc.apply(&transaction, view.id);
+}
 
-    Some(transaction)
+pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {
+    let count = cx.count();
+    let (view, doc) = current!(cx.editor);
+    let paste = match doc.mode {
+        Mode::Insert | Mode::Select => Paste::Cursor,
+        Mode::Normal => Paste::Before,
+    };
+    paste_impl(&[contents], doc, view, paste, count);
 }
 
 fn paste_clipboard_impl(
@@ -3429,18 +3432,11 @@ fn paste_clipboard_impl(
     count: usize,
 ) -> anyhow::Result<()> {
     let (view, doc) = current!(editor);
-
-    match editor
-        .clipboard_provider
-        .get_contents(clipboard_type)
-        .map(|contents| paste_impl(&[contents], doc, view, action, count))
-    {
-        Ok(Some(transaction)) => {
-            doc.apply(&transaction, view.id);
-            doc.append_changes_to_history(view.id);
+    match editor.clipboard_provider.get_contents(clipboard_type) {
+        Ok(contents) => {
+            paste_impl(&[contents], doc, view, action, count);
             Ok(())
         }
-        Ok(None) => Ok(()),
         Err(e) => Err(e.context("Couldn't get system clipboard contents")),
     }
 }
@@ -3553,11 +3549,8 @@ fn paste(cx: &mut Context, pos: Paste) {
     let (view, doc) = current!(cx.editor);
     let registers = &mut cx.editor.registers;
 
-    if let Some(transaction) = registers
-        .read(reg_name)
-        .and_then(|values| paste_impl(values, doc, view, pos, count))
-    {
-        doc.apply(&transaction, view.id);
+    if let Some(values) = registers.read(reg_name) {
+        paste_impl(values, doc, view, pos, count);
     }
 }
 
@@ -4849,7 +4842,7 @@ fn replay_macro(cx: &mut Context) {
     cx.callback = Some(Box::new(move |compositor, cx| {
         for _ in 0..count {
             for &key in keys.iter() {
-                compositor.handle_event(compositor::Event::Key(key), cx);
+                compositor.handle_event(&compositor::Event::Key(key), cx);
             }
         }
         // The macro under replay is cleared at the end of the callback, not in the
diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs
index bda38c59..c0898dae 100644
--- a/helix-term/src/compositor.rs
+++ b/helix-term/src/compositor.rs
@@ -29,7 +29,7 @@ pub struct Context<'a> {
 
 pub trait Component: Any + AnyComponent {
     /// Process input events, return true if handled.
-    fn handle_event(&mut self, _event: Event, _ctx: &mut Context) -> EventResult {
+    fn handle_event(&mut self, _event: &Event, _ctx: &mut Context) -> EventResult {
         EventResult::Ignored(None)
     }
     // , args: ()
@@ -157,10 +157,10 @@ impl Compositor {
         Some(self.layers.remove(idx))
     }
 
-    pub fn handle_event(&mut self, event: Event, cx: &mut Context) -> bool {
+    pub fn handle_event(&mut self, event: &Event, cx: &mut Context) -> bool {
         // If it is a key event and a macro is being recorded, push the key event to the recording.
         if let (Event::Key(key), Some((_, keys))) = (event, &mut cx.editor.macro_recording) {
-            keys.push(key);
+            keys.push(*key);
         }
 
         let mut callbacks = Vec::new();
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 6a743632..87913a8c 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -298,7 +298,7 @@ impl Completion {
 }
 
 impl Component for Completion {
-    fn handle_event(&mut self, event: Event, cx: &mut Context) -> EventResult {
+    fn handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
         // let the Editor handle Esc instead
         if let Event::Key(KeyEvent {
             code: KeyCode::Esc, ..
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 60cab905..7326b70d 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -936,7 +936,7 @@ impl EditorView {
 impl EditorView {
     fn handle_mouse_event(
         &mut self,
-        event: MouseEvent,
+        event: &MouseEvent,
         cxt: &mut commands::Context,
     ) -> EventResult {
         let config = cxt.editor.config();
@@ -946,7 +946,7 @@ impl EditorView {
             column,
             modifiers,
             ..
-        } = event;
+        } = *event;
 
         let pos_and_view = |editor: &Editor, row, column| {
             editor.tree.views().find_map(|(view, _focus)| {
@@ -1115,7 +1115,7 @@ impl EditorView {
 impl Component for EditorView {
     fn handle_event(
         &mut self,
-        event: Event,
+        event: &Event,
         context: &mut crate::compositor::Context,
     ) -> EventResult {
         let mut cx = commands::Context {
@@ -1128,6 +1128,23 @@ impl Component for EditorView {
         };
 
         match event {
+            Event::Paste(contents) => {
+                cx.count = cx.editor.count;
+                commands::paste_bracketed_value(&mut cx, contents.clone());
+                cx.editor.count = None;
+
+                let config = cx.editor.config();
+                let (view, doc) = current!(cx.editor);
+                view.ensure_cursor_in_view(doc, config.scrolloff);
+
+                // Store a history state if not in insert mode. Otherwise wait till we exit insert
+                // to include any edits to the paste in the history state.
+                if doc.mode() != Mode::Insert {
+                    doc.append_changes_to_history(view.id);
+                }
+
+                EventResult::Consumed(None)
+            }
             Event::Resize(_width, _height) => {
                 // Ignore this event, we handle resizing just before rendering to screen.
                 // Handling it here but not re-rendering will cause flashing
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index ce51ecbc..1d247b1a 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -225,9 +225,9 @@ impl<T: Item> Menu<T> {
 use super::PromptEvent as MenuEvent;
 
 impl<T: Item + 'static> Component for Menu<T> {
-    fn handle_event(&mut self, event: Event, cx: &mut Context) -> EventResult {
+    fn handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
         let event = match event {
-            Event::Key(event) => event,
+            Event::Key(event) => *event,
             _ => return EventResult::Ignored(None),
         };
 
diff --git a/helix-term/src/ui/overlay.rs b/helix-term/src/ui/overlay.rs
index 1cd60be5..0b8a93ae 100644
--- a/helix-term/src/ui/overlay.rs
+++ b/helix-term/src/ui/overlay.rs
@@ -61,7 +61,7 @@ impl<T: Component + 'static> Component for Overlay<T> {
         Some((width, height))
     }
 
-    fn handle_event(&mut self, event: Event, ctx: &mut Context) -> EventResult {
+    fn handle_event(&mut self, event: &Event, ctx: &mut Context) -> EventResult {
         self.content.handle_event(event, ctx)
     }
 
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 169aeadd..2878fc90 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -260,7 +260,7 @@ impl<T: Item + 'static> Component for FilePicker<T> {
         }
     }
 
-    fn handle_event(&mut self, event: Event, ctx: &mut Context) -> EventResult {
+    fn handle_event(&mut self, event: &Event, ctx: &mut Context) -> EventResult {
         // TODO: keybinds for scrolling preview
         self.picker.handle_event(event, ctx)
     }
@@ -476,6 +476,14 @@ impl<T: Item> Picker<T> {
     pub fn toggle_preview(&mut self) {
         self.show_preview = !self.show_preview;
     }
+
+    fn prompt_handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
+        if let EventResult::Consumed(_) = self.prompt.handle_event(event, cx) {
+            // TODO: recalculate only if pattern changed
+            self.score();
+        }
+        EventResult::Consumed(None)
+    }
 }
 
 // process:
@@ -489,9 +497,10 @@ impl<T: Item + 'static> Component for Picker<T> {
         Some(viewport)
     }
 
-    fn handle_event(&mut self, event: Event, cx: &mut Context) -> EventResult {
+    fn handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
         let key_event = match event {
-            Event::Key(event) => event,
+            Event::Key(event) => *event,
+            Event::Paste(..) => return self.prompt_handle_event(event, cx),
             Event::Resize(..) => return EventResult::Consumed(None),
             _ => return EventResult::Ignored(None),
         };
@@ -548,10 +557,7 @@ impl<T: Item + 'static> Component for Picker<T> {
                 self.toggle_preview();
             }
             _ => {
-                if let EventResult::Consumed(_) = self.prompt.handle_event(event, cx) {
-                    // TODO: recalculate only if pattern changed
-                    self.score();
-                }
+                self.prompt_handle_event(event, cx);
             }
         }
 
diff --git a/helix-term/src/ui/popup.rs b/helix-term/src/ui/popup.rs
index af8e53c5..3c140da4 100644
--- a/helix-term/src/ui/popup.rs
+++ b/helix-term/src/ui/popup.rs
@@ -138,9 +138,9 @@ impl<T: Component> Popup<T> {
 }
 
 impl<T: Component> Component for Popup<T> {
-    fn handle_event(&mut self, event: Event, cx: &mut Context) -> EventResult {
+    fn handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
         let key = match event {
-            Event::Key(event) => event,
+            Event::Key(event) => *event,
             Event::Resize(_, _) => {
                 // TODO: calculate inner area, call component's handle_event with that area
                 return EventResult::Ignored(None);
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 4cb38fb0..5e8cd1f5 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -466,9 +466,13 @@ impl Prompt {
 }
 
 impl Component for Prompt {
-    fn handle_event(&mut self, event: Event, cx: &mut Context) -> EventResult {
+    fn handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
         let event = match event {
-            Event::Key(event) => event,
+            Event::Paste(data) => {
+                self.insert_str(data);
+                return EventResult::Consumed(None);
+            }
+            Event::Key(event) => *event,
             Event::Resize(..) => return EventResult::Consumed(None),
             _ => return EventResult::Ignored(None),
         };
diff --git a/helix-view/src/input.rs b/helix-view/src/input.rs
index 3b03087d..9fa679df 100644
--- a/helix-view/src/input.rs
+++ b/helix-view/src/input.rs
@@ -6,12 +6,13 @@ use std::fmt;
 
 pub use crate::keyboard::{KeyCode, KeyModifiers};
 
-#[derive(Debug, PartialOrd, PartialEq, Eq, Clone, Copy, Hash)]
+#[derive(Debug, PartialOrd, PartialEq, Eq, Clone, Hash)]
 pub enum Event {
     FocusGained,
     FocusLost,
     Key(KeyEvent),
     Mouse(MouseEvent),
+    Paste(String),
     Resize(u16, u16),
 }
 
@@ -276,9 +277,7 @@ impl From<crossterm::event::Event> for Event {
             crossterm::event::Event::Resize(w, h) => Self::Resize(w, h),
             crossterm::event::Event::FocusGained => Self::FocusGained,
             crossterm::event::Event::FocusLost => Self::FocusLost,
-            crossterm::event::Event::Paste(_) => {
-                unreachable!("crossterm shouldn't emit Paste events without them being enabled")
-            }
+            crossterm::event::Event::Paste(s) => Self::Paste(s),
         }
     }
 }

From 411c5e48713d055be9e2031e66bf954c819bea43 Mon Sep 17 00:00:00 2001
From: Bob <QiBaobin@users.noreply.github.com>
Date: Mon, 29 Aug 2022 09:00:40 +0800
Subject: [PATCH 009/884] let extend-line respect range direction (#3046)

* let extend-line respect range direction

* fix extend above logic

* keep `x` existing binding

* Update book/src/keymap.md

Co-authored-by: Ivan Tham <pickfire@riseup.net>

Co-authored-by: Ivan Tham <pickfire@riseup.net>
---
 book/src/keymap.md               |  2 +-
 helix-term/src/commands.rs       | 32 +++++++++++++++++++++++++++-----
 helix-term/src/keymap/default.rs |  2 +-
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index f84393ac..a26fd7ea 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -125,7 +125,7 @@
 | `Alt-(`               | Rotate selection contents backward                                | `rotate_selection_contents_backward` |
 | `Alt-)`               | Rotate selection contents forward                                 | `rotate_selection_contents_forward`  |
 | `%`                   | Select entire file                                                | `select_all`                         |
-| `x`                   | Select current line, if already selected, extend to next line     | `extend_line`                        |
+| `x`                   | Select current line, if already selected, extend to next line     | `extend_line_below`                  |
 | `X`                   | Extend selection to line bounds (line-wise selection)             | `extend_to_line_bounds`              |
 | `Alt-x`               | Shrink selection to line bounds (line-wise selection)             | `shrink_to_line_bounds`              |
 | `J`                   | Join lines inside selection                                       | `join_selections`                    |
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index ffcccec3..885afa18 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -247,7 +247,8 @@ impl MappableCommand {
         extend_search_prev, "Add previous search match to selection",
         search_selection, "Use current selection as search pattern",
         global_search, "Global search in workspace folder",
-        extend_line, "Select current line, if already selected, extend to next line",
+        extend_line, "Select current line, if already selected, extend to another line based on the anchor",
+        extend_line_below, "Select current line, if already selected, extend to next line",
         extend_line_above, "Select current line, if already selected, extend to previous line",
         extend_to_line_bounds, "Extend selection to line bounds",
         shrink_to_line_bounds, "Shrink selection to line bounds",
@@ -1945,6 +1946,15 @@ enum Extend {
 }
 
 fn extend_line(cx: &mut Context) {
+    let (view, doc) = current_ref!(cx.editor);
+    let extend = match doc.selection(view.id).primary().direction() {
+        Direction::Forward => Extend::Below,
+        Direction::Backward => Extend::Above,
+    };
+    extend_line_impl(cx, extend);
+}
+
+fn extend_line_below(cx: &mut Context) {
     extend_line_impl(cx, Extend::Below);
 }
 
@@ -1960,20 +1970,32 @@ fn extend_line_impl(cx: &mut Context, extend: Extend) {
     let selection = doc.selection(view.id).clone().transform(|range| {
         let (start_line, end_line) = range.line_range(text.slice(..));
 
-        let start = text.line_to_char(start_line);
-        let end = text.line_to_char((end_line + count).min(text.len_lines()));
+        let start = text.line_to_char(match extend {
+            Extend::Above => start_line.saturating_sub(count),
+            Extend::Below => start_line,
+        });
+        let end = text.line_to_char(
+            match extend {
+                Extend::Above => end_line + 1, // the start of next line
+                Extend::Below => (end_line + count),
+            }
+            .min(text.len_lines()),
+        );
 
         // extend to previous/next line if current line is selected
         let (anchor, head) = if range.from() == start && range.to() == end {
             match extend {
-                Extend::Above => (end, text.line_to_char(start_line.saturating_sub(1))),
+                Extend::Above => (end, text.line_to_char(start_line.saturating_sub(count + 1))),
                 Extend::Below => (
                     start,
                     text.line_to_char((end_line + count + 1).min(text.len_lines())),
                 ),
             }
         } else {
-            (start, end)
+            match extend {
+                Extend::Above => (end, start),
+                Extend::Below => (start, end),
+            }
         };
 
         Range::new(anchor, head)
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index 8a16dc1b..fd7ea457 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -85,7 +85,7 @@ pub fn default() -> HashMap<Mode, Keymap> {
         "A-n" | "A-right" => select_next_sibling,
 
         "%" => select_all,
-        "x" => extend_line,
+        "x" => extend_line_below,
         "X" => extend_to_line_bounds,
         "A-x" => shrink_to_line_bounds,
 

From ab67788e76c1d2dfd06d571b212dd138b2d29bad Mon Sep 17 00:00:00 2001
From: Roman Chumak <p4ymak@gmail.com>
Date: Mon, 29 Aug 2022 17:00:43 +0300
Subject: [PATCH 010/884] Sonokai (#3595)

Co-authored-by: Roman Chumak <p4ymak@yandex.ru>
---
 runtime/themes/sonokai.toml | 106 ++++++++++++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 runtime/themes/sonokai.toml

diff --git a/runtime/themes/sonokai.toml b/runtime/themes/sonokai.toml
new file mode 100644
index 00000000..54804697
--- /dev/null
+++ b/runtime/themes/sonokai.toml
@@ -0,0 +1,106 @@
+### Sublime Text Sonokai Theme
+## Original Author: sainnhe
+# URL: https://github.com/sainnhe/sonokai
+## Modified by p4ymak
+# URL: https://github.com/p4ymak
+# License: MIT License
+
+"type" = "blue"
+"constant" = "purple"
+"constant.numeric" = "purple"
+"constant.character.escape" = "orange"
+"string" = "yellow"
+"comment" = "grey"
+"variable" = "fg"
+"variable.builtin" = "orange"
+"variable.parameter" = "fg"
+"variable.other.member" = "fg"
+"label" = "orange"
+"punctuation" = "grey"
+"punctuation.delimiter" = "grey"
+"punctuation.bracket" = "fg"
+"keyword" = "red"
+"operator" = "orange"
+"function" = "green"
+"function.builtin" = "blue"
+"function.macro" = "purple"
+"tag" = "yellow"
+"namespace" = "blue"
+"attribute" = "purple"
+"constructor" = "blue"
+"module" = "blue"
+"special" = "orange"
+
+"markup.heading.marker" = "grey"
+"markup.heading.1" = { fg = "red", modifiers = ["bold"] }
+"markup.heading.2" = { fg = "orange", modifiers = ["bold"] }
+"markup.heading.3" = { fg = "yellow", modifiers = ["bold"] }
+"markup.heading.4" = { fg = "green", modifiers = ["bold"] }
+"markup.heading.5" = { fg = "blue", modifiers = ["bold"] }
+"markup.heading.6" = { fg = "fg", modifiers = ["bold"] }
+"markup.list" = "red"
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.link.url" = { fg = "blue", modifiers = ["underlined"] }
+"markup.link.text" = "purple"
+"markup.quote" = "grey"
+"markup.raw" = "green"
+
+"diff.plus" = "green"
+"diff.delta" = "orange"
+"diff.minus" = "red"
+
+"ui.background" = { bg = "bg0" }
+"ui.cursor" = { modifiers = ['reversed'] }
+"ui.cursor.match" = { fg = "orange", bg = "diff_yellow" }
+"ui.cursor.insert" = { fg = "black", bg = "grey" }
+"ui.cursor.select" = { fg = "bg0", bg = "blue" }
+"ui.selection" = { bg = "bg4" }
+"ui.linenr" = "grey"
+"ui.linenr.selected" = "fg"
+"ui.cursorline.primary" = { bg = "bg2" }
+"ui.statusline" = { fg = "fg", bg = "bg3" }
+"ui.statusline.inactive" = { fg = "grey", bg = "bg1" }
+"ui.popup" = { fg = "grey", bg = "bg2" }
+"ui.window" = { fg = "grey", bg = "bg0" }
+"ui.help" = { fg = "fg", bg = "bg1" }
+"ui.text" = "fg"
+"ui.text.focus" = "green"
+"ui.menu" = { fg = "fg", bg = "bg2" }
+"ui.menu.selected" = { fg = "bg0", bg = "green" }
+"ui.virtual.whitespace" = { fg = "grey_dim" }
+"ui.virtual.ruler" = { bg = "grey_dim" }
+
+info = { fg = 'green', bg = 'bg2' }
+hint = { fg = 'blue', bg = 'bg2', modifiers = ['bold'] }
+warning = { fg = 'yellow', bg = 'bg2', modifiers = ['bold'] }
+error = { fg = 'red', bg = 'bg2', modifiers = ['bold'] }
+diagnostic = { modifiers = ['underlined'] }
+
+
+
+[palette]
+
+black = "#181819"
+bg0 = "#2c2e34"
+bg1 = "#33353f"
+bg2 = "#363944"
+bg3 = "#3b3e48"
+bg4 = "#414550"
+bg_red = "#ff6077"
+diff_red = "#55393d"
+bg_green = "#a7df78"
+diff_green = "#394634"
+bg_blue = "#85d3f2"
+diff_blue = "#354157"
+diff_yellow = "#4e432f"
+fg = "#e2e2e3"
+red = "#fc5d7c"
+orange = "#f39660"
+yellow = "#e7c664"
+green = "#9ed072"
+cyan = "#8dd0b6" # added for compatibility with `edge` scheme
+blue = "#76cce0"
+purple = "#b39df3"
+grey = "#7f8490"
+grey_dim = "#595f6f"

From ca4b6eab741f0e535c43427582c595c234977e7a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:54:24 -0500
Subject: [PATCH 011/884] build(deps): bump lsp-types from 0.93.0 to 0.93.1
 (#3601)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0277cc49..6cb4ea8e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -663,9 +663,9 @@ dependencies = [
 
 [[package]]
 name = "lsp-types"
-version = "0.93.0"
+version = "0.93.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70c74e2173b2b31f8655d33724b4b45ac13f439386f66290f539c22b144c2212"
+checksum = "a3bcfee315dde785ba887edb540b08765fd7df75a7d948844be6bf5712246734"
 dependencies = [
  "bitflags",
  "serde",

From 50d5463f90d21423767125946a321977be7f9306 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:54:58 -0500
Subject: [PATCH 012/884] build(deps): bump futures-util from 0.3.23 to 0.3.24
 (#3603)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6cb4ea8e..313d6fcc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -278,9 +278,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.23"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2acedae88d38235936c3922476b10fced7b2b68136f5e3c03c2d5be348a1115"
+checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
 
 [[package]]
 name = "futures-executor"
@@ -295,15 +295,15 @@ dependencies = [
 
 [[package]]
 name = "futures-task"
-version = "0.3.23"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "842fc63b931f4056a24d59de13fb1272134ce261816e063e634ad0c15cdc5306"
+checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
 
 [[package]]
 name = "futures-util"
-version = "0.3.23"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0828a5471e340229c11c77ca80017937ce3c58cb788a17e5f1c2d5c485a9577"
+checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
 dependencies = [
  "futures-core",
  "futures-task",

From 841766ef828870651ac980860a317369bd110cd9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:55:26 -0500
Subject: [PATCH 013/884] build(deps): bump futures-executor from 0.3.23 to
 0.3.24 (#3602)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 313d6fcc..5e8f97bb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -284,9 +284,9 @@ checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.23"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d11aa21b5b587a64682c0094c2bdd4df0076c5324961a40cc3abd7f37930528"
+checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
 dependencies = [
  "futures-core",
  "futures-task",

From ae81fbdbf6e44cc6b2aa35876afab65055e40df5 Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Tue, 30 Aug 2022 04:58:51 +0300
Subject: [PATCH 014/884] Allow less than and greater than in macros (#3556)

* Allow less than and greater than in macros

* Fix failing test
---
 helix-view/src/input.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/helix-view/src/input.rs b/helix-view/src/input.rs
index 9fa679df..a7f526ba 100644
--- a/helix-view/src/input.rs
+++ b/helix-view/src/input.rs
@@ -116,6 +116,8 @@ pub(crate) mod keys {
     pub(crate) const ESC: &str = "esc";
     pub(crate) const SPACE: &str = "space";
     pub(crate) const MINUS: &str = "minus";
+    pub(crate) const LESS_THAN: &str = "lt";
+    pub(crate) const GREATER_THAN: &str = "gt";
 }
 
 impl fmt::Display for KeyEvent {
@@ -156,6 +158,8 @@ impl fmt::Display for KeyEvent {
             KeyCode::Esc => f.write_str(keys::ESC)?,
             KeyCode::Char(' ') => f.write_str(keys::SPACE)?,
             KeyCode::Char('-') => f.write_str(keys::MINUS)?,
+            KeyCode::Char('<') => f.write_str(keys::LESS_THAN)?,
+            KeyCode::Char('>') => f.write_str(keys::GREATER_THAN)?,
             KeyCode::F(i) => f.write_fmt(format_args!("F{}", i))?,
             KeyCode::Char(c) => f.write_fmt(format_args!("{}", c))?,
         };
@@ -228,6 +232,8 @@ impl std::str::FromStr for KeyEvent {
             keys::ESC => KeyCode::Esc,
             keys::SPACE => KeyCode::Char(' '),
             keys::MINUS => KeyCode::Char('-'),
+            keys::LESS_THAN => KeyCode::Char('<'),
+            keys::GREATER_THAN => KeyCode::Char('>'),
             single if single.chars().count() == 1 => KeyCode::Char(single.chars().next().unwrap()),
             function if function.len() > 1 && function.starts_with('F') => {
                 let function: String = function.chars().skip(1).collect();
@@ -548,8 +554,6 @@ mod test {
 
     #[test]
     fn parsing_unsupported_named_keys() {
-        assert!(str::parse::<KeyEvent>("lt").is_err());
-        assert!(str::parse::<KeyEvent>("gt").is_err());
         assert!(str::parse::<KeyEvent>("plus").is_err());
         assert!(str::parse::<KeyEvent>("percent").is_err());
         assert!(str::parse::<KeyEvent>("semicolon").is_err());

From 5f043dde56c20e694078ceb46aac5f053327196c Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 29 Aug 2022 20:59:45 -0500
Subject: [PATCH 015/884] Derive Document language name from languages.toml
 name key (#3338)

* Derive Document language name from `languages.toml` `name` key

This changes switches from deriving the language name from the
`languages.toml` `scope` key to `name` (`language_id` in the
`LanguageConfiguration` type). For the most part it works to derive the
language name from scope by chopping off `source.` or `rsplit_once` on
`.` but for some languages we have now like html (`text.html.basic`),
it doesn't. This also should be a more accurate fallback for the
`language_id` method which is used in LSP and currently uses the
`rsplit_once` strategy.

Here we expose the language's name as `language_name` on `Document` and
replace ad-hoc calculations of the language name with the new method.

This is most impactful for the `file-type` statusline element which is
using `language_id`.

* Use `Document::language_name` for the `file-type` statusline element

The `file-type` indicator element in the statusline was using
`Document::language_id` which is meant to be used to for telling
Language Servers what language we're using. That works for languages
with `language-server` configurations in `languages.toml` but shows
text otherwise. The new `Document::language_name` method from the
parent commit is a more accurate way to determine the language.
---
 helix-term/src/commands/lsp.rs  |  5 +----
 helix-term/src/ui/completion.rs |  5 +----
 helix-term/src/ui/statusline.rs |  2 +-
 helix-view/src/document.rs      | 16 +++++++++++++---
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 38507e4d..61eed638 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -863,10 +863,7 @@ pub fn signature_help_impl(cx: &mut Context, invoked: SignatureHelpInvoked) {
                 }
             };
             let doc = doc!(editor);
-            let language = doc
-                .language()
-                .and_then(|scope| scope.strip_prefix("source."))
-                .unwrap_or("");
+            let language = doc.language_name().unwrap_or("");
 
             let signature = match response
                 .signatures
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 87913a8c..2d7d4f92 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -324,10 +324,7 @@ impl Component for Completion {
             // option.documentation
 
             let (view, doc) = current!(cx.editor);
-            let language = doc
-                .language()
-                .and_then(|scope| scope.strip_prefix("source."))
-                .unwrap_or("");
+            let language = doc.language_name().unwrap_or("");
             let text = doc.text().slice(..);
             let cursor_pos = doc.selection(view.id).primary().cursor(text);
             let coords = helix_core::visual_coords_at_pos(text, cursor_pos, doc.tab_width());
diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index 75e5dbd7..b2836f50 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -329,7 +329,7 @@ fn render_file_type<F>(context: &mut RenderContext, write: F)
 where
     F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
 {
-    let file_type = context.doc.language_id().unwrap_or("text");
+    let file_type = context.doc.language_name().unwrap_or("text");
 
     write(context, format!(" {} ", file_type), None);
 }
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index c96f222d..0668e99d 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -926,22 +926,32 @@ impl Document {
     }
 
     /// Corresponding language scope name. Usually `source.<lang>`.
-    pub fn language(&self) -> Option<&str> {
+    pub fn language_scope(&self) -> Option<&str> {
         self.language
             .as_ref()
             .map(|language| language.scope.as_str())
     }
 
+    /// Language name for the document. Corresponds to the `name` key in
+    /// `languages.toml` configuration.
+    pub fn language_name(&self) -> Option<&str> {
+        self.language
+            .as_ref()
+            .map(|language| language.language_id.as_str())
+    }
+
     /// Language ID for the document. Either the `language-id` from the
     /// `language-server` configuration, or the document language if no
     /// `language-id` has been specified.
     pub fn language_id(&self) -> Option<&str> {
-        self.language_config()?
+        let language_config = self.language.as_deref()?;
+
+        language_config
             .language_server
             .as_ref()?
             .language_id
             .as_deref()
-            .or_else(|| Some(self.language()?.rsplit_once('.')?.1))
+            .or(Some(language_config.language_id.as_str()))
     }
 
     /// Corresponding [`LanguageConfiguration`].

From d2cec25395e01ded0977c1314e377cb24186c6c5 Mon Sep 17 00:00:00 2001
From: PiergiorgioZagaria
 <75474806+PiergiorgioZagaria@users.noreply.github.com>
Date: Tue, 30 Aug 2022 04:02:34 +0200
Subject: [PATCH 016/884] Fix process spawning error handling (#3349)

* Fix process spawning error handling

* Log stderr in any case
---
 helix-term/src/commands.rs | 14 ++++++++++++--
 helix-view/src/document.rs | 30 ++++++++++++++++++------------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 885afa18..cb5460af 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4596,8 +4596,18 @@ fn shell_impl(
     }
     let output = process.wait_with_output()?;
 
-    if !output.stderr.is_empty() {
-        log::error!("Shell error: {}", String::from_utf8_lossy(&output.stderr));
+    if !output.status.success() {
+        if !output.stderr.is_empty() {
+            let err = String::from_utf8_lossy(&output.stderr).to_string();
+            log::error!("Shell error: {}", err);
+            bail!("Shell error: {}", err);
+        }
+        bail!("Shell command failed");
+    } else if !output.stderr.is_empty() {
+        log::debug!(
+            "Command printed to stderr: {}",
+            String::from_utf8_lossy(&output.stderr).to_string()
+        );
     }
 
     let str = std::str::from_utf8(&output.stdout)
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 0668e99d..b2a66415 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -440,17 +440,22 @@ impl Document {
                     .await
                     .map_err(|_| FormatterError::WaitForOutputFailed)?;
 
-                if !output.stderr.is_empty() {
-                    return Err(FormatterError::Stderr(
-                        String::from_utf8_lossy(&output.stderr).to_string(),
-                    ));
-                }
-
                 if !output.status.success() {
-                    return Err(FormatterError::NonZeroExitStatus);
+                    if !output.stderr.is_empty() {
+                        let err = String::from_utf8_lossy(&output.stderr).to_string();
+                        log::error!("Formatter error: {}", err);
+                        return Err(FormatterError::NonZeroExitStatus(Some(err)));
+                    }
+
+                    return Err(FormatterError::NonZeroExitStatus(None));
+                } else if !output.stderr.is_empty() {
+                    log::debug!(
+                        "Formatter printed to stderr: {}",
+                        String::from_utf8_lossy(&output.stderr).to_string()
+                    );
                 }
 
-                let str = String::from_utf8(output.stdout)
+                let str = std::str::from_utf8(&output.stdout)
                     .map_err(|_| FormatterError::InvalidUtf8Output)?;
 
                 Ok(helix_core::diff::compare_ropes(&text, &Rope::from(str)))
@@ -1102,10 +1107,9 @@ pub enum FormatterError {
     },
     BrokenStdin,
     WaitForOutputFailed,
-    Stderr(String),
     InvalidUtf8Output,
     DiskReloadError(String),
-    NonZeroExitStatus,
+    NonZeroExitStatus(Option<String>),
 }
 
 impl std::error::Error for FormatterError {}
@@ -1118,10 +1122,12 @@ impl Display for FormatterError {
             }
             Self::BrokenStdin => write!(f, "Could not write to formatter stdin"),
             Self::WaitForOutputFailed => write!(f, "Waiting for formatter output failed"),
-            Self::Stderr(output) => write!(f, "Formatter error: {}", output),
             Self::InvalidUtf8Output => write!(f, "Invalid UTF-8 formatter output"),
             Self::DiskReloadError(error) => write!(f, "Error reloading file from disk: {}", error),
-            Self::NonZeroExitStatus => write!(f, "Formatter exited with non zero exit status:"),
+            Self::NonZeroExitStatus(Some(output)) => write!(f, "Formatter error: {}", output),
+            Self::NonZeroExitStatus(None) => {
+                write!(f, "Formatter exited with non zero exit status")
+            }
         }
     }
 }

From 8a4fbf6daf980b08de83e936c4a2b4bf8beaa2d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 30 Aug 2022 12:23:49 +0900
Subject: [PATCH 017/884] completion: remove_follow links on filename_impl

We don't need to follow links since we're only scanning the current
directory level (non-recursive).
---
 helix-term/src/ui/mod.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 560e9155..485ee848 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -381,7 +381,7 @@ pub mod completers {
     }
 
     // TODO: we could return an iter/lazy thing so it can fetch as many as it needs.
-    fn filename_impl<F>(editor: &Editor, input: &str, filter_fn: F) -> Vec<Completion>
+    fn filename_impl<F>(_editor: &Editor, input: &str, filter_fn: F) -> Vec<Completion>
     where
         F: Fn(&ignore::DirEntry) -> FileMatch,
     {
@@ -413,7 +413,7 @@ pub mod completers {
 
         let mut files: Vec<_> = WalkBuilder::new(&dir)
             .hidden(false)
-            .follow_links(editor.config().file_picker.follow_symlinks)
+            .follow_links(false) // We're scanning over depth 1
             .max_depth(Some(1))
             .build()
             .filter_map(|file| {

From e77b7d147cd03c4e7d7835993317150428b083ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 30 Aug 2022 12:27:04 +0900
Subject: [PATCH 018/884] fix: Recalculate completion after pasting into prompt

---
 helix-term/src/ui/prompt.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 5e8cd1f5..1ac83390 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -470,6 +470,7 @@ impl Component for Prompt {
         let event = match event {
             Event::Paste(data) => {
                 self.insert_str(data);
+                self.recalculate_completion(cx.editor);
                 return EventResult::Consumed(None);
             }
             Event::Key(event) => *event,

From 1de17a2530e037730e20a957a2fc0874b6b27b35 Mon Sep 17 00:00:00 2001
From: Kristoffer Flottorp <2630397+krfl@users.noreply.github.com>
Date: Tue, 30 Aug 2022 15:15:38 +0200
Subject: [PATCH 019/884] Fix fleetish theme (#3607)

Co-authored-by: krfl <kr.fl@outlook.com>
---
 runtime/themes/fleetish.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/runtime/themes/fleetish.toml b/runtime/themes/fleetish.toml
index 879b8750..70de2f8a 100644
--- a/runtime/themes/fleetish.toml
+++ b/runtime/themes/fleetish.toml
@@ -10,7 +10,7 @@
 "constant.numeric" = { fg = "yellow" } # .integer / .float
 "string" = { fg = "pink" } # .regexp
 # "string.special" = {} #.path / .url / .symbol
-"string.special" = { modifier = ["underline"] } #.path / .url / .symbol
+"string.special" = { modifiers = ["underlined"] } #.path / .url / .symbol
 "comment" = { fg = "dark_gray" } # .line
 # "comment.block" = {} # .documentation
 "variable" = { fg = "light" } # .builtin / .parameter
@@ -102,6 +102,7 @@ blue_accent = "#2197F3"
 pink_accent = "#E44C7A"
 green_accent = "#00AF99"
 orange_accent = "#EE7F25"
+yellow_accent = "#DEA407"
 
 # variables intended for future updates
 checkmark = "#44B254"

From 86b80e6ce652db0e0150414f70cb09f5106e516c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Aug 2022 08:47:03 +0900
Subject: [PATCH 020/884] build(deps): bump iana-time-zone from 0.1.44 to
 0.1.47 (#3611)

Bumps [iana-time-zone](https://github.com/strawlab/iana-time-zone) from 0.1.44 to 0.1.47.
- [Release notes](https://github.com/strawlab/iana-time-zone/releases)
- [Changelog](https://github.com/strawlab/iana-time-zone/blob/main/CHANGELOG.md)
- [Commits](https://github.com/strawlab/iana-time-zone/compare/0.1.44...v0.1.47)

---
updated-dependencies:
- dependency-name: iana-time-zone
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5e8f97bb..122e0d83 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13,9 +13,9 @@ dependencies = [
 
 [[package]]
 name = "android_system_properties"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
 dependencies = [
  "libc",
 ]
@@ -550,13 +550,14 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.44"
+version = "0.1.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf7d67cf4a22adc5be66e75ebdf769b3f2ea032041437a7061f97a63dad4b"
+checksum = "4c495f162af0bf17656d0014a0eded5f3cd2f365fdd204548c2869db89359dc7"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "winapi",
 ]

From 16525349dbb2b72064e1cfb5cc3164dc236fd367 Mon Sep 17 00:00:00 2001
From: Alexander Brevig <alexanderbrevig@gmail.com>
Date: Wed, 31 Aug 2022 03:27:40 +0200
Subject: [PATCH 021/884] Themes update (#3587)

* lint: snazzy

* lint: pop-dark

* lint: penumbra+

* lint: noctis_bordo

* lint: ingrid

* lint: flatwhite

* lint: doom_acario_dark

* lint: dark_plus

* lint: boo_berry

* fix: use 47345E per author instruction

* lint: bogster

* lint: everforest

* lint: acme

* lint: serika

* fix: use nasty_red per author suggestion

* lint: nord

* lint: dracula

* lint: gruvbox

* fix: cursorline gruvbox

* lint: autumn

* fix: no fg for cursorline

* lint: ayu

* lint: rose_pine

* lint: monokai

* lint: solarized

* lint: spacebones

* fix: penumbra bg!=sky

* Update runtime/themes/ayu_light.toml

Co-authored-by: Ivan Tham <pickfire@riseup.net>

* Update runtime/themes/ayu_light.toml

Co-authored-by: Ivan Tham <pickfire@riseup.net>

* fix: fg for ui.help thanks @pickfire

* fix: ingrid with input from @intarga

Co-authored-by: Ivan Tham <pickfire@riseup.net>
---
 runtime/themes/acme.toml                  | 10 ++++++++--
 runtime/themes/autumn.toml                |  1 +
 runtime/themes/autumn_night.toml          |  1 +
 runtime/themes/ayu_dark.toml              |  9 +++++----
 runtime/themes/ayu_light.toml             |  7 ++++---
 runtime/themes/ayu_mirage.toml            |  7 ++++---
 runtime/themes/bogster.toml               |  2 ++
 runtime/themes/boo_berry.toml             |  4 +++-
 runtime/themes/dark_plus.toml             |  6 +++---
 runtime/themes/doom_acario_dark.toml      |  6 +++---
 runtime/themes/dracula.toml               |  1 +
 runtime/themes/dracula_at_night.toml      |  2 ++
 runtime/themes/everforest_dark.toml       |  2 ++
 runtime/themes/everforest_light.toml      |  2 ++
 runtime/themes/flatwhite.toml             |  1 +
 runtime/themes/gruvbox.toml               |  2 ++
 runtime/themes/gruvbox_light.toml         |  2 ++
 runtime/themes/ingrid.toml                | 11 +++++++----
 runtime/themes/monokai.toml               |  8 +++++---
 runtime/themes/monokai_pro.toml           |  8 +++++---
 runtime/themes/monokai_pro_machine.toml   |  6 ++++--
 runtime/themes/monokai_pro_octagon.toml   |  6 ++++--
 runtime/themes/monokai_pro_ristretto.toml |  6 ++++--
 runtime/themes/monokai_pro_spectrum.toml  |  8 +++++---
 runtime/themes/noctis_bordo.toml          |  2 ++
 runtime/themes/nord.toml                  |  1 +
 runtime/themes/nord_light.toml            |  5 ++++-
 runtime/themes/onedark.toml               |  2 +-
 runtime/themes/penumbra+.toml             |  6 +++---
 runtime/themes/pop-dark.toml              |  9 +++++----
 runtime/themes/rose_pine.toml             |  3 ++-
 runtime/themes/rose_pine_dawn.toml        |  3 ++-
 runtime/themes/rose_pine_moon.toml        |  4 +++-
 runtime/themes/serika-dark.toml           |  6 ++++--
 runtime/themes/serika-light.toml          |  5 ++++-
 runtime/themes/snazzy.toml                |  2 ++
 runtime/themes/solarized_dark.toml        |  2 ++
 runtime/themes/solarized_light.toml       |  2 ++
 runtime/themes/spacebones_light.toml      |  1 +
 39 files changed, 118 insertions(+), 53 deletions(-)

diff --git a/runtime/themes/acme.toml b/runtime/themes/acme.toml
index 263cbf90..3bd5987a 100644
--- a/runtime/themes/acme.toml
+++ b/runtime/themes/acme.toml
@@ -3,14 +3,20 @@
 "ui.background" = {bg="acme_bg"}
 "ui.text" = "black"
 "ui.selection" = {bg="selected"}
-"ui.statusline" = {bg="acme_bar_bg"}
-"ui.statusline.inactive" = {bg="acme_bar_inactive"}
+"ui.cursorline" = {bg="acme_bar_bg"}
+"ui.statusline" = {fg="black", bg="acme_bar_bg"}
+"ui.statusline.inactive" = {fg="black", bg="acme_bar_inactive"}
 "ui.virtual" = "indent"
+"ui.virtual.ruler" = { bg = "acme_bar_bg" }
 "ui.cursor.match" = {bg="acme_bar_bg"}
 "ui.cursor" = {bg="cursor", fg="white"}
 "string" = "red"
 "comment" = "green"
+"ui.help" = {fg="black", bg="acme_bg"}
+"ui.popup" = {fg="black", bg="acme_bg"}
+"ui.menu" = {fg="black", bg="acme_bg"}
 "ui.menu.selected" = {bg="selected"}
+"ui.window" = {bg="acme_bg"}
 "diagnostic.error" = {bg="white", modifiers=["bold"]}
 "diagnostic.warning" = {bg="white", modifiers=["bold"]}
 "diagnostic.hint" = {bg="white", modifiers=["bold"]}
diff --git a/runtime/themes/autumn.toml b/runtime/themes/autumn.toml
index d9c2f8a6..b13aeef2 100644
--- a/runtime/themes/autumn.toml
+++ b/runtime/themes/autumn.toml
@@ -16,6 +16,7 @@
 "ui.linenr.selected" = { fg = "my_gray6", bg = "my_gray1"}
 "ui.selection" = { bg = "my_gray3" }
 "comment" = { fg = "my_gray4", modifiers = ["italic"] }
+"ui.cursorline" = { bg = "my_gray2" }
 "ui.statusline" = { fg = "my_gray6", bg = "my_gray2" }
 "ui.statusline.inactive" = { fg = 'my_gray4', bg = 'my_gray2' }
 "ui.statusline.insert" = {fg = "my_black", bg = "my_gray5", modifiers = ["bold"]}
diff --git a/runtime/themes/autumn_night.toml b/runtime/themes/autumn_night.toml
index b4a7c6c0..2f398dc9 100644
--- a/runtime/themes/autumn_night.toml
+++ b/runtime/themes/autumn_night.toml
@@ -16,6 +16,7 @@
 "ui.linenr.selected" = { fg = "my_gray6", bg = "my_gray1"}
 "ui.selection" = { bg = "my_gray3" }
 "comment" = { fg = "my_gray4", modifiers = ["italic"] }
+"ui.cursorline" = { bg = "my_gray2" }
 "ui.statusline" = { fg = "my_gray6", bg = "my_gray2" }
 "ui.statusline.inactive" = { fg = 'my_gray4', bg = 'my_gray2' }
 "ui.statusline.insert" = {fg = "my_black", bg = "my_gray5", modifiers = ["bold"]}
diff --git a/runtime/themes/ayu_dark.toml b/runtime/themes/ayu_dark.toml
index 09ed2467..f6dc1c81 100644
--- a/runtime/themes/ayu_dark.toml
+++ b/runtime/themes/ayu_dark.toml
@@ -38,16 +38,17 @@
 "ui.cursor.match" = { fg = "orange" }
 "ui.linenr" = { fg = "dark_gray" }
 "ui.linenr.selected" = { fg = "orange" }
-"ui.statusline" = { bg = "black" }
-"ui.popup" = { bg = "black" }
+"ui.statusline" = { fg = "foreground", bg = "black" }
+"ui.cursorline" = { bg = "black" }
+"ui.popup" = { fg = "#7B91b3", bg = "black" }
 "ui.window" = { fg = "dark_gray" }
-"ui.help" = { bg = "black" }
+"ui.help" = { fg = "#7B91b3", bg = "black" }
 "ui.text" = { fg = "foreground" }
 "ui.text.focus" = { bg = "dark_gray", fg = "foreground" }
 "ui.text.info" = { fg = "foreground" }
 "ui.virtual.whitespace" = { fg = "dark_gray" }
 "ui.virtual.ruler" = { bg = "black" }
-"ui.menu" = { bg = "black" }
+"ui.menu" = { fg = "foreground", bg = "black" }
 "ui.menu.selected" = { bg = "orange", fg = "background" }
 "ui.selection" = { bg = "dark_gray" }
 "warning" = { fg = "yellow" }
diff --git a/runtime/themes/ayu_light.toml b/runtime/themes/ayu_light.toml
index e0da4393..3a543f5f 100644
--- a/runtime/themes/ayu_light.toml
+++ b/runtime/themes/ayu_light.toml
@@ -38,16 +38,17 @@
 "ui.cursor.match" = { fg = "orange" }
 "ui.linenr" = { fg = "dark_gray" }
 "ui.linenr.selected" = { fg = "orange" }
-"ui.statusline" = { bg = "black" }
+"ui.cursorline" = { bg = "black" }
+"ui.statusline" = { fg = "foreground", bg = "black" }
 "ui.popup" = { bg = "black" }
 "ui.window" = { fg = "dark_gray" }
-"ui.help" = { bg = "black" }
+"ui.help" = { fg  = "foreground", bg = "black" }
 "ui.text" = { fg = "foreground" }
 "ui.text.focus" = { bg = "dark_gray", fg = "foreground" }
 "ui.text.info" = { fg = "foreground" }
 "ui.virtual.whitespace" = { fg = "dark_gray" }
 "ui.virtual.ruler" = { bg = "black" }
-"ui.menu" = { bg = "black" }
+"ui.menu" = { fg = "foreground", bg = "black" }
 "ui.menu.selected" = { bg = "orange", fg = "background" }
 "ui.selection" = { bg = "dark_gray" }
 "warning" = { fg = "yellow" }
diff --git a/runtime/themes/ayu_mirage.toml b/runtime/themes/ayu_mirage.toml
index 533bbfb0..d6c9410d 100644
--- a/runtime/themes/ayu_mirage.toml
+++ b/runtime/themes/ayu_mirage.toml
@@ -38,16 +38,17 @@
 "ui.cursor.match" = { fg = "orange" }
 "ui.linenr" = { fg = "dark_gray" }
 "ui.linenr.selected" = { fg = "orange" }
-"ui.statusline" = { bg = "black" }
+"ui.cursorline" = { bg = "black" }
+"ui.statusline" = { fg = "foreground", bg = "black" }
 "ui.popup" = { bg = "black" }
 "ui.window" = { fg = "dark_gray" }
-"ui.help" = { bg = "black" }
+"ui.help" = { fg = "foreground", bg = "black" }
 "ui.text" = { fg = "foreground" }
 "ui.text.focus" = { bg = "dark_gray", fg = "foreground" }
 "ui.text.info" = { fg = "foreground" }
 "ui.virtual.whitespace" = { fg = "dark_gray" }
 "ui.virtual.ruler" = { bg = "black" }
-"ui.menu" = { bg = "black" }
+"ui.menu" = { fg = "foreground", bg = "black" }
 "ui.menu.selected" = { bg = "orange", fg = "background" }
 "ui.selection" = { bg = "dark_gray" }
 "warning" = { fg = "yellow" }
diff --git a/runtime/themes/bogster.toml b/runtime/themes/bogster.toml
index 76e24648..44bbaf92 100644
--- a/runtime/themes/bogster.toml
+++ b/runtime/themes/bogster.toml
@@ -45,6 +45,7 @@
 "ui.background" = { bg = "#161c23" }
 "ui.linenr" = { fg = "#415367" }
 "ui.linenr.selected" = { fg = "#e5ded6" }  # TODO
+"ui.cursorline" = { bg = "#131920" }
 "ui.statusline" = { fg = "#e5ded6", bg = "#232d38" }
 "ui.statusline.inactive" = { fg = "#c6b8ad", bg = "#232d38" }
 "ui.popup" = { bg = "#232d38" }
@@ -54,6 +55,7 @@
 "ui.text" = { fg = "#e5ded6" }
 "ui.text.focus" = { fg = "#e5ded6", modifiers= ["bold"] }
 "ui.virtual.whitespace" = "#627d9d"
+"ui.virtual.ruler" = { bg = "#131920" }
 
 "ui.selection" = { bg = "#313f4e" }
 # "ui.cursor.match"  # TODO might want to override this because dimmed is not widely supported
diff --git a/runtime/themes/boo_berry.toml b/runtime/themes/boo_berry.toml
index 1509a1dc..a582e87e 100644
--- a/runtime/themes/boo_berry.toml
+++ b/runtime/themes/boo_berry.toml
@@ -34,6 +34,7 @@
 "ui.cursor.insert" = { fg = "berry", bg = "mint" }
 "ui.linenr" = { fg = "berry_desaturated" }
 "ui.linenr.selected" = { fg = "lilac" }
+"ui.cursorline" = { fg = "lilac", bg = "berry_dim" }
 "ui.statusline" = { fg = "lilac", bg = "berry_saturated" }
 "ui.statusline.inactive" = { fg = "berry_desaturated", bg = "berry_saturated" }
 "ui.popup" = { fg = "lilac", bg = "berry_saturated" }
@@ -45,7 +46,7 @@
 "ui.menu.selected" = { fg = "mint", bg = "berry_saturated" }
 "ui.selection" = { bg = "berry_saturated" }
 "ui.virtual.whitespace" = { fg = "berry_desaturated" }
-"ui.virtual.ruler" = { bg ="berry_desaturated" }
+"ui.virtual.ruler" = { bg ="berry_dim" }
 
 "diff.plus" = { fg = "mint" }
 "diff.delta" = { fg = "gold" }
@@ -59,6 +60,7 @@
 
 [palette]
 berry = "#3A2A4D"
+berry_dim = "#47345E"
 berry_saturated = "#2B1C3D"
 berry_desaturated = "#886C9C"
 bubblegum = "#D678B5"
diff --git a/runtime/themes/dark_plus.toml b/runtime/themes/dark_plus.toml
index 451c28b5..29a55281 100644
--- a/runtime/themes/dark_plus.toml
+++ b/runtime/themes/dark_plus.toml
@@ -56,9 +56,9 @@
 "ui.background" = { fg = "light_gray", bg = "dark_gray2" }
 
 "ui.window" = { bg = "widget" }
-"ui.popup" = { bg = "widget" }
-"ui.help" = { bg = "widget" }
-"ui.menu" = { bg = "widget" }
+"ui.popup" = { fg = "text", bg = "widget" }
+"ui.help" = { fg = "text", bg = "widget" }
+"ui.menu" = { fg = "text", bg = "widget" }
 "ui.menu.selected" = { bg = "dark_blue2" }
 
 # TODO: Alternate bg colour for `ui.cursor.match` and `ui.selection`.
diff --git a/runtime/themes/doom_acario_dark.toml b/runtime/themes/doom_acario_dark.toml
index ba7c28e8..4ff90476 100644
--- a/runtime/themes/doom_acario_dark.toml
+++ b/runtime/themes/doom_acario_dark.toml
@@ -49,19 +49,19 @@
 'ui.cursorline' = { bg = 'bg-alt' }
 'ui.linenr' = { fg = 'base4' }
 'ui.linenr.selected' = { fg = 'orange', bg = 'bg-alt', modifiers = ['bold'] }
-'ui.statusline' = { bg = 'base3' }
+'ui.statusline' = { fg = 'fg', bg = 'base3' }
 'ui.statusline.normal' = { bg = 'base3' }
 'ui.statusline.insert' = { bg = 'base3' }
 'ui.statusline.select' = { bg = 'base3' }
 'ui.popup' = { bg = 'bg-alt' }
 'ui.window' = { fg = 'gray' }
-'ui.help' = { bg = 'base2' }
+'ui.help' = { fg = 'fg', bg = 'base2' }
 'ui.text' = { fg = 'fg' }
 'ui.text.focus' = { bg = 'bg-alt', fg = 'fg' }
 'ui.text.info' = { fg = 'fg' }
 'ui.virtual.whitespace' = { fg = 'base2' }
 'ui.virtual.ruler' = { bg = 'black' }
-'ui.menu' = { bg = 'bg-alt' }
+'ui.menu' = { fg = 'fg', bg = 'bg-alt' }
 'ui.menu.selected' = { bg = 'base3', fg = 'fg' }
 'ui.selection' = { bg = 'base2' }
 
diff --git a/runtime/themes/dracula.toml b/runtime/themes/dracula.toml
index e3f5c625..90bdb446 100644
--- a/runtime/themes/dracula.toml
+++ b/runtime/themes/dracula.toml
@@ -41,6 +41,7 @@
 "ui.text.focus" = { fg = "cyan" }
 "ui.window" = { fg = "foreground" }
 "ui.virtual.whitespace" = { fg = "comment" }
+"ui.virtual.ruler" = { bg = "background_dark"}
 
 "error" = { fg = "red" }
 "warning" = { fg = "cyan" }
diff --git a/runtime/themes/dracula_at_night.toml b/runtime/themes/dracula_at_night.toml
index 776641a7..4a32f930 100644
--- a/runtime/themes/dracula_at_night.toml
+++ b/runtime/themes/dracula_at_night.toml
@@ -32,6 +32,7 @@
 "ui.popup" = { fg = "foreground", bg = "background_dark" }
 "ui.selection" = { fg = "background", bg = "purple", modifiers = ["dim"] }
 "ui.selection.primary" = { fg = "background", bg = "pink" }
+"ui.cursorline" = { bg = "background_dark" }
 "ui.statusline" = { fg = "foreground", bg = "background_dark" }
 "ui.statusline.inactive" = { fg = "comment", bg = "background_dark" }
 "ui.statusline.normal" = { fg = "background_dark", bg = "cyan" }
@@ -40,6 +41,7 @@
 "ui.text" = { fg = "foreground" }
 "ui.text.focus" = { fg = "cyan" }
 "ui.window" = { fg = "foreground" }
+"ui.virtual.ruler" = { bg = "background_dark" }
 
 "error" = { fg = "red" }
 "warning" = { fg = "cyan" }
diff --git a/runtime/themes/everforest_dark.toml b/runtime/themes/everforest_dark.toml
index ef74ea9e..625e7df9 100644
--- a/runtime/themes/everforest_dark.toml
+++ b/runtime/themes/everforest_dark.toml
@@ -60,6 +60,7 @@
 "ui.cursor.select" = { fg = "bg0", bg = "blue" }
 "ui.linenr" = "grey0"
 "ui.linenr.selected" = "fg"
+"ui.cursorline" = { bg = "bg1" }
 "ui.statusline" = { fg = "grey2", bg = "bg2" }
 "ui.statusline.inactive" = { fg = "grey0", bg = "bg1" }
 "ui.popup" = { fg = "grey2", bg = "bg1" }
@@ -71,6 +72,7 @@
 "ui.menu.selected" = { fg = "bg0", bg = "green" }
 "ui.selection" = { bg = "bg3" }
 "ui.virtual.whitespace" = "grey0"
+"ui.virtual.ruler" = { bg = "bg1" }
 
 "hint" = "blue"
 "info" = "aqua"
diff --git a/runtime/themes/everforest_light.toml b/runtime/themes/everforest_light.toml
index 60557ba0..43f94618 100644
--- a/runtime/themes/everforest_light.toml
+++ b/runtime/themes/everforest_light.toml
@@ -60,6 +60,7 @@
 "ui.cursor.select" = { fg = "bg0", bg = "blue" }
 "ui.linenr" = "grey0"
 "ui.linenr.selected" = "fg"
+"ui.cursorline" = { bg = "bg1" }
 "ui.statusline" = { fg = "grey2", bg = "bg2" }
 "ui.statusline.inactive" = { fg = "grey0", bg = "bg1" }
 "ui.popup" = { fg = "grey2", bg = "bg1" }
@@ -71,6 +72,7 @@
 "ui.menu.selected" = { fg = "bg0", bg = "green" }
 "ui.selection" = { bg = "bg3" }
 "ui.virtual.whitespace" = "grey0"
+"ui.virtual.ruler" = { bg = "bg1" }
 
 "hint" = "blue"
 "info" = "aqua"
diff --git a/runtime/themes/flatwhite.toml b/runtime/themes/flatwhite.toml
index f290ff41..030947e6 100644
--- a/runtime/themes/flatwhite.toml
+++ b/runtime/themes/flatwhite.toml
@@ -57,6 +57,7 @@
 "ui.linenr.selected" = { bg = "base6", modifiers = ["reversed"] }
 
 "ui.statusline" = { fg = "base7", bg = "base1", modifiers = ["bold"] }
+"ui.statusline.inactive" = { fg = "base7", bg = "base3" }
 "ui.statusline.normal" = { fg = "base7", bg = "base1", modifiers = ["bold"] }
 "ui.statusline.insert" = { fg = "purple_text", bg = "purple_bg", modifiers = [
   "bold",
diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml
index 00ec2a8c..aa7a464a 100644
--- a/runtime/themes/gruvbox.toml
+++ b/runtime/themes/gruvbox.toml
@@ -41,6 +41,7 @@
 "ui.background" = { bg = "bg0" }
 "ui.linenr" = { fg = "bg4" }
 "ui.linenr.selected" = { fg = "yellow1" }
+"ui.cursorline" = { bg = "bg1" }
 "ui.statusline" = { fg = "fg1", bg = "bg2" }
 "ui.statusline.normal" = { fg = "fg1", bg = "bg2" }
 "ui.statusline.insert" = { fg = "fg1", bg = "blue0" }
@@ -57,6 +58,7 @@
 "ui.menu" = { fg = "fg1", bg = "bg2" }
 "ui.menu.selected" = { fg = "bg2", bg = "blue1", modifiers = ["bold"] }
 "ui.virtual.whitespace" = "bg2"
+"ui.virtual.ruler" = { bg = "bg1" }
 
 "diagnostic" = { modifiers = ["underlined"] }
 
diff --git a/runtime/themes/gruvbox_light.toml b/runtime/themes/gruvbox_light.toml
index a4817b48..dc7e3db1 100644
--- a/runtime/themes/gruvbox_light.toml
+++ b/runtime/themes/gruvbox_light.toml
@@ -42,6 +42,7 @@
 "ui.background" = { bg = "bg0" }
 "ui.linenr" = { fg = "bg4" }
 "ui.linenr.selected" = { fg = "yellow1" }
+"ui.cursorline" = { bg = "bg1" }
 "ui.statusline" = { fg = "fg1", bg = "bg2" }
 "ui.statusline.normal" = { fg = "fg1", bg = "bg2" }
 "ui.statusline.insert" = { fg = "fg1", bg = "blue0" }
@@ -58,6 +59,7 @@
 "ui.menu" = { fg = "fg1", bg = "bg2" }
 "ui.menu.selected" = { fg = "bg2", bg = "blue1", modifiers = ["bold"] }
 "ui.virtual.whitespace" = "bg2"
+"ui.virtual.ruler" = { bg = "bg1" }
 
 "diagnostic" = { modifiers = ["underlined"] }
 
diff --git a/runtime/themes/ingrid.toml b/runtime/themes/ingrid.toml
index 58713704..8e70587e 100644
--- a/runtime/themes/ingrid.toml
+++ b/runtime/themes/ingrid.toml
@@ -44,19 +44,22 @@
 
 "ui.background" = { bg = "#FFFCFD" }
 "ui.linenr" = { fg = "#bbbbbb" }
-"ui.linenr.selected" = { fg = "#F3EAE9" }  # TODO
+"ui.linenr.selected" = { fg = "#ED5466", modifiers = ["bold"] }
+"ui.cursorline" = { bg = "#F3EAE9" }
 "ui.statusline" = { fg = "#250E07", bg = "#F3EAE9" }
 "ui.statusline.inactive" = { fg = "#7b91b3", bg = "#F3EAE9" }
-"ui.popup" = { bg = "#F3EAE9" }
+"ui.popup" = { fg = "#7B91b3", bg = "#F3E8E9" }
 "ui.window" = { bg = "#D8B8B3" }
 "ui.help" = { bg = "#D8B8B3", fg = "#250E07" }
 
 "ui.text" = { fg = "#7B91B3" }
 "ui.text.focus" = { fg = "#250E07", modifiers= ["bold"] }
 "ui.virtual.whitespace" = "#A6B6CE"
+"ui.virtual.ruler" = { bg = "#F3EAE9" }
 
-"ui.selection" = { bg = "#540099" }
-# "ui.cursor.match"  # TODO might want to override this because dimmed is not widely supported
+"ui.selection" = { bg = "#F3EAE9" }
+"ui.cursor.primary" = { bg = "#ED5466", fg = "#FFFCFD", modifiers = ["bold"] }
+"ui.cursor.match" = { bg = "#F3EAE9", fg = "#ED5466", modifiers = ["bold"] }
 "ui.menu" = { fg = "#7B91B3", bg = "#F3EAE9" }
 "ui.menu.selected" = { fg = "#D74E50", bg = "#F3EAE9" }
 
diff --git a/runtime/themes/monokai.toml b/runtime/themes/monokai.toml
index 2d11601c..0935ceff 100644
--- a/runtime/themes/monokai.toml
+++ b/runtime/themes/monokai.toml
@@ -33,6 +33,7 @@
 
 "comment" = { fg = "#88846F" }
 "ui.virtual.whitespace" = "#88846F"
+"ui.virtual.ruler" = { bg = "#24241e" }
 
 "string" = { fg = "#e6db74" }
 "constant.character" = { fg = "#e6db74" }
@@ -57,9 +58,9 @@
 "ui.background" = { fg = "text", bg = "background" }
 
 "ui.window" = { bg = "widget" }
-"ui.popup" = { bg = "widget" }
-"ui.help" = { bg = "widget" }
-"ui.menu" = { bg = "widget" }
+"ui.popup" = { fg = "text", bg = "widget" }
+"ui.help" = { fg = "text", bg = "widget" }
+"ui.menu" = { fg = "text", bg = "widget" }
 "ui.menu.selected" = { bg = "#414339" }
 
 "ui.cursor" = { fg = "cursor", modifiers = ["reversed"] }
@@ -72,6 +73,7 @@
 "ui.linenr" = { fg = "#90908a" }
 "ui.linenr.selected" = { fg = "#c2c2bf" }
 
+"ui.cursorline" = { bg = "#24241e" }
 "ui.statusline" = { fg = "active_text", bg = "#414339" }
 "ui.statusline.inactive" = { fg = "active_text", bg = "#75715e" }
 
diff --git a/runtime/themes/monokai_pro.toml b/runtime/themes/monokai_pro.toml
index 7c457d45..39fe6993 100644
--- a/runtime/themes/monokai_pro.toml
+++ b/runtime/themes/monokai_pro.toml
@@ -7,23 +7,25 @@
 "ui.menu" = { fg = "base8", bg = "base3" }
 "ui.menu.selected" = { fg = "base2", bg = "yellow" }
 "ui.virtual.whitespace" = "base5"
+"ui.virtual.ruler" = { bg = "base1" }
 
 "info" = "base8"
 "hint" = "base8"
 
 # background color
 "ui.background" = { bg = "base2" }
-"ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" }
 
 # status bars, panels, modals, autocompletion
-"ui.statusline" = { bg = "base4" }
+"ui.statusline" = { fg = "base8", bg = "base4" }
+"ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" }
 "ui.popup" = { bg = "base3" }
 "ui.window" = { bg = "base3" }
-"ui.help" = { bg = "base3" }
+"ui.help" = { fg = "base8", bg = "base3" }
 
 # active line, highlighting
 "ui.selection" = { bg = "base4" }
 "ui.cursor.match" = { bg = "base4" }
+"ui.cursorline" = { bg = "base1" }
 
 # comments, nord3 based lighter color
 "comment" = { fg = "base5", modifiers = ["italic"] }
diff --git a/runtime/themes/monokai_pro_machine.toml b/runtime/themes/monokai_pro_machine.toml
index bfc7031d..4360d622 100644
--- a/runtime/themes/monokai_pro_machine.toml
+++ b/runtime/themes/monokai_pro_machine.toml
@@ -7,6 +7,7 @@
 "ui.menu" = { fg = "base8", bg = "base3" }
 "ui.menu.selected" = { fg = "base2", bg = "yellow" }
 "ui.virtual.whitespace" = "base5"
+"ui.virtual.ruler" = { bg = "base1" }
 
 "info" = "base8"
 "hint" = "base8"
@@ -16,14 +17,15 @@
 "ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" }
 
 # status bars, panels, modals, autocompletion
-"ui.statusline" = { bg = "base4" }
+"ui.statusline" = { fg = "base8", bg = "base4" }
 "ui.popup" = { bg = "base3" }
 "ui.window" = { bg = "base3" }
-"ui.help" = { bg = "base3" }
+"ui.help" = { fg = "base8", bg = "base3" }
 
 # active line, highlighting
 "ui.selection" = { bg = "base4" }
 "ui.cursor.match" = { bg = "base4" }
+"ui.cursorline" = { bg = "base1" }
 
 # comments, nord3 based lighter color
 "comment" = { fg = "base5", modifiers = ["italic"] }
diff --git a/runtime/themes/monokai_pro_octagon.toml b/runtime/themes/monokai_pro_octagon.toml
index 889e7624..c6feae8c 100644
--- a/runtime/themes/monokai_pro_octagon.toml
+++ b/runtime/themes/monokai_pro_octagon.toml
@@ -7,6 +7,7 @@
 "ui.menu" = { fg = "base8", bg = "base3" }
 "ui.menu.selected" = { fg = "base2", bg = "yellow" }
 "ui.virtual.whitespace" = "base5"
+"ui.virtual.ruler" = { bg = "base1" }
 
 "info" = "base8"
 "hint" = "base8"
@@ -16,14 +17,15 @@
 "ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" }
 
 # status bars, panels, modals, autocompletion
-"ui.statusline" = { bg = "base4" }
+"ui.statusline" = { fg = "base8", bg = "base4" }
 "ui.popup" = { bg = "base3" }
 "ui.window" = { bg = "base3" }
-"ui.help" = { bg = "base3" }
+"ui.help" = { fg = "base8", bg = "base3" }
 
 # active line, highlighting
 "ui.selection" = { bg = "base4" }
 "ui.cursor.match" = { bg = "base4" }
+"ui.cursorline" = { bg = "base1" }
 
 # comments, nord3 based lighter color
 "comment" = { fg = "base5", modifiers = ["italic"] }
diff --git a/runtime/themes/monokai_pro_ristretto.toml b/runtime/themes/monokai_pro_ristretto.toml
index f8ad8422..0dad50d4 100644
--- a/runtime/themes/monokai_pro_ristretto.toml
+++ b/runtime/themes/monokai_pro_ristretto.toml
@@ -7,6 +7,7 @@
 "ui.menu" = { fg = "base8", bg = "base3" }
 "ui.menu.selected" = { fg = "base2", bg = "yellow" }
 "ui.virtual.whitespace" = "base5"
+"ui.virtual.ruler" = { bg = "base1" }
 
 "info" = "base8"
 "hint" = "base8"
@@ -16,14 +17,15 @@
 "ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" }
 
 # status bars, panels, modals, autocompletion
-"ui.statusline" = { bg = "base4" }
+"ui.statusline" = { fg = "base8", bg = "base4" }
 "ui.popup" = { bg = "base3" }
 "ui.window" = { bg = "base3" }
-"ui.help" = { bg = "base3" }
+"ui.help" = { fg = "base8", bg = "base3" }
 
 # active line, highlighting
 "ui.selection" = { bg = "base4" }
 "ui.cursor.match" = { bg = "base4" }
+"ui.cursorline" = { bg = "base1" }
 
 # comments, nord3 based lighter color
 "comment" = { fg = "base5", modifiers = ["italic"] }
diff --git a/runtime/themes/monokai_pro_spectrum.toml b/runtime/themes/monokai_pro_spectrum.toml
index 9f5864fc..137571ed 100644
--- a/runtime/themes/monokai_pro_spectrum.toml
+++ b/runtime/themes/monokai_pro_spectrum.toml
@@ -7,23 +7,25 @@
 "ui.menu" = { fg = "base8", bg = "base3" }
 "ui.menu.selected" = { fg = "base2", bg = "yellow" }
 "ui.virtual.whitespace" = "base5"
+"ui.virtual.ruler" = { bg = "base1" }
 
 "info" = "base8"
 "hint" = "base8"
 
 # background color
 "ui.background" = { bg = "base2" }
-"ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" }
 
 # status bars, panels, modals, autocompletion
-"ui.statusline" = { bg = "base4" }
+"ui.statusline" = { fg = "base8", bg = "base4" }
+"ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" }
 "ui.popup" = { bg = "base3" }
 "ui.window" = { bg = "base3" }
-"ui.help" = { bg = "base3" }
+"ui.help" = { fg = "base8", bg = "base3" }
 
 # active line, highlighting
 "ui.selection" = { bg = "base4" }
 "ui.cursor.match" = { bg = "base4" }
+"ui.cursorline" = { bg = "base1" }
 
 # comments, nord3 based lighter color
 "comment" = { fg = "base5", modifiers = ["italic"] }
diff --git a/runtime/themes/noctis_bordo.toml b/runtime/themes/noctis_bordo.toml
index ebd5c87d..b15a3f8e 100644
--- a/runtime/themes/noctis_bordo.toml
+++ b/runtime/themes/noctis_bordo.toml
@@ -24,6 +24,7 @@
 
 "ui.background" = { bg = "base00" }
 "ui.virtual" = "base03"
+"ui.virtual.ruler" = { bg = "base01" }
 "ui.menu" = { fg = "base05", bg = "base01" }
 "ui.menu.selected" = { fg = "base0B", bg = "base01" }
 "ui.popup" = { bg = "base01" }
@@ -31,6 +32,7 @@
 "ui.linenr" = { fg = "#715b63", bg = "base01" }
 "ui.linenr.selected" = { fg = "base02", bg = "base01", modifiers = ["bold"] }
 "ui.selection" = { fg = "base05", bg = "base02" }
+"ui.cursorline" = { bg = "base01" }
 "ui.statusline" = { fg = "base02", bg = "base01" }
 "ui.cursor" = { fg = "base04", modifiers = ["reversed"] }
 "ui.cursor.primary" = { fg = "base05", modifiers = ["reversed"] }
diff --git a/runtime/themes/nord.toml b/runtime/themes/nord.toml
index 2df30814..a2aff585 100644
--- a/runtime/themes/nord.toml
+++ b/runtime/themes/nord.toml
@@ -6,6 +6,7 @@
 "ui.menu" = { fg = "nord6", bg = "#232d38" }
 "ui.menu.selected" = { fg = "nord8", bg = "nord2" }
 "ui.virtual.whitespace" = "gray"
+"ui.virtual.ruler" = { bg = "nord1" }
 
 "info" = "nord8"
 "hint" = "nord8"
diff --git a/runtime/themes/nord_light.toml b/runtime/themes/nord_light.toml
index 6707d2f7..5270fe34 100644
--- a/runtime/themes/nord_light.toml
+++ b/runtime/themes/nord_light.toml
@@ -3,9 +3,11 @@
 "ui.background" = {bg="nord6"}
 "ui.text" = "nord0"
 "ui.selection" = {bg="nord7", fg="nord6"}
+"ui.cursorline" = {bg="nord4"}
 "ui.statusline" = {bg="nord4", fg="nord0"}
-"ui.statusline.inactive" = {bg="nord8"}
+"ui.statusline.inactive" = {bg="nord5", fg="nord0"}
 "ui.virtual" = "nord8"
+"ui.virtual.ruler" = {bg="nord4"}
 "ui.cursor.match" = {bg="nord8"}
 "ui.cursor" = {bg="nord10", fg="nord6"}
 "ui.cursorline.primary" = {bg="nord5"}
@@ -16,6 +18,7 @@
 "ui.popup" = {bg="nord4"}
 "ui.popup.info" = {bg="nord4",fg="nord0"}
 "ui.help" = {bg="nord4",fg="nord0"}
+"ui.window" = {bg="nord4"}
 
 
 "ui.statusline.normal" = { fg = "nord0", bg = "nord8" }
diff --git a/runtime/themes/onedark.toml b/runtime/themes/onedark.toml
index 3beb962f..1e7d9af1 100644
--- a/runtime/themes/onedark.toml
+++ b/runtime/themes/onedark.toml
@@ -71,7 +71,7 @@ diagnostic = { modifiers = ["underlined"] }
 "ui.text" = { fg = "white" }
 "ui.text.focus" = { fg = "white", bg = "light-black", modifiers = ["bold"] }
 
-"ui.help" = { bg = "gray" }
+"ui.help" = { fg = "white", bg = "gray" }
 "ui.popup" = { bg = "gray" }
 "ui.window" = { fg = "gray" }
 "ui.menu" = { fg = "white", bg = "gray" }
diff --git a/runtime/themes/penumbra+.toml b/runtime/themes/penumbra+.toml
index c3ae56db..79059832 100644
--- a/runtime/themes/penumbra+.toml
+++ b/runtime/themes/penumbra+.toml
@@ -45,7 +45,7 @@ error = "red"
 
 diagnostic = { modifiers = ["underlined"] }
 
-"ui.background" = "sky+"
+"ui.background" = { bg = "shade" }
 "ui.background.separator" = "sky"
 
 "ui.cursor" = { modifiers = ["reversed"] }
@@ -72,13 +72,13 @@ diagnostic = { modifiers = ["underlined"] }
 "ui.popup.info" = { bg = "shade" }
 
 "ui.window" = "sky"
-"ui.help" = "sky"
+"ui.help" = { fg = "sky", bg = "shade-" }
 
 "ui.text" = "sky"
 "ui.text.focus" = "blue"
 "ui.text.info" = "sky"
 
-"ui.virtual.ruler" = { bg = "shade+" }
+"ui.virtual.ruler" = { bg = "shade-" }
 "ui.virtual.whitespace" = "sky-"
 "ui.virtual.indent-guide" = "shade+"
 
diff --git a/runtime/themes/pop-dark.toml b/runtime/themes/pop-dark.toml
index 4d501a20..bac0d0f9 100644
--- a/runtime/themes/pop-dark.toml
+++ b/runtime/themes/pop-dark.toml
@@ -24,15 +24,16 @@ diagnostic = { fg = 'greyT', bg = 'redD' }
 'ui.selection.primary' = { bg = 'blueD', fg = 'white' }
 'ui.linenr' = { bg = "brownN", fg = 'greyL' }
 'ui.linenr.selected' = { bg = 'brownH', fg = 'orangeH' }
-'ui.statusline' = { bg = 'brownH' }
-'ui.statusline.inactive' = { bg = 'brownN' }
-'ui.help' = { bg = 'brownD' }
+'ui.cursorline' = { bg = 'brownD' }
+'ui.statusline' = { fg = "greyT", bg = 'brownH' }
+'ui.statusline.inactive' = { fg = "greyT", bg = 'brownN' }
+'ui.help' = { fg = "greyT", bg = 'brownD' }
 'ui.highlight' = { bg = 'brownH' }
 'ui.virtual' = { fg = 'brownV' }
 'ui.virtual.ruler' = { bg = 'brownR' }
 'ui.virtual.whitespace' = { fg = 'brownV' }
 'ui.virtual.indent-guide' = { fg = 'brownR' }
-'ui.menu' = { bg = 'brownD' }
+'ui.menu' = { fg = "greyT", bg = 'brownD' }
 'ui.menu.selected' = { fg = 'orangeH', bg = 'brownH' }
 'ui.popup' = { bg = 'brownD' }
 'ui.popup.info' = { bg = 'brownH', fg = 'greyT' }
diff --git a/runtime/themes/rose_pine.toml b/runtime/themes/rose_pine.toml
index 1e494946..06be3083 100644
--- a/runtime/themes/rose_pine.toml
+++ b/runtime/themes/rose_pine.toml
@@ -8,6 +8,7 @@
 "ui.liner.selected" = "highlightOverlay"
 "ui.selection" = { bg = "highlight" }
 "comment" = "subtle"
+"ui.cursorline" = { bg = "surface" }
 "ui.statusline" = {fg = "foam", bg = "surface" }
 "ui.statusline.insert" = {fg = "base", bg = "foam", modifiers = ["bold"]}
 "ui.statusline.normal" = {fg = "base", bg = "rose", modifiers = ["bold"]}
@@ -18,6 +19,7 @@
 "ui.text.focus" = { fg = "foam", modifiers = ["bold"]}
 "ui.text.info" = {fg = "pine", modifiers = ["bold"]}
 "ui.virtual.whitespace" = "highlight"
+"ui.virtual.ruler" = { bg = "surface" }
 "operator" = "rose"
 "variable" = "text"
 "constant.numeric" = "iris"
@@ -39,7 +41,6 @@
 "ui.popup.info" = { bg = "surface" }
 "ui.window" = { bg = "base" }
 "ui.help" = { bg = "overlay", fg = "foam" }
-"ui.text" = "text"
 "diff.plus" = "foam"
 "diff.delta" = "rose"
 "diff.minus" = "love"
diff --git a/runtime/themes/rose_pine_dawn.toml b/runtime/themes/rose_pine_dawn.toml
index b28f6412..129ae9c7 100644
--- a/runtime/themes/rose_pine_dawn.toml
+++ b/runtime/themes/rose_pine_dawn.toml
@@ -8,6 +8,7 @@
 "ui.liner.selected" = "highlightOverlay"
 "ui.selection" = { bg = "highlight" }
 "comment" = "subtle"
+"ui.cursorline" = {bg = "base" }
 "ui.statusline" = {fg = "foam", bg = "surface" }
 "ui.statusline.inactive" = { fg = "iris", bg = "surface" }
 "ui.cursor" = { fg = "rose", modifiers = ["reversed"] }
@@ -15,6 +16,7 @@
 "ui.text.focus" = { fg = "foam", modifiers = ["bold"]}
 "ui.text.info" = {fg = "pine", modifiers = ["bold"]}
 "ui.virtual.whitespace" = "highlight"
+"ui.virtual.ruler" = { bg = "base" }
 "operator" = "rose"
 "variable" = "text"
 "number" = "iris"
@@ -36,7 +38,6 @@
 "ui.popup.info" = { bg = "surface" }
 "ui.window" = { bg = "base" }
 "ui.help" = { bg = "overlay", fg = "foam" }
-"ui.text" = "text"
 "diff.plus" = "foam"
 "diff.delta" = "rose"
 "diff.minus" = "love"
diff --git a/runtime/themes/rose_pine_moon.toml b/runtime/themes/rose_pine_moon.toml
index 618ac841..4706bb17 100644
--- a/runtime/themes/rose_pine_moon.toml
+++ b/runtime/themes/rose_pine_moon.toml
@@ -11,6 +11,7 @@
 "ui.liner.selected" = "highlightOverlay"
 "ui.selection" = { bg = "highlight" }
 "comment" = "subtle"
+"ui.cursorline" = {bg = "dimBase" }
 "ui.statusline" = {fg = "foam", bg = "surface" }
 "ui.statusline.insert" = {fg = "base", bg = "foam", modifiers = ["bold"]}
 "ui.statusline.normal" = {fg = "base", bg = "rose", modifiers = ["bold"]}
@@ -21,6 +22,7 @@
 "ui.text.focus" = { fg = "foam", modifiers = ["bold"]}
 "ui.text.info" = {fg = "pine", modifiers = ["bold"]}
 "ui.virtual.whitespace" = "highlight"
+"ui.virtual.ruler" = {bg = "dimBase" }
 "operator" = "rose"
 "variable" = "text"
 "constant.numeric" = "iris"
@@ -42,7 +44,6 @@
 "ui.popup.info" = { bg = "surface" }
 "ui.window" = { bg = "base" }
 "ui.help" = { bg = "overlay", fg = "foam" }
-"ui.text" = "text"
 "diff.plus" = "foam"
 "diff.delta" = "rose"
 "diff.minus" = "love"
@@ -69,6 +70,7 @@
 "markup.raw" = { fg = "foam" }
 
 [palette]
+dimBase  = "#201e30" 
 base     = "#232136" 
 surface  = "#2a273f" 
 overlay  = "#393552"
diff --git a/runtime/themes/serika-dark.toml b/runtime/themes/serika-dark.toml
index e13c2f87..88e4cf6d 100644
--- a/runtime/themes/serika-dark.toml
+++ b/runtime/themes/serika-dark.toml
@@ -39,6 +39,7 @@
 "ui.cursor.select" = { fg = "bg0", bg = "bg_yellow" }
 "ui.linenr" = "yellow"
 "ui.linenr.selected" = { fg = "fg", modifiers = ["bold", "underlined"] }
+"ui.cursorline" = { fg = "grey1", bg = "bg2" }
 "ui.statusline" = { fg = "grey1", bg = "bg2" }
 "ui.statusline.inactive" = { fg = "grey2", bg = "bg1" }
 "ui.popup" = { fg = "grey2", bg = "bg1" }
@@ -49,13 +50,14 @@
 "ui.menu" = { fg = "fg", bg = "bg2" }
 "ui.menu.selected" = { fg = "bg0", bg = "bg_yellow" }
 "ui.selection" = { bg = "bg3" }
-"ui.virtual.whitespace" = "grey2"
+"ui.virtual.whitespace" = "bg2"
+"ui.virtual.ruler" = { bg = "grey2" } 
 
 "hint" = "blue"
 "info" = "aqua"
 "warning" = "yellow"
 "error" = "nasty-red"
-"diagnostic" = { fg = "dark-red", modifiers = ["underlined"] }
+"diagnostic" = { fg = "nasty-red", modifiers = ["underlined"] }
 
 "diff.plus" = { fg = "green" }
 "diff.delta" = { fg = "orange" }
diff --git a/runtime/themes/serika-light.toml b/runtime/themes/serika-light.toml
index c0a4b8d8..a00274bb 100644
--- a/runtime/themes/serika-light.toml
+++ b/runtime/themes/serika-light.toml
@@ -39,6 +39,7 @@
 "ui.cursor.select" = { fg = "bg0", bg = "bg_yellow" }
 "ui.linenr" = "yellow"
 "ui.linenr.selected" = { fg = "fg", modifiers = ["bold", "underlined"] }
+"ui.cursorline" = { bg = "bg01" }
 "ui.statusline" = { fg = "grey1", bg = "bg5" }
 "ui.statusline.inactive" = { fg = "grey2", bg = "bg1" }
 "ui.popup" = { fg = "bg0", bg = "bg5" }
@@ -50,12 +51,13 @@
 "ui.menu.selected" = { fg = "bg0", bg = "bg_yellow" }
 "ui.selection" = { fg = "bg0", bg = "bg3" }
 "ui.virtual.whitespace" = { fg = "bg2" }
+"ui.virtual.ruler" = { bg = "bg01" }
 
 "hint" = "blue"
 "info" = "aqua"
 "warning" = "yellow"
 "error" = "nasty-red"
-"diagnostic" = { fg = "dark-red", modifiers = ["underlined"] }
+"diagnostic" = { fg = "nasty-red", modifiers = ["underlined"] }
 
 "diff.plus" = { fg = "green" }
 "diff.delta" = { fg = "orange" }
@@ -74,6 +76,7 @@
 [palette]
 
 bg0 = "#e1e1e3"
+bg01 = "#eaeaec"
 bg1 = "#494c50"
 bg2 = "#55585e"
 bg3 = "#61656b"
diff --git a/runtime/themes/snazzy.toml b/runtime/themes/snazzy.toml
index 8cecc61e..b36d1243 100644
--- a/runtime/themes/snazzy.toml
+++ b/runtime/themes/snazzy.toml
@@ -33,12 +33,14 @@
 "ui.popup" = { fg = "foreground", bg = "background_dark" }
 "ui.selection" = { bg = "secondary_highlight" }
 "ui.selection.primary" = { bg = "primary_highlight" }
+"ui.cursorline" = { bg = "background_dark" }
 "ui.statusline" = { fg = "foreground", bg = "background_dark" }
 "ui.statusline.inactive" = { fg = "comment", bg = "background_dark" }
 "ui.text" = { fg = "foreground" }
 "ui.text.focus" = { fg = "cyan" }
 "ui.window" = { fg = "foreground" }
 "ui.virtual.whitespace" = { fg = "comment" }
+"ui.virtual.ruler" = { bg = "background_dark" }
 
 "error" = { fg = "red" }
 "warning" = { fg = "cyan" }
diff --git a/runtime/themes/solarized_dark.toml b/runtime/themes/solarized_dark.toml
index aa6dbbf8..1083b0c8 100644
--- a/runtime/themes/solarized_dark.toml
+++ b/runtime/themes/solarized_dark.toml
@@ -45,6 +45,8 @@
 "ui.linenr" = { fg = "base0", bg = "base02" }
 # 当前行号栏
 "ui.linenr.selected" = { fg = "blue", modifiers = ["bold"] }
+#cursorline
+"ui.cursorline" = { bg = "base03" }
 
 # 状态栏
 "ui.statusline" = { fg = "base03", bg = "base0" }
diff --git a/runtime/themes/solarized_light.toml b/runtime/themes/solarized_light.toml
index 79fd8364..737829a6 100644
--- a/runtime/themes/solarized_light.toml
+++ b/runtime/themes/solarized_light.toml
@@ -48,6 +48,8 @@
 # 当前行号栏
 # current line number column
 "ui.linenr.selected" = { fg = "blue", modifiers = ["bold"] }
+# cursorline
+"ui.cursorline" = { bg = "base0" }
 
 # 状态栏
 # status bar
diff --git a/runtime/themes/spacebones_light.toml b/runtime/themes/spacebones_light.toml
index e12ef285..0956afd2 100644
--- a/runtime/themes/spacebones_light.toml
+++ b/runtime/themes/spacebones_light.toml
@@ -51,6 +51,7 @@
 "ui.background" = { bg = "bg0" }
 "ui.linenr" = { fg = "bg3" }
 "ui.linenr.selected" = { fg = "theme_yellow" }
+"ui.cursorline" = { bg = "bg2" }
 "ui.statusline" = { fg = "fg1", bg = "bg2" }
 "ui.statusline.inactive" = { fg = "fg4", bg = "bg1" }
 "ui.statusline.normal" = { fg = "bg1", bg = "theme_cyan" }

From 9e24f2aa81f6bbb1fecbf6c7a14a56742389444f Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 30 Aug 2022 20:34:04 -0500
Subject: [PATCH 022/884] Use the original document and view for mode
 transition hooks (#3508)

When changing focus, the lookup with `current!` may change the
view and end up executing mode transition hooks on the newly
focused view. We should use the same view and document to execute
mode transition hooks so that switching away from a view triggers
history save points.
---
 helix-term/src/ui/editor.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 7326b70d..92773260 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1157,7 +1157,8 @@ impl Component for EditorView {
                 // clear status
                 cx.editor.status_msg = None;
 
-                let doc = doc!(cx.editor);
+                let (view, doc) = current!(cx.editor);
+                let focus = view.id;
                 let mode = doc.mode();
 
                 if let Some(on_next_key) = self.on_next_key.take() {
@@ -1221,7 +1222,9 @@ impl Component for EditorView {
                     return EventResult::Ignored(None);
                 }
                 let config = cx.editor.config();
-                let (view, doc) = current!(cx.editor);
+                let view = cx.editor.tree.get_mut(focus);
+                let doc = cx.editor.documents.get_mut(&view.doc).unwrap();
+
                 view.ensure_cursor_in_view(doc, config.scrolloff);
 
                 // Store a history state if not in insert mode. This also takes care of

From 78189dd9c1aecd1760cc1baf6e2e81d8abbca48c Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Wed, 31 Aug 2022 04:42:58 +0300
Subject: [PATCH 023/884] Fix extra selection with regex anchors (^,$) (#3598)

Also added a bunch of tests to ensure correct behaviour
---
 helix-core/src/selection.rs | 78 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 77 insertions(+), 1 deletion(-)

diff --git a/helix-core/src/selection.rs b/helix-core/src/selection.rs
index 59bd736e..3463c1d3 100644
--- a/helix-core/src/selection.rs
+++ b/helix-core/src/selection.rs
@@ -659,7 +659,13 @@ pub fn select_on_matches(
 
             let start = text.byte_to_char(start_byte + mat.start());
             let end = text.byte_to_char(start_byte + mat.end());
-            result.push(Range::new(start, end));
+
+            let range = Range::new(start, end);
+            // Make sure the match is not right outside of the selection.
+            // These invalid matches can come from using RegEx anchors like `^`, `$`
+            if range != Range::point(sel.to()) {
+                result.push(range);
+            }
         }
     }
 
@@ -929,6 +935,76 @@ mod test {
         assert_eq!(Range::new(6, 5).min_width_1(s), Range::new(6, 5));
     }
 
+    #[test]
+    fn test_select_on_matches() {
+        use crate::regex::{Regex, RegexBuilder};
+
+        let r = Rope::from_str("Nobody expects the Spanish inquisition");
+        let s = r.slice(..);
+
+        let selection = Selection::single(0, r.len_chars());
+        assert_eq!(
+            select_on_matches(s, &selection, &Regex::new(r"[A-Z][a-z]*").unwrap()),
+            Some(Selection::new(
+                smallvec![Range::new(0, 6), Range::new(19, 26)],
+                0
+            ))
+        );
+
+        let r = Rope::from_str("This\nString\n\ncontains multiple\nlines");
+        let s = r.slice(..);
+
+        let start_of_line = RegexBuilder::new(r"^").multi_line(true).build().unwrap();
+        let end_of_line = RegexBuilder::new(r"$").multi_line(true).build().unwrap();
+
+        // line without ending
+        assert_eq!(
+            select_on_matches(s, &Selection::single(0, 4), &start_of_line),
+            Some(Selection::single(0, 0))
+        );
+        assert_eq!(
+            select_on_matches(s, &Selection::single(0, 4), &end_of_line),
+            None
+        );
+        // line with ending
+        assert_eq!(
+            select_on_matches(s, &Selection::single(0, 5), &start_of_line),
+            Some(Selection::single(0, 0))
+        );
+        assert_eq!(
+            select_on_matches(s, &Selection::single(0, 5), &end_of_line),
+            Some(Selection::single(4, 4))
+        );
+        // line with start of next line
+        assert_eq!(
+            select_on_matches(s, &Selection::single(0, 6), &start_of_line),
+            Some(Selection::new(
+                smallvec![Range::point(0), Range::point(5)],
+                0
+            ))
+        );
+        assert_eq!(
+            select_on_matches(s, &Selection::single(0, 6), &end_of_line),
+            Some(Selection::single(4, 4))
+        );
+
+        // multiple lines
+        assert_eq!(
+            select_on_matches(
+                s,
+                &Selection::single(0, s.len_chars()),
+                &RegexBuilder::new(r"^[a-z ]*$")
+                    .multi_line(true)
+                    .build()
+                    .unwrap()
+            ),
+            Some(Selection::new(
+                smallvec![Range::point(12), Range::new(13, 30), Range::new(31, 36)],
+                0
+            ))
+        );
+    }
+
     #[test]
     fn test_line_range() {
         let r = Rope::from_str("\r\nHi\r\nthere!");

From 404db2ebee477a9bfdb76e89ebf48adac9c1a57c Mon Sep 17 00:00:00 2001
From: Lucy <11927498+lucypero@users.noreply.github.com>
Date: Tue, 30 Aug 2022 22:44:06 -0300
Subject: [PATCH 024/884] Move mode transition logic to handle_keymap_event()
 (#2634)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
---
 helix-term/src/ui/editor.rs | 78 ++++++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 36 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 92773260..2de5fe5c 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -771,15 +771,55 @@ impl EditorView {
         cxt: &mut commands::Context,
         event: KeyEvent,
     ) -> Option<KeymapResult> {
+        let mut last_mode = mode;
         let key_result = self.keymaps.get(mode, event);
         cxt.editor.autoinfo = self.keymaps.sticky().map(|node| node.infobox());
 
+        // Track the currently open doc
+        let view = view!(cxt.editor);
+        let doc_id = view.doc;
+
+        let mut execute_command = |command: &commands::MappableCommand| {
+            command.execute(cxt);
+            let doc = cxt.editor.documents.get_mut(&doc_id).unwrap();
+            let current_mode = doc.mode();
+            match (last_mode, current_mode) {
+                (Mode::Normal, Mode::Insert) => {
+                    // HAXX: if we just entered insert mode from normal, clear key buf
+                    // and record the command that got us into this mode.
+
+                    // how we entered insert mode is important, and we should track that so
+                    // we can repeat the side effect.
+                    self.last_insert.0 = command.clone();
+                    self.last_insert.1.clear();
+
+                    commands::signature_help_impl(cxt, commands::SignatureHelpInvoked::Automatic);
+                }
+                (Mode::Insert, Mode::Normal) => {
+                    // if exiting insert mode, remove completion
+                    self.completion = None;
+
+                    // TODO: Use an on_mode_change hook to remove signature help
+                    cxt.jobs.callback(async {
+                        let call: job::Callback = Box::new(|_editor, compositor| {
+                            compositor.remove(SignatureHelp::ID);
+                        });
+                        Ok(call)
+                    });
+                }
+                _ => (),
+            }
+            last_mode = current_mode;
+        };
+
         match &key_result {
-            KeymapResult::Matched(command) => command.execute(cxt),
+            KeymapResult::Matched(command) => {
+                execute_command(command);
+            }
             KeymapResult::Pending(node) => cxt.editor.autoinfo = Some(node.infobox()),
             KeymapResult::MatchedSequence(commands) => {
                 for command in commands {
-                    command.execute(cxt);
+                    execute_command(command);
                 }
             }
             KeymapResult::NotFound | KeymapResult::Cancelled(_) => return Some(key_result),
@@ -1233,40 +1273,6 @@ impl Component for EditorView {
                     doc.append_changes_to_history(view.id);
                 }
 
-                // mode transitions
-                match (mode, doc.mode()) {
-                    (Mode::Normal, Mode::Insert) => {
-                        // HAXX: if we just entered insert mode from normal, clear key buf
-                        // and record the command that got us into this mode.
-
-                        // how we entered insert mode is important, and we should track that so
-                        // we can repeat the side effect.
-
-                        self.last_insert.0 = match self.keymaps.get(mode, key) {
-                            KeymapResult::Matched(command) => command,
-                            // FIXME: insert mode can only be entered through single KeyCodes
-                            _ => unimplemented!(),
-                        };
-                        self.last_insert.1.clear();
-                        commands::signature_help_impl(
-                            &mut cx,
-                            commands::SignatureHelpInvoked::Automatic,
-                        );
-                    }
-                    (Mode::Insert, Mode::Normal) => {
-                        // if exiting insert mode, remove completion
-                        self.completion = None;
-                        // TODO: Use an on_mode_change hook to remove signature help
-                        context.jobs.callback(async {
-                            let call: job::Callback = Box::new(|_editor, compositor| {
-                                compositor.remove(SignatureHelp::ID);
-                            });
-                            Ok(call)
-                        });
-                    }
-                    _ => (),
-                }
-
                 EventResult::Consumed(callback)
             }
 

From 701cea54d280786d5762396c5d2655cba5b508b4 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 30 Aug 2022 20:45:47 -0500
Subject: [PATCH 025/884] jumplist: Add documents to view history (#3593)

This change adds documents to the view's document history Vec.
(This is used by `ga` for example to access the last buffer.)

Previously, a sequence like so would have confusing behavior:

1. Open file A: any document with an active language server
2. Find some definition that lives in another file - file B - with `gd`
3. Jump back in the jumplist with `C-o` to file A
4. Use `ga` intending to switch back to file B

The behavior prior to this change was that `ga` would switch to file
A: you could not use `ga` to switch to file B.
---
 helix-term/src/commands.rs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index cb5460af..5bce6ca6 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4060,13 +4060,18 @@ fn match_brackets(cx: &mut Context) {
 fn jump_forward(cx: &mut Context) {
     let count = cx.count();
     let view = view_mut!(cx.editor);
+    let doc_id = view.doc;
 
     if let Some((id, selection)) = view.jumps.forward(count) {
         view.doc = *id;
         let selection = selection.clone();
         let (view, doc) = current!(cx.editor); // refetch doc
-        doc.set_selection(view.id, selection);
 
+        if doc.id() != doc_id {
+            view.add_to_history(doc_id);
+        }
+
+        doc.set_selection(view.id, selection);
         align_view(doc, view, Align::Center);
     };
 }
@@ -4074,13 +4079,18 @@ fn jump_forward(cx: &mut Context) {
 fn jump_backward(cx: &mut Context) {
     let count = cx.count();
     let (view, doc) = current!(cx.editor);
+    let doc_id = doc.id();
 
     if let Some((id, selection)) = view.jumps.backward(view.id, doc, count) {
         view.doc = *id;
         let selection = selection.clone();
         let (view, doc) = current!(cx.editor); // refetch doc
-        doc.set_selection(view.id, selection);
 
+        if doc.id() != doc_id {
+            view.add_to_history(doc_id);
+        }
+
+        doc.set_selection(view.id, selection);
         align_view(doc, view, Align::Center);
     };
 }

From 12ddd03d3b9f6be61008c6a57f3dda1ef1eee131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Wed, 31 Aug 2022 11:36:01 +0900
Subject: [PATCH 026/884] fix: Don't translate mouse up events as down

---
 helix-view/src/input.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-view/src/input.rs b/helix-view/src/input.rs
index a7f526ba..083a1e08 100644
--- a/helix-view/src/input.rs
+++ b/helix-view/src/input.rs
@@ -312,7 +312,7 @@ impl From<crossterm::event::MouseEventKind> for MouseEventKind {
     fn from(kind: crossterm::event::MouseEventKind) -> Self {
         match kind {
             crossterm::event::MouseEventKind::Down(button) => Self::Down(button.into()),
-            crossterm::event::MouseEventKind::Up(button) => Self::Down(button.into()),
+            crossterm::event::MouseEventKind::Up(button) => Self::Up(button.into()),
             crossterm::event::MouseEventKind::Drag(button) => Self::Drag(button.into()),
             crossterm::event::MouseEventKind::Moved => Self::Moved,
             crossterm::event::MouseEventKind::ScrollDown => Self::ScrollDown,

From 4c789cfbda5cd0e6a6319fd3dafff8020529b762 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 25 Aug 2022 12:54:31 -0500
Subject: [PATCH 027/884] tree-sitter: Refactor lazy query loading

The code for loading queries can be shared between indent and
textobjects queries. In both cases we want to kick an error
message out to the logs.
---
 helix-core/src/syntax.rs | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 99922d37..7ce0f8d2 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -399,28 +399,15 @@ impl LanguageConfiguration {
 
     pub fn indent_query(&self) -> Option<&Query> {
         self.indent_query
-            .get_or_init(|| {
-                let lang_name = self.language_id.to_ascii_lowercase();
-                let query_text = read_query(&lang_name, "indents.scm");
-                if query_text.is_empty() {
-                    return None;
-                }
-                let lang = self.highlight_config.get()?.as_ref()?.language;
-                Query::new(lang, &query_text).ok()
-            })
+            .get_or_init(|| self.load_query("indents.scm"))
             .as_ref()
     }
 
     pub fn textobject_query(&self) -> Option<&TextObjectQuery> {
         self.textobject_query
-            .get_or_init(|| -> Option<TextObjectQuery> {
-                let lang_name = self.language_id.to_ascii_lowercase();
-                let query_text = read_query(&lang_name, "textobjects.scm");
-                let lang = self.highlight_config.get()?.as_ref()?.language;
-                let query = Query::new(lang, &query_text)
-                    .map_err(|e| log::error!("Failed to parse textobjects.scm queries: {}", e))
-                    .ok()?;
-                Some(TextObjectQuery { query })
+            .get_or_init(|| {
+                self.load_query("textobjects.scm")
+                    .map(|query| TextObjectQuery { query })
             })
             .as_ref()
     }
@@ -428,6 +415,18 @@ impl LanguageConfiguration {
     pub fn scope(&self) -> &str {
         &self.scope
     }
+
+    fn load_query(&self, kind: &str) -> Option<Query> {
+        let lang_name = self.language_id.to_ascii_lowercase();
+        let query_text = read_query(&lang_name, kind);
+        if query_text.is_empty() {
+            return None;
+        }
+        let lang = self.highlight_config.get()?.as_ref()?.language;
+        Query::new(lang, &query_text)
+            .map_err(|e| log::error!("Failed to parse {} queries for {}: {}", kind, lang_name, e))
+            .ok()
+    }
 }
 
 // Expose loader as Lazy<> global since it's always static?

From fa1dc7e5086e598eb04a34407d8c09e5605b3760 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 25 Aug 2022 13:10:33 -0500
Subject: [PATCH 028/884] tree-sitter: Prevent panic on loading queries

---
 helix-core/src/syntax.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 7ce0f8d2..06e9cbc0 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -374,7 +374,8 @@ impl LanguageConfiguration {
                 &injections_query,
                 &locals_query,
             )
-            .unwrap_or_else(|query_error| panic!("Could not parse queries for language {:?}. Are your grammars out of sync? Try running 'hx --grammar fetch' and 'hx --grammar build'. This query could not be parsed: {:?}", self.language_id, query_error));
+            .map_err(|err| log::error!("Could not parse queries for language {:?}. Are your grammars out of sync? Try running 'hx --grammar fetch' and 'hx --grammar build'. This query could not be parsed: {:?}", self.language_id, err))
+            .ok()?;
 
             config.configure(scopes);
             Some(Arc::new(config))

From 4e4c6da3bfdea0e50e460298eedf41d835f2a551 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 25 Aug 2022 17:24:09 -0500
Subject: [PATCH 029/884] Add query-check xtask

---
 .github/workflows/build.yml | 20 ++++++++++++++++++++
 Cargo.lock                  |  1 +
 helix-core/src/syntax.rs    |  2 +-
 xtask/Cargo.toml            |  1 +
 xtask/src/main.rs           | 37 +++++++++++++++++++++++++++++++++++++
 5 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b24cdb8c..2a1950df 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -131,3 +131,23 @@ jobs:
             || (echo "Run 'cargo xtask docgen', commit the changes and push again" \
             && exit 1)
 
+  queries:
+    name: Tree-sitter queries
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v3
+
+      - name: Install stable toolchain
+        uses: helix-editor/rust-toolchain@v1
+        with:
+          profile: minimal
+          override: true
+
+      - uses: Swatinem/rust-cache@v1
+
+      - name: Generate docs
+        uses: actions-rs/cargo@v1
+        with:
+          command: xtask
+          args: query-check
diff --git a/Cargo.lock b/Cargo.lock
index 122e0d83..dd3ec09f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1476,6 +1476,7 @@ name = "xtask"
 version = "0.6.0"
 dependencies = [
  "helix-core",
+ "helix-loader",
  "helix-term",
  "toml",
 ]
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 06e9cbc0..6ec56bde 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -334,7 +334,7 @@ impl TextObjectQuery {
     }
 }
 
-fn read_query(language: &str, filename: &str) -> String {
+pub fn read_query(language: &str, filename: &str) -> String {
     static INHERITS_REGEX: Lazy<Regex> =
         Lazy::new(|| Regex::new(r";+\s*inherits\s*:?\s*([a-z_,()-]+)\s*").unwrap());
 
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 717530d0..76c38c99 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -8,4 +8,5 @@ edition = "2021"
 [dependencies]
 helix-term = { version = "0.6", path = "../helix-term" }
 helix-core = { version = "0.6", path = "../helix-core" }
+helix-loader = { version = "0.6", path = "../helix-loader" }
 toml = "0.5"
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index f66fb4f4..c7640cd1 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -217,6 +217,41 @@ pub mod tasks {
         Ok(())
     }
 
+    pub fn query_check() -> Result<(), String> {
+        use crate::helpers::lang_config;
+        use helix_core::{syntax::read_query, tree_sitter::Query};
+        use helix_loader::grammar::get_language;
+
+        let query_files = [
+            "highlights.scm",
+            "locals.scm",
+            "injections.scm",
+            "textobjects.scm",
+            "indents.scm",
+        ];
+
+        for language in lang_config().language {
+            let language_name = language.language_id.to_ascii_lowercase();
+            let grammar_name = language.grammar.unwrap_or(language.language_id);
+            for query_file in query_files {
+                let language = get_language(&grammar_name);
+                let query_text = read_query(&language_name, query_file);
+                if !query_text.is_empty() && language.is_ok() {
+                    if let Err(reason) = Query::new(language.unwrap(), &query_text) {
+                        return Err(format!(
+                            "Failed to parse {} queries for {}: {}",
+                            query_file, language_name, reason
+                        ));
+                    }
+                }
+            }
+        }
+
+        println!("Query check succeeded");
+
+        Ok(())
+    }
+
     pub fn print_help() {
         println!(
             "
@@ -224,6 +259,7 @@ Usage: Run with `cargo xtask <task>`, eg. `cargo xtask docgen`.
 
     Tasks:
         docgen: Generate files to be included in the mdbook output.
+        query-check: Check that tree-sitter queries are valid.
 "
         );
     }
@@ -235,6 +271,7 @@ fn main() -> Result<(), DynError> {
         None => tasks::print_help(),
         Some(t) => match t.as_str() {
             "docgen" => tasks::docgen()?,
+            "query-check" => tasks::query_check()?,
             invalid => return Err(format!("Invalid task name: {}", invalid).into()),
         },
     };

From 73d5bd739ebb6e6831e66a28f4d9e860f769c83c Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 25 Aug 2022 18:19:39 -0500
Subject: [PATCH 030/884] Delete invalid indents.scm queries

---
 book/src/generated/lang-support.md     | 10 +++++-----
 runtime/queries/devicetree/indents.scm | 12 ------------
 runtime/queries/gdscript/indents.scm   | 26 --------------------------
 runtime/queries/hare/indents.scm       | 21 ---------------------
 runtime/queries/nix/indents.scm        | 25 -------------------------
 runtime/queries/svelte/indents.scm     | 19 -------------------
 6 files changed, 5 insertions(+), 108 deletions(-)
 delete mode 100644 runtime/queries/devicetree/indents.scm
 delete mode 100644 runtime/queries/gdscript/indents.scm
 delete mode 100644 runtime/queries/hare/indents.scm
 delete mode 100644 runtime/queries/nix/indents.scm
 delete mode 100644 runtime/queries/svelte/indents.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 9a1d5b92..467e4c5e 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -14,7 +14,7 @@
 | css | ✓ |  |  | `vscode-css-language-server` |
 | cue | ✓ |  |  | `cuelsp` |
 | dart | ✓ |  | ✓ | `dart` |
-| devicetree | ✓ |  | ✓ |  |
+| devicetree | ✓ |  |  |  |
 | dockerfile | ✓ |  |  | `docker-langserver` |
 | dot | ✓ |  |  | `dot-language-server` |
 | edoc | ✓ |  |  |  |
@@ -28,7 +28,7 @@
 | esdl | ✓ |  |  |  |
 | fish | ✓ | ✓ | ✓ |  |
 | fortran | ✓ |  | ✓ | `fortls` |
-| gdscript | ✓ |  | ✓ |  |
+| gdscript | ✓ |  |  |  |
 | git-attributes | ✓ |  |  |  |
 | git-commit | ✓ |  |  |  |
 | git-config | ✓ |  |  |  |
@@ -42,7 +42,7 @@
 | gotmpl | ✓ |  |  | `gopls` |
 | gowork | ✓ |  |  | `gopls` |
 | graphql | ✓ |  |  |  |
-| hare | ✓ |  | ✓ |  |
+| hare | ✓ |  |  |  |
 | haskell | ✓ |  |  | `haskell-language-server-wrapper` |
 | hcl | ✓ |  | ✓ | `terraform-ls` |
 | heex | ✓ | ✓ |  |  |
@@ -69,7 +69,7 @@
 | meson | ✓ |  | ✓ |  |
 | mint |  |  |  | `mint` |
 | nickel | ✓ |  | ✓ | `nls` |
-| nix | ✓ |  | ✓ | `rnix-lsp` |
+| nix | ✓ |  |  | `rnix-lsp` |
 | nu | ✓ |  |  |  |
 | ocaml | ✓ |  | ✓ | `ocamllsp` |
 | ocaml-interface | ✓ |  |  | `ocamllsp` |
@@ -99,7 +99,7 @@
 | sql | ✓ |  |  |  |
 | sshclientconfig | ✓ |  |  |  |
 | starlark | ✓ | ✓ |  |  |
-| svelte | ✓ |  | ✓ | `svelteserver` |
+| svelte | ✓ |  |  | `svelteserver` |
 | swift | ✓ |  |  | `sourcekit-lsp` |
 | tablegen | ✓ | ✓ | ✓ |  |
 | task | ✓ |  |  |  |
diff --git a/runtime/queries/devicetree/indents.scm b/runtime/queries/devicetree/indents.scm
deleted file mode 100644
index 06490889..00000000
--- a/runtime/queries/devicetree/indents.scm
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  (node)
-  (byte_string_literal)
-  (parenthesized_expression)
-  (argument_list)
-] @indent
-
-[
-  "}"
-  "]"
-  ")"
-] @outdent
\ No newline at end of file
diff --git a/runtime/queries/gdscript/indents.scm b/runtime/queries/gdscript/indents.scm
deleted file mode 100644
index 01439e1c..00000000
--- a/runtime/queries/gdscript/indents.scm
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  (_compound_statement)
-  (match_statement)
-  (parenthesized_expression)
-  
-  (pattern_array)
-  (pattern_dictionary)
-  (argument_list)
-  (binary_operator)
-  
-  (parameters)
-  (body)
-  (enumerator_list)
-  
-  (function_definition)
-  (constructor_definition)
-  (class_definition)
-] @indent
-
-[
-  ")",
-  "]",
-  "}",
-  (return_statement)
-  (pass_statement)
-] @outdent
diff --git a/runtime/queries/hare/indents.scm b/runtime/queries/hare/indents.scm
deleted file mode 100644
index a2e83c00..00000000
--- a/runtime/queries/hare/indents.scm
+++ /dev/null
@@ -1,21 +0,0 @@
-[
- (struct_union_fields)
- (expression_list)
-] @indent
-
-[
-  "case"
-  "}"
-  "]"
-  ")"
-] @outdent
-
-; [
-;   "{"
-;   "}"
-; ] @branch
-
-; [
-;   (comment)
-; ] @ignore
-
diff --git a/runtime/queries/nix/indents.scm b/runtime/queries/nix/indents.scm
deleted file mode 100644
index a12376e7..00000000
--- a/runtime/queries/nix/indents.scm
+++ /dev/null
@@ -1,25 +0,0 @@
-
-[
-  ; Bracket like
-  (let)
-  (attrset)
-  (rec_attrset)
-  (let_attrset)
-  (parenthesized)
-  (list)
-
-  ; Binding
-  (bind)
-  (inherit)
-  (inherit_from)
-  (formal)
-
-  ; Binary operations
-  (binary)
-  (has_attr)
-  (select)
-  (app)
-
-  ; Conditional
-  (if)
-] @indent
\ No newline at end of file
diff --git a/runtime/queries/svelte/indents.scm b/runtime/queries/svelte/indents.scm
deleted file mode 100644
index 99720bac..00000000
--- a/runtime/queries/svelte/indents.scm
+++ /dev/null
@@ -1,19 +0,0 @@
-; inherits: ecma
-
-[
-  (element)
-  (if_statement)
-  (each_statement)
-  (await_statement)
-] @indent
-
-[
-  (end_tag)
-  (else_statement)
-  (if_end_expr)
-  (each_end_expr)
-  (await_end_expr)
-  ">"
-  "/>"
-] @outdent
-

From e441b1c472ccf91637426d7f33713858818210b2 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 31 Aug 2022 03:45:38 -0500
Subject: [PATCH 031/884] packaging: Point to homebrew-core instead of tap
 (#3513)

---
 README.md           | 3 +--
 book/src/install.md | 3 +--
 docs/releases.md    | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 1e8a10e6..0d3dab4b 100644
--- a/README.md
+++ b/README.md
@@ -70,10 +70,9 @@ for a language.
 
 ## MacOS
 
-Helix can be installed on MacOS through homebrew via:
+Helix can be installed on MacOS through homebrew:
 
 ```
-brew tap helix-editor/helix
 brew install helix
 ```
 
diff --git a/book/src/install.md b/book/src/install.md
index b3109dd9..497dd0a4 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -6,10 +6,9 @@ We provide pre-built binaries on the [GitHub Releases page](https://github.com/h
 
 ## OSX
 
-A Homebrew tap is available:
+Helix is available in homebrew-core:
 
 ```
-brew tap helix-editor/helix
 brew install helix
 ```
 
diff --git a/docs/releases.md b/docs/releases.md
index 0608a201..ec0b7270 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -23,7 +23,7 @@ we'll use `<tag>` as a placeholder for the tag being published.
 * Post to reddit
     * [Example post](https://www.reddit.com/r/rust/comments/uzp5ze/helix_editor_2205_released/)
 
-[homebrew formula]: https://github.com/helix-editor/homebrew-helix/blob/master/Formula/helix.rb
+[homebrew formula]: https://github.com/Homebrew/homebrew-core/blob/master/Formula/helix.rb
 
 ## Changelog Curation
 

From d7d9ca37e51df484bfdf118295a52f27b465b362 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 31 Aug 2022 03:45:49 -0500
Subject: [PATCH 032/884] Reword the feature_request issue template as
 enhancement (#3481)

---
 .github/ISSUE_TEMPLATE/enhancement.md     | 13 +++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/enhancement.md
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
new file mode 100644
index 00000000..1c8e8a5a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement.md
@@ -0,0 +1,13 @@
+---
+name: Enhancement
+about: Suggest an improvement
+title: ''
+labels: C-enhancement
+assignees: ''
+---
+
+<!--
+Your enhancement may already be reported!
+Please search on the issue tracker before creating a new issue.
+If this is an idea for a feature, please open an "Idea" Discussion instead.
+-->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 9a88cb4a..00000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: Feature request
-about: Suggest a new feature or improvement
-title: ''
-labels: C-enhancement
-assignees: ''
----
-
-<!-- Your feature may already be reported!
-Please search on the issue tracker before creating one. -->
-
-#### Describe your feature request
-

From 00d88e540e66b6371428c8c3b7e906ba2cac02e1 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Fri, 12 Aug 2022 13:16:33 -0500
Subject: [PATCH 033/884] Fix missing C highlights

* "const" keyword
* booleans
* <=/>= operators
---
 runtime/queries/c/highlights.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/runtime/queries/c/highlights.scm b/runtime/queries/c/highlights.scm
index 1263cff6..647df05d 100644
--- a/runtime/queries/c/highlights.scm
+++ b/runtime/queries/c/highlights.scm
@@ -21,6 +21,7 @@
 "union" @keyword
 "volatile" @keyword
 "while" @keyword
+"const" @keyword
 
 [
  "#define"
@@ -50,10 +51,14 @@
 "==" @operator
 ">" @operator
 "||" @operator
+">=" @operator
+"<=" @operator
 
 "." @punctuation.delimiter
 ";" @punctuation.delimiter
 
+[(true) (false)] @constant.builtin.boolean
+
 (enumerator) @type.enum.variant
 
 (string_literal) @string

From acf35997233657cd9e990d875d5ce2c884b9f72e Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 9 Aug 2022 10:50:18 -0500
Subject: [PATCH 034/884] erlang: Use Edoc style auto-pairs

Specifically this changes backtic's right-hand-side pair character
to single-quote which is the syntax for inline and block code in
Edoc.
---
 languages.toml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/languages.toml b/languages.toml
index d125ae88..264f0a42 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1118,6 +1118,14 @@ comment-token = "%%"
 indent = { tab-width = 4, unit = "    " }
 language-server = { command = "erlang_ls" }
 
+[language.auto-pairs]
+'(' = ')'
+'{' = '}'
+'[' = ']'
+'"' = '"'
+"'" = "'"
+'`' = "'"
+
 [[grammar]]
 name = "erlang"
 source = { git = "https://github.com/the-mikedavis/tree-sitter-erlang", rev = "0e7d677d11a7379686c53c616825714ccb728059" }

From ac669ade0587e717c071386f665d05f61d646a61 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 9 Aug 2022 11:27:42 -0500
Subject: [PATCH 035/884] erlang: Fix highlighting of empty records

For example

    -record(state, {})

Would not highlight `state` as a type since the alternation didn't
allow for an empty tuple. Allowing the inner atom of the tuple to be
optional fixes this case.
---
 runtime/queries/erlang/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/queries/erlang/highlights.scm b/runtime/queries/erlang/highlights.scm
index 8e4a640d..58c8fb8a 100644
--- a/runtime/queries/erlang/highlights.scm
+++ b/runtime/queries/erlang/highlights.scm
@@ -18,7 +18,7 @@
     .
     [(atom) @type (macro)]
     [
-      (tuple (atom) @variable.other.member)
+      (tuple (atom)? @variable.other.member)
       (tuple
         (binary_operator
           left: (atom) @variable.other.member

From 03f0ef93ac6da58963b32034fd4681e428867d2a Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 17 Aug 2022 16:20:44 -0500
Subject: [PATCH 036/884] Update tree-sitter-rust to latest

There don't appear to be any regressions from the updates.
Also included is a fix which highlights the "#" as in attributes
as punctuation. This was previously unhighlighted.
---
 languages.toml                      | 2 +-
 runtime/queries/rust/highlights.scm | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 264f0a42..05608b81 100644
--- a/languages.toml
+++ b/languages.toml
@@ -50,7 +50,7 @@ args = { attachCommands = [ "platform select remote-gdb-server", "platform conne
 
 [[grammar]]
 name = "rust"
-source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "a360da0a29a19c281d08295a35ecd0544d2da211" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "41e23b454f503e6fe63ec4b6d9f7f2cf7788ab8e" }
 
 [[language]]
 name = "toml"
diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm
index 5de92a60..39a764a6 100644
--- a/runtime/queries/rust/highlights.scm
+++ b/runtime/queries/rust/highlights.scm
@@ -67,6 +67,7 @@
   "]"
   "{"
   "}"
+  "#"
 ] @punctuation.bracket
 (type_arguments
   [

From 7547a961bb29b7619cf683a241781041aa208c37 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 31 Aug 2022 03:47:18 -0500
Subject: [PATCH 037/884] Discard LSP publishDiagnostic when LS is not
 initialized (#3403)

This is invalid according to the [LSP spec]:

> In addition the server is not allowed to send any requests
> or notifications to the client until it has responded with an
> InitializeResult, with the exception that during the initialize
> request the server is allowed to send the notifications
> window/showMessage, window/logMessage and telemetry/event as well
> as the window/showMessageRequest request to the client.

So we should discard the message when the language server is not
yet initialized. This can happen if the server sends
textDocument/publishDiagnostics before responding to the initialize
request. clojure-lsp appears to exhibit this behavior in the wild.

[LSP Spec]: https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#initialize
---
 helix-term/src/application.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 3124beb0..fd1cfb2e 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -512,7 +512,12 @@ impl Application {
                                     use helix_core::diagnostic::{Diagnostic, Range, Severity::*};
                                     use lsp::DiagnosticSeverity;
 
-                                    let language_server = doc.language_server().unwrap();
+                                    let language_server = if let Some(language_server) = doc.language_server() {
+                                        language_server
+                                    } else {
+                                        log::warn!("Discarding diagnostic because language server is not initialized: {:?}", diagnostic);
+                                        return None;
+                                    };
 
                                     // TODO: convert inside server
                                     let start = if let Some(start) = lsp_pos_to_pos(

From 83f177d2701b0ec58abcb47c2a1ee133e72342e4 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 31 Aug 2022 03:48:33 -0500
Subject: [PATCH 038/884] Refactor goto_ts_object_impl as a motion (#3264)

This refactor changes the overall structure of the goto_ts_object_impl
command without removing any functionality from its behavior. The
refactored motion:

* acts on all selections instead of reducing to one selection
* may be repeated with the `repeat_last_motion` (A-.) command
* informs the user when the syntax-tree is not accessible in the current buffer
---
 helix-term/src/commands.rs | 41 ++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 5bce6ca6..41960d35 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4251,26 +4251,33 @@ fn scroll_down(cx: &mut Context) {
     scroll(cx, cx.count(), Direction::Forward);
 }
 
-fn goto_ts_object_impl(cx: &mut Context, object: &str, direction: Direction) {
+fn goto_ts_object_impl(cx: &mut Context, object: &'static str, direction: Direction) {
     let count = cx.count();
-    let (view, doc) = current!(cx.editor);
-    let text = doc.text().slice(..);
-    let range = doc.selection(view.id).primary();
+    let motion = move |editor: &mut Editor| {
+        let (view, doc) = current!(editor);
+        if let Some((lang_config, syntax)) = doc.language_config().zip(doc.syntax()) {
+            let text = doc.text().slice(..);
+            let root = syntax.tree().root_node();
 
-    let new_range = match doc.language_config().zip(doc.syntax()) {
-        Some((lang_config, syntax)) => movement::goto_treesitter_object(
-            text,
-            range,
-            object,
-            direction,
-            syntax.tree().root_node(),
-            lang_config,
-            count,
-        ),
-        None => range,
-    };
+            let selection = doc.selection(view.id).clone().transform(|range| {
+                movement::goto_treesitter_object(
+                    text,
+                    range,
+                    object,
+                    direction,
+                    root,
+                    lang_config,
+                    count,
+                )
+            });
 
-    doc.set_selection(view.id, Selection::single(new_range.anchor, new_range.head));
+            doc.set_selection(view.id, selection);
+        } else {
+            editor.set_status("Syntax-tree is not available in current buffer");
+        }
+    };
+    motion(cx.editor);
+    cx.editor.last_motion = Some(Motion(Box::new(motion)));
 }
 
 fn goto_next_function(cx: &mut Context) {

From 93c6a337c4f139ce620257fef79f66cf48516d5c Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 31 Aug 2022 11:20:55 -0500
Subject: [PATCH 039/884] Avoid command execution hooks on closed docs (#3613)

Fixes a panic with a config like:

    [keys.normal.space]
    x = [":buffer-close"]

by bailing out of the command-execution handling if the document
doesn't exist after handling a command.
---
 helix-term/src/ui/editor.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 2de5fe5c..f4e2d13e 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -781,7 +781,10 @@ impl EditorView {
 
         let mut execute_command = |command: &commands::MappableCommand| {
             command.execute(cxt);
-            let doc = cxt.editor.documents.get_mut(&doc_id).unwrap();
+            let doc = match cxt.editor.documents.get(&doc_id) {
+                Some(doc) => doc,
+                None => return,
+            };
             let current_mode = doc.mode();
             match (last_mode, current_mode) {
                 (Mode::Normal, Mode::Insert) => {

From 5c3f43a7f0c5392242424912bde992d9305c0c8e Mon Sep 17 00:00:00 2001
From: Charlie Groves <c@sevorg.org>
Date: Wed, 31 Aug 2022 16:23:21 +0000
Subject: [PATCH 040/884] Share the restore_term code between panic and normal
 exits (#3612)

It was starting to diverge as the normal exit code was restoring the prompt but the panic code
wasn't, and the panic code was disabling bracketed paste but the normal code wasn't.

This changes the panic path slightly in that we won't disable raw mode if exiting alternate screen
and disabling bracketed paste fails. If that happens, things are so busted I don't think it matters
anyway.
---
 helix-term/src/application.rs | 42 +++++++++++++++++------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index fd1cfb2e..9e79e7c9 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -85,6 +85,22 @@ fn setup_integration_logging() {
         .apply();
 }
 
+fn restore_term() -> Result<(), Error> {
+    let mut stdout = stdout();
+    // reset cursor shape
+    write!(stdout, "\x1B[0 q")?;
+    // Ignore errors on disabling, this might trigger on windows if we call
+    // disable without calling enable previously
+    let _ = execute!(stdout, DisableMouseCapture);
+    execute!(
+        stdout,
+        DisableBracketedPaste,
+        terminal::LeaveAlternateScreen
+    )?;
+    terminal::disable_raw_mode()?;
+    Ok(())
+}
+
 impl Application {
     pub fn new(args: Args, config: Config) -> Result<Self, Error> {
         #[cfg(feature = "integration")]
@@ -389,7 +405,7 @@ impl Application {
         match signal {
             signal::SIGTSTP => {
                 self.compositor.save_cursor();
-                self.restore_term().unwrap();
+                restore_term().unwrap();
                 low_level::emulate_default_handler(signal::SIGTSTP).unwrap();
             }
             signal::SIGCONT => {
@@ -803,18 +819,6 @@ impl Application {
         Ok(())
     }
 
-    fn restore_term(&mut self) -> Result<(), Error> {
-        let mut stdout = stdout();
-        // reset cursor shape
-        write!(stdout, "\x1B[0 q")?;
-        // Ignore errors on disabling, this might trigger on windows if we call
-        // disable without calling enable previously
-        let _ = execute!(stdout, DisableMouseCapture);
-        execute!(stdout, terminal::LeaveAlternateScreen)?;
-        terminal::disable_raw_mode()?;
-        Ok(())
-    }
-
     pub async fn run<S>(&mut self, input_stream: &mut S) -> Result<i32, Error>
     where
         S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
@@ -826,20 +830,14 @@ impl Application {
         std::panic::set_hook(Box::new(move |info| {
             // We can't handle errors properly inside this closure.  And it's
             // probably not a good idea to `unwrap()` inside a panic handler.
-            // So we just ignore the `Result`s.
-            let _ = execute!(std::io::stdout(), DisableMouseCapture);
-            let _ = execute!(
-                std::io::stdout(),
-                terminal::LeaveAlternateScreen,
-                DisableBracketedPaste
-            );
-            let _ = terminal::disable_raw_mode();
+            // So we just ignore the `Result`.
+            let _ = restore_term();
             hook(info);
         }));
 
         self.event_loop(input_stream).await;
         self.close().await?;
-        self.restore_term()?;
+        restore_term()?;
 
         Ok(self.editor.exit_code)
     }

From e3e71fa36be14659f0eabe1d4c80ef7e68135a6a Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Wed, 31 Aug 2022 21:53:45 +0530
Subject: [PATCH 041/884] Show clipboard info in --health output (#2947)

* Show clipboard info in --health output

* health: Separate 'languages' category from 'all'

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 helix-term/src/health.rs | 35 ++++++++++++++++++++++++++++++++---
 helix-term/src/main.rs   |  5 +++--
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/helix-term/src/health.rs b/helix-term/src/health.rs
index 4a266e48..ac9f06fc 100644
--- a/helix-term/src/health.rs
+++ b/helix-term/src/health.rs
@@ -83,6 +83,33 @@ pub fn general() -> std::io::Result<()> {
     Ok(())
 }
 
+pub fn clipboard() -> std::io::Result<()> {
+    let stdout = std::io::stdout();
+    let mut stdout = stdout.lock();
+
+    let board = get_clipboard_provider();
+    match board.name().as_ref() {
+        "none" => {
+            writeln!(
+                stdout,
+                "{}",
+                "System clipboard provider: Not installed".red()
+            )?;
+            writeln!(
+                stdout,
+                "    {}",
+                "For troubleshooting system clipboard issues, refer".red()
+            )?;
+            writeln!(stdout, "    {}",
+                "https://github.com/helix-editor/helix/wiki/Troubleshooting#copypaste-fromto-system-clipboard-not-working"
+            .red().underlined())?;
+        }
+        name => writeln!(stdout, "System clipboard provider: {}", name)?,
+    }
+
+    Ok(())
+}
+
 pub fn languages_all() -> std::io::Result<()> {
     let stdout = std::io::stdout();
     let mut stdout = stdout.lock();
@@ -281,13 +308,15 @@ fn probe_treesitter_feature(lang: &str, feature: TsFeature) -> std::io::Result<(
 
 pub fn print_health(health_arg: Option<String>) -> std::io::Result<()> {
     match health_arg.as_deref() {
-        Some("all") => languages_all()?,
-        Some(lang) => language(lang.to_string())?,
-        None => {
+        Some("languages") => languages_all()?,
+        Some("clipboard") => clipboard()?,
+        None | Some("all") => {
             general()?;
+            clipboard()?;
             writeln!(std::io::stdout().lock())?;
             languages_all()?;
         }
+        Some(lang) => language(lang.to_string())?,
     }
     Ok(())
 }
diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs
index 7f04f201..d21d3e77 100644
--- a/helix-term/src/main.rs
+++ b/helix-term/src/main.rs
@@ -61,8 +61,9 @@ ARGS:
 FLAGS:
     -h, --help                     Prints help information
     --tutor                        Loads the tutorial
-    --health [LANG]                Checks for potential errors in editor setup
-                                   If given, checks for config errors in language LANG
+    --health [CATEGORY]            Checks for potential errors in editor setup
+                                   CATEGORY can be a language or one of 'clipboard', 'languages'
+                                   or 'all'. 'all' is the default if not specified.
     -g, --grammar {{fetch|build}}    Fetches or builds tree-sitter grammars listed in languages.toml
     -c, --config <file>            Specifies a file to use for configuration
     -v                             Increases logging verbosity each use for up to 3 times

From 4c9f144dace484ca99cc84053493ed7b5f6946ac Mon Sep 17 00:00:00 2001
From: Frojdholm <Frojdholm@users.noreply.github.com>
Date: Wed, 31 Aug 2022 18:26:21 +0200
Subject: [PATCH 042/884] fix: Recalculate completion when going through prompt
 history (#3193)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: Recalculate completion when going through prompt history

* Update completion when the prompt line is changed

It should not be possible to update the line without also updating the
completion since the completion holds an index into the line.

* Fix Prompt::with_line recalculate completion

with_line was the last function where recalculate completion had to be
done manually. This function now also recalculates the completion so
that it's impossible to forget.

* Exit selection when recalculating completion

Keeping the selection index when the completion has been recalculated
doesn't make sense. This clears the selection automatically, removing
most needs to manually clear it.

* Remove &mut on save_filter

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
---
 helix-term/src/commands/dap.rs  |  8 ++--
 helix-term/src/ui/mod.rs        | 19 +++-----
 helix-term/src/ui/picker.rs     |  2 +-
 helix-term/src/ui/prompt.rs     | 79 +++++++++++++++++----------------
 helix-term/tests/integration.rs |  1 +
 helix-term/tests/test/prompt.rs | 18 ++++++++
 6 files changed, 70 insertions(+), 57 deletions(-)
 create mode 100644 helix-term/tests/test/prompt.rs

diff --git a/helix-term/src/commands/dap.rs b/helix-term/src/commands/dap.rs
index 1c780c1f..12a3fbc7 100644
--- a/helix-term/src/commands/dap.rs
+++ b/helix-term/src/commands/dap.rs
@@ -582,7 +582,7 @@ pub fn dap_edit_condition(cx: &mut Context) {
             None => return,
         };
         let callback = Box::pin(async move {
-            let call: Callback = Box::new(move |_editor, compositor| {
+            let call: Callback = Box::new(move |editor, compositor| {
                 let mut prompt = Prompt::new(
                     "condition:".into(),
                     None,
@@ -607,7 +607,7 @@ pub fn dap_edit_condition(cx: &mut Context) {
                     },
                 );
                 if let Some(condition) = breakpoint.condition {
-                    prompt.insert_str(&condition)
+                    prompt.insert_str(&condition, editor)
                 }
                 compositor.push(Box::new(prompt));
             });
@@ -624,7 +624,7 @@ pub fn dap_edit_log(cx: &mut Context) {
             None => return,
         };
         let callback = Box::pin(async move {
-            let call: Callback = Box::new(move |_editor, compositor| {
+            let call: Callback = Box::new(move |editor, compositor| {
                 let mut prompt = Prompt::new(
                     "log-message:".into(),
                     None,
@@ -648,7 +648,7 @@ pub fn dap_edit_log(cx: &mut Context) {
                     },
                 );
                 if let Some(log_message) = breakpoint.log_message {
-                    prompt.insert_str(&log_message);
+                    prompt.insert_str(&log_message, editor);
                 }
                 compositor.push(Box::new(prompt));
             });
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 485ee848..01ffe243 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -35,10 +35,10 @@ pub fn prompt(
     completion_fn: impl FnMut(&Editor, &str) -> Vec<prompt::Completion> + 'static,
     callback_fn: impl FnMut(&mut crate::compositor::Context, &str, PromptEvent) + 'static,
 ) {
-    show_prompt(
-        cx,
-        Prompt::new(prompt, history_register, completion_fn, callback_fn),
-    );
+    let mut prompt = Prompt::new(prompt, history_register, completion_fn, callback_fn);
+    // Calculate the initial completion
+    prompt.recalculate_completion(cx.editor);
+    cx.push_layer(Box::new(prompt));
 }
 
 pub fn prompt_with_input(
@@ -49,15 +49,8 @@ pub fn prompt_with_input(
     completion_fn: impl FnMut(&Editor, &str) -> Vec<prompt::Completion> + 'static,
     callback_fn: impl FnMut(&mut crate::compositor::Context, &str, PromptEvent) + 'static,
 ) {
-    show_prompt(
-        cx,
-        Prompt::new(prompt, history_register, completion_fn, callback_fn).with_line(input),
-    );
-}
-
-fn show_prompt(cx: &mut crate::commands::Context, mut prompt: Prompt) {
-    // Calculate initial completion
-    prompt.recalculate_completion(cx.editor);
+    let prompt = Prompt::new(prompt, history_register, completion_fn, callback_fn)
+        .with_line(input, cx.editor);
     cx.push_layer(Box::new(prompt));
 }
 
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 2878fc90..24d3b288 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -470,7 +470,7 @@ impl<T: Item> Picker<T> {
         self.filters
             .extend(self.matches.iter().map(|(index, _)| *index));
         self.filters.sort_unstable(); // used for binary search later
-        self.prompt.clear(cx);
+        self.prompt.clear(cx.editor);
     }
 
     pub fn toggle_preview(&mut self) {
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 1ac83390..55091a54 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -83,10 +83,11 @@ impl Prompt {
         }
     }
 
-    pub fn with_line(mut self, line: String) -> Self {
+    pub fn with_line(mut self, line: String, editor: &Editor) -> Self {
         let cursor = line.len();
         self.line = line;
         self.cursor = cursor;
+        self.recalculate_completion(editor);
         self
     }
 
@@ -95,6 +96,7 @@ impl Prompt {
     }
 
     pub fn recalculate_completion(&mut self, editor: &Editor) {
+        self.exit_selection();
         self.completion = (self.completion_fn)(editor, &self.line);
     }
 
@@ -213,12 +215,12 @@ impl Prompt {
             self.cursor = pos;
         }
         self.recalculate_completion(cx.editor);
-        self.exit_selection();
     }
 
-    pub fn insert_str(&mut self, s: &str) {
+    pub fn insert_str(&mut self, s: &str, editor: &Editor) {
         self.line.insert_str(self.cursor, s);
         self.cursor += s.len();
+        self.recalculate_completion(editor);
     }
 
     pub fn move_cursor(&mut self, movement: Movement) {
@@ -234,65 +236,65 @@ impl Prompt {
         self.cursor = self.line.len();
     }
 
-    pub fn delete_char_backwards(&mut self, cx: &Context) {
+    pub fn delete_char_backwards(&mut self, editor: &Editor) {
         let pos = self.eval_movement(Movement::BackwardChar(1));
         self.line.replace_range(pos..self.cursor, "");
         self.cursor = pos;
 
-        self.exit_selection();
-        self.recalculate_completion(cx.editor);
+        self.recalculate_completion(editor);
     }
 
-    pub fn delete_char_forwards(&mut self, cx: &Context) {
+    pub fn delete_char_forwards(&mut self, editor: &Editor) {
         let pos = self.eval_movement(Movement::ForwardChar(1));
         self.line.replace_range(self.cursor..pos, "");
 
-        self.exit_selection();
-        self.recalculate_completion(cx.editor);
+        self.recalculate_completion(editor);
     }
 
-    pub fn delete_word_backwards(&mut self, cx: &Context) {
+    pub fn delete_word_backwards(&mut self, editor: &Editor) {
         let pos = self.eval_movement(Movement::BackwardWord(1));
         self.line.replace_range(pos..self.cursor, "");
         self.cursor = pos;
 
-        self.exit_selection();
-        self.recalculate_completion(cx.editor);
+        self.recalculate_completion(editor);
     }
 
-    pub fn delete_word_forwards(&mut self, cx: &Context) {
+    pub fn delete_word_forwards(&mut self, editor: &Editor) {
         let pos = self.eval_movement(Movement::ForwardWord(1));
         self.line.replace_range(self.cursor..pos, "");
 
-        self.exit_selection();
-        self.recalculate_completion(cx.editor);
+        self.recalculate_completion(editor);
     }
 
-    pub fn kill_to_start_of_line(&mut self, cx: &Context) {
+    pub fn kill_to_start_of_line(&mut self, editor: &Editor) {
         let pos = self.eval_movement(Movement::StartOfLine);
         self.line.replace_range(pos..self.cursor, "");
         self.cursor = pos;
 
-        self.exit_selection();
-        self.recalculate_completion(cx.editor);
+        self.recalculate_completion(editor);
     }
 
-    pub fn kill_to_end_of_line(&mut self, cx: &Context) {
+    pub fn kill_to_end_of_line(&mut self, editor: &Editor) {
         let pos = self.eval_movement(Movement::EndOfLine);
         self.line.replace_range(self.cursor..pos, "");
 
-        self.exit_selection();
-        self.recalculate_completion(cx.editor);
+        self.recalculate_completion(editor);
     }
 
-    pub fn clear(&mut self, cx: &Context) {
+    pub fn clear(&mut self, editor: &Editor) {
         self.line.clear();
         self.cursor = 0;
-        self.recalculate_completion(cx.editor);
-        self.exit_selection();
+        self.recalculate_completion(editor);
     }
 
-    pub fn change_history(&mut self, register: &[String], direction: CompletionDirection) {
+    pub fn change_history(
+        &mut self,
+        cx: &mut Context,
+        register: char,
+        direction: CompletionDirection,
+    ) {
+        let register = cx.editor.registers.get_mut(register).read();
+
         if register.is_empty() {
             return;
         }
@@ -312,6 +314,7 @@ impl Prompt {
         self.history_pos = Some(index);
 
         self.move_end();
+        self.recalculate_completion(cx.editor);
     }
 
     pub fn change_completion_selection(&mut self, direction: CompletionDirection) {
@@ -494,16 +497,18 @@ impl Component for Prompt {
             ctrl!('f') | key!(Right) => self.move_cursor(Movement::ForwardChar(1)),
             ctrl!('e') | key!(End) => self.move_end(),
             ctrl!('a') | key!(Home) => self.move_start(),
-            ctrl!('w') | alt!(Backspace) | ctrl!(Backspace) => self.delete_word_backwards(cx),
-            alt!('d') | alt!(Delete) | ctrl!(Delete) => self.delete_word_forwards(cx),
-            ctrl!('k') => self.kill_to_end_of_line(cx),
-            ctrl!('u') => self.kill_to_start_of_line(cx),
+            ctrl!('w') | alt!(Backspace) | ctrl!(Backspace) => {
+                self.delete_word_backwards(cx.editor)
+            }
+            alt!('d') | alt!(Delete) | ctrl!(Delete) => self.delete_word_forwards(cx.editor),
+            ctrl!('k') => self.kill_to_end_of_line(cx.editor),
+            ctrl!('u') => self.kill_to_start_of_line(cx.editor),
             ctrl!('h') | key!(Backspace) => {
-                self.delete_char_backwards(cx);
+                self.delete_char_backwards(cx.editor);
                 (self.callback_fn)(cx, &self.line, PromptEvent::Update);
             }
             ctrl!('d') | key!(Delete) => {
-                self.delete_char_forwards(cx);
+                self.delete_char_forwards(cx.editor);
                 (self.callback_fn)(cx, &self.line, PromptEvent::Update);
             }
             ctrl!('s') => {
@@ -520,14 +525,13 @@ impl Component for Prompt {
                 );
                 let line = text.slice(range.from()..range.to()).to_string();
                 if !line.is_empty() {
-                    self.insert_str(line.as_str());
+                    self.insert_str(line.as_str(), cx.editor);
                     (self.callback_fn)(cx, &self.line, PromptEvent::Update);
                 }
             }
             key!(Enter) => {
                 if self.selection.is_some() && self.line.ends_with(std::path::MAIN_SEPARATOR) {
                     self.recalculate_completion(cx.editor);
-                    self.exit_selection();
                 } else {
                     // handle executing with last command in history if nothing entered
                     let input: Cow<str> = if self.line.is_empty() {
@@ -553,15 +557,13 @@ impl Component for Prompt {
             }
             ctrl!('p') | key!(Up) => {
                 if let Some(register) = self.history_register {
-                    let register = cx.editor.registers.get_mut(register);
-                    self.change_history(register.read(), CompletionDirection::Backward);
+                    self.change_history(cx, register, CompletionDirection::Backward);
                     (self.callback_fn)(cx, &self.line, PromptEvent::Update);
                 }
             }
             ctrl!('n') | key!(Down) => {
                 if let Some(register) = self.history_register {
-                    let register = cx.editor.registers.get_mut(register);
-                    self.change_history(register.read(), CompletionDirection::Forward);
+                    self.change_history(cx, register, CompletionDirection::Forward);
                     (self.callback_fn)(cx, &self.line, PromptEvent::Update);
                 }
             }
@@ -570,7 +572,6 @@ impl Component for Prompt {
                 // if single completion candidate is a directory list content in completion
                 if self.completion.len() == 1 && self.line.ends_with(std::path::MAIN_SEPARATOR) {
                     self.recalculate_completion(cx.editor);
-                    self.exit_selection();
                 }
                 (self.callback_fn)(cx, &self.line, PromptEvent::Update)
             }
@@ -602,8 +603,8 @@ impl Component for Prompt {
                             .read(c)
                             .and_then(|r| r.first())
                             .map_or("", |r| r.as_str()),
+                        context.editor,
                     );
-                    prompt.recalculate_completion(context.editor);
                 }));
                 (self.callback_fn)(cx, &self.line, PromptEvent::Update);
                 return EventResult::Consumed(None);
diff --git a/helix-term/tests/integration.rs b/helix-term/tests/integration.rs
index 11bc4e4c..8969e976 100644
--- a/helix-term/tests/integration.rs
+++ b/helix-term/tests/integration.rs
@@ -21,5 +21,6 @@ mod test {
     mod auto_pairs;
     mod commands;
     mod movement;
+    mod prompt;
     mod write;
 }
diff --git a/helix-term/tests/test/prompt.rs b/helix-term/tests/test/prompt.rs
new file mode 100644
index 00000000..2ab9604c
--- /dev/null
+++ b/helix-term/tests/test/prompt.rs
@@ -0,0 +1,18 @@
+use super::*;
+
+use helix_term::application::Application;
+
+#[tokio::test]
+async fn test_history_completion() -> anyhow::Result<()> {
+    test_key_sequence(
+        &mut Application::new(Args::default(), Config::default())?,
+        Some(":asdf<ret>:theme d<C-n><tab>"),
+        Some(&|app| {
+            assert!(!app.editor.is_err());
+        }),
+        false,
+    )
+    .await?;
+
+    Ok(())
+}

From 7c34f20dcadfa79d628da1e3fff0d1b999fa3435 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 31 Aug 2022 11:37:14 -0500
Subject: [PATCH 043/884] Fix Prompt::handle_event compilation

---
 helix-term/src/ui/prompt.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 55091a54..1b2c35e9 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -472,7 +472,7 @@ impl Component for Prompt {
     fn handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
         let event = match event {
             Event::Paste(data) => {
-                self.insert_str(data);
+                self.insert_str(data, cx.editor);
                 self.recalculate_completion(cx.editor);
                 return EventResult::Consumed(None);
             }

From 22c5f2474deae6fc52f257ee313b95861a83366c Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 16 Jun 2022 17:33:28 -0500
Subject: [PATCH 044/884] Add changelog entries for 22.08

---
 CHANGELOG.md | 265 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 265 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 693a2a5f..112bf211 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,268 @@
+# 22.08 (2022-08-02)
+
+A big _thank you_ to our contributors! This release had 87 contributors.
+
+As usual, the following is a summary of each of the changes since the last release.
+For the full log, check out the [git log](https://github.com/helix-editor/helix/compare/22.05..22.08).
+
+Breaking changes:
+
+- Special keymap names for `+`, `;` and `%` have been replaced with those literal characters ([#2677](https://github.com/helix-editor/helix/pull/2677), [#3556](https://github.com/helix-editor/helix/pull/3556))
+- `A-Left` and `A-Right` have become `C-Left` and `C-Right` for word-wise motion ([#2500](https://github.com/helix-editor/helix/pull/2500))
+- The `catppuccin` theme's name has been corrected from `catpuccin` ([#2713](https://github.com/helix-editor/helix/pull/2713))
+- `catppuccin` has been replaced by its variants, `catppuccin_frappe`, `catppuccin_latte`, `catppuccin_macchiato`, `catppuccin_mocha` ([#3281](https://github.com/helix-editor/helix/pull/3281))
+- `C-n` and `C-p` have been removed from the default insert mode keymap ([#3340](https://github.com/helix-editor/helix/pull/3340))
+- The `extend_line` command has been replaced with `extend_line_below` and a new `extend_line` command now exists ([#3046](https://github.com/helix-editor/helix/pull/3046))
+
+Features:
+
+- Add an integration testing harness ([#2359](https://github.com/helix-editor/helix/pull/2359))
+- Indent guides ([#1796](https://github.com/helix-editor/helix/pull/1796), [906259c](https://github.com/helix-editor/helix/commit/906259c))
+- Cursorline ([#2170](https://github.com/helix-editor/helix/pull/2170), [fde9e03](https://github.com/helix-editor/helix/commit/fde9e03))
+- Select all instances of the symbol under the cursor (`<space>h`) ([#2738](https://github.com/helix-editor/helix/pull/2738))
+- A picker for document and workspace LSP diagnostics (`<space>g`/`<space>G`) ([#2013](https://github.com/helix-editor/helix/pull/2013), [#2984](https://github.com/helix-editor/helix/pull/2984))
+- Allow styling the mode indicator per-mode ([#2676](https://github.com/helix-editor/helix/pull/2676))
+- Live preview for the theme picker ([#1798](https://github.com/helix-editor/helix/pull/1798))
+- Configurable statusline ([#2434](https://github.com/helix-editor/helix/pull/2434))
+- LSP SignatureHelp ([#1755](https://github.com/helix-editor/helix/pull/1755), [a8b123f](https://github.com/helix-editor/helix/commit/a8b123f))
+- A picker for the jumplist ([#3033](https://github.com/helix-editor/helix/pull/3033))
+- Configurable external formatter binaries ([#2942](https://github.com/helix-editor/helix/pull/2942))
+- Bracketed paste support ([#3233](https://github.com/helix-editor/helix/pull/3233), [12ddd03](https://github.com/helix-editor/helix/commit/12ddd03))
+
+Commands:
+
+- `:insert-output` and `:append-output` which insert/append output from a shell command ([#2589](https://github.com/helix-editor/helix/pull/2589))
+- The `t` textobject (`]t`/`[t`/`mit`/`mat`) for navigating tests ([#2807](https://github.com/helix-editor/helix/pull/2807))
+- `C-Backspace` and `C-Delete` for word-wise deletion in prompts and pickers ([#2500](https://github.com/helix-editor/helix/pull/2500))
+- `A-Delete` for forward word-wise deletion in insert mode ([#2500](https://github.com/helix-editor/helix/pull/2500))
+- `C-t` for toggling the preview pane in pickers ([#3021](https://github.com/helix-editor/helix/pull/3021))
+- `extend_line` now extends in the direction of the cursor ([#3046](https://github.com/helix-editor/helix/pull/3046))
+
+Usability improvements and fixes:
+
+- Fix tree-sitter parser builds on illumos ([#2602](https://github.com/helix-editor/helix/pull/2602))
+- Remove empty stratch buffer from jumplists when removing ([5ed6223](https://github.com/helix-editor/helix/commit/5ed6223))
+- Fix panic on undo after `shell_append_output` ([#2625](https://github.com/helix-editor/helix/pull/2625))
+- Sort LSP edits by start range ([3d91c99](https://github.com/helix-editor/helix/commit/3d91c99))
+- Be more defensive about LSP URI conversions ([6de6a3e](https://github.com/helix-editor/helix/commit/6de6a3e), [378f438](https://github.com/helix-editor/helix/commit/378f438))
+- Ignore SendErrors when grammar builds fail ([#2641](https://github.com/helix-editor/helix/pull/2641))
+- Append `set_line_ending` to document history ([#2649](https://github.com/helix-editor/helix/pull/2649))
+- Use last prompt entry when empty ([b14c258](https://github.com/helix-editor/helix/commit/b14c258), [#2870](https://github.com/helix-editor/helix/pull/2870))
+- Do not add extra line breaks in markdown lists ([#2689](https://github.com/helix-editor/helix/pull/2689))
+- Disable dialyzer by default for ElixirLS ([#2710](https://github.com/helix-editor/helix/pull/2710))
+- Refactor textobject node capture ([#2741](https://github.com/helix-editor/helix/pull/2741))
+- Prevent re-selecting the same range with `expand_selection` ([#2760](https://github.com/helix-editor/helix/pull/2760))
+- Introduce `keyword.storage` highlight scope ([#2731](https://github.com/helix-editor/helix/pull/2731))
+- Handle symlinks more consistently ([#2718](https://github.com/helix-editor/helix/pull/2718))
+- Improve markdown list rendering ([#2687](https://github.com/helix-editor/helix/pull/2687))
+- Update auto-pairs and idle-timout settings when the config is reloaded ([#2736](https://github.com/helix-editor/helix/pull/2736))
+- Fix panic on closing last buffer ([#2658](https://github.com/helix-editor/helix/pull/2658))
+- Prevent modifying jumplist until jumping to a reference ([#2670](https://github.com/helix-editor/helix/pull/2670))
+- Ensure `:quit` and `:quit!` take no arguments ([#2654](https://github.com/helix-editor/helix/pull/2654))
+- Fix crash due to cycles when replaying macros ([#2647](https://github.com/helix-editor/helix/pull/2647))
+- Pass LSP FormattingOptions ([#2635](https://github.com/helix-editor/helix/pull/2635))
+- Prevent showing colors when the health-check is piped ([#2836](https://github.com/helix-editor/helix/pull/2836))
+- Use character indexing for mouse selection ([#2839](https://github.com/helix-editor/helix/pull/2839))
+- Display the highest severity diagnostic for a line in the gutter ([#2835](https://github.com/helix-editor/helix/pull/2835))
+- Default the ruler color to red background ([#2669](https://github.com/helix-editor/helix/pull/2669))
+- Make `move_vertically` aware of tabs and wide characters ([#2620](https://github.com/helix-editor/helix/pull/2620))
+- Enable shellwords for Windows ([#2767](https://github.com/helix-editor/helix/pull/2767))
+- Add history suggestions to global search ([#2717](https://github.com/helix-editor/helix/pull/2717))
+- Fix the scrollbar's length proportional to total menu items ([#2860](https://github.com/helix-editor/helix/pull/2860))
+- Reset terminal modifiers for diagnostic text ([#2861](https://github.com/helix-editor/helix/pull/2861), [#2900](https://github.com/helix-editor/helix/pull/2900))
+- Redetect indents and line-endings after a Language Server replaces the document ([#2778](https://github.com/helix-editor/helix/pull/2778))
+- Check selection's visible width when copying on mouse click ([#2711](https://github.com/helix-editor/helix/pull/2711))
+- Fix edge-case in tree-sitter `expand_selection` command ([#2877](https://github.com/helix-editor/helix/pull/2877))
+- Add a single-width left margin for the completion popup ([#2728](https://github.com/helix-editor/helix/pull/2728))
+- Right-align the scrollbar in the completion popup ([#2754](https://github.com/helix-editor/helix/pull/2754))
+- Fix recursive macro crash and empty macro lockout ([#2902](https://github.com/helix-editor/helix/pull/2902))
+- Fix backwards character deletion on other whitespaces ([#2855](https://github.com/helix-editor/helix/pull/2855))
+- Add search and space/backspace bindings to view modes ([#2803](https://github.com/helix-editor/helix/pull/2803))
+- Add `--vsplit` and `--hsplit` CLI arguments for opening in splits ([#2773](https://github.com/helix-editor/helix/pull/2773), [#3073](https://github.com/helix-editor/helix/pull/3073))
+- Sort themes, languages and files inputs by score and name ([#2675](https://github.com/helix-editor/helix/pull/2675))
+- Highlight entire rows in ([#2939](https://github.com/helix-editor/helix/pull/2939))
+- Fix backwards selection duplication widening bug ([#2945](https://github.com/helix-editor/helix/pull/2945), [#3024](https://github.com/helix-editor/helix/pull/3024))
+- Skip serializing Option type DAP fields ([44f5963](https://github.com/helix-editor/helix/commit/44f5963))
+- Fix required `cwd` field in DAP `RunTerminalArguments` type ([85411be](https://github.com/helix-editor/helix/commit/85411be), [#3240](https://github.com/helix-editor/helix/pull/3240))
+- Add LSP `workspace/applyEdit` to client capabilities ([#3012](https://github.com/helix-editor/helix/pull/3012))
+- Respect count for repeating motion ([#3057](https://github.com/helix-editor/helix/pull/3057))
+- Respect count for selecting next/previous match ([#3056](https://github.com/helix-editor/helix/pull/3056))
+- Respect count for tree-sitter motions ([#3058](https://github.com/helix-editor/helix/pull/3058))
+- Make gutters padding optional ([#2996](https://github.com/helix-editor/helix/pull/2996))
+- Support pre-filling prompts ([#2459](https://github.com/helix-editor/helix/pull/2459), [#3259](https://github.com/helix-editor/helix/pull/3259))
+- Add statusline element to display file line-endings ([#3113](https://github.com/helix-editor/helix/pull/3113))
+- Keep jump and file history when using `:split` ([#3031](https://github.com/helix-editor/helix/pull/3031), [#3160](https://github.com/helix-editor/helix/pull/3160))
+- Make tree-sitter query `; inherits <language>` feature imperative ([#2470](https://github.com/helix-editor/helix/pull/2470))
+- Indent with tabs by default ([#3095](https://github.com/helix-editor/helix/pull/3095))
+- Fix non-msvc grammar compilation on Windows ([#3190](https://github.com/helix-editor/helix/pull/3190))
+- Add spacer element to the statusline ([#3165](https://github.com/helix-editor/helix/pull/3165), [255c173](https://github.com/helix-editor/helix/commit/255c173))
+- Make gutters padding automatic ([#3163](https://github.com/helix-editor/helix/pull/3163))
+- Add `code` for LSP `Diagnostic` type ([#3096](https://github.com/helix-editor/helix/pull/3096))
+- Add position percentage to the statusline ([#3168](https://github.com/helix-editor/helix/pull/3168))
+- Add a configurable and themable statusline separator string ([#3175](https://github.com/helix-editor/helix/pull/3175))
+- Use OR of all selections when `search_selection` acts on multiple selections ([#3138](https://github.com/helix-editor/helix/pull/3138))
+- Add clipboard information to logs and the healthcheck ([#3271](https://github.com/helix-editor/helix/pull/3271))
+- Fix align selection behavior on tabs ([#3276](https://github.com/helix-editor/helix/pull/3276))
+- Fix terminal cursor shape reset ([#3289](https://github.com/helix-editor/helix/pull/3289))
+- Add an `injection.include-unnamed-children` predicate to injections queries ([#3129](https://github.com/helix-editor/helix/pull/3129))
+- Add a `-c`/`--config` CLI flag for specifying config file location ([#2666](https://github.com/helix-editor/helix/pull/2666))
+- Detect indent-style in `:set-language` command ([#3330](https://github.com/helix-editor/helix/pull/3330))
+- Fix non-deterministic highlighting ([#3275](https://github.com/helix-editor/helix/pull/3275))
+- Avoid setting the stdin handle when not necessary ([#3248](https://github.com/helix-editor/helix/pull/3248), [#3379](https://github.com/helix-editor/helix/pull/3379))
+- Fix indent guide styling ([#3324](https://github.com/helix-editor/helix/pull/3324))
+- Fix tab highlight when tab is partially visible ([#3313](https://github.com/helix-editor/helix/pull/3313))
+- Add completion for nested settings ([#3183](https://github.com/helix-editor/helix/pull/3183))
+- Advertise WorkspaceSymbolClientCapabilities LSP client capability ([#3361](https://github.com/helix-editor/helix/pull/3361))
+- Remove duplicate entries from the theme picker ([#3439](https://github.com/helix-editor/helix/pull/3439))
+- Shorted output for grammar fetching and building ([#3396](https://github.com/helix-editor/helix/pull/3396))
+- Add a `tabpad` option for visible tab padding whitespace characters ([#3458](https://github.com/helix-editor/helix/pull/3458))
+- Make DAP external terminal provider configurable ([cb7615e](https://github.com/helix-editor/helix/commit/cb7615e))
+- Use health checkmark character with shorter width ([#3505](https://github.com/helix-editor/helix/pull/3505))
+- Reset document mode to normal on view focus loss ([e4c9d40](https://github.com/helix-editor/helix/commit/e4c9d40))
+- Render indented code-blocks in markdown ([#3503](https://github.com/helix-editor/helix/pull/3503))
+- Add WezTerm to DAP terminal provider defaults ([#3588](https://github.com/helix-editor/helix/pull/3588))
+- Derive `Document` language name from `languages.toml` `name` key ([#3338](https://github.com/helix-editor/helix/pull/3338))
+- Fix process spawning error handling ([#3349](https://github.com/helix-editor/helix/pull/3349))
+- Don't resolve links for `:o` completion ([8a4fbf6](https://github.com/helix-editor/helix/commit/8a4fbf6))
+- Recalculate completion after pasting into prompt ([e77b7d1](https://github.com/helix-editor/helix/commit/e77b7d1))
+- Fix extra selections with regex anchors ([#3598](https://github.com/helix-editor/helix/pull/3598))
+- Move mode transition logic to `handle_keymap_event` ([#2634](https://github.com/helix-editor/helix/pull/2634))
+- Add documents to view history when using the jumplist ([#3593](https://github.com/helix-editor/helix/pull/3593))
+- Prevent panic when loading tree-sitter queries ([fa1dc7e](https://github.com/helix-editor/helix/commit/fa1dc7e))
+- Discard LSP publishDiagnostic when LS is not initialized ([#3403](https://github.com/helix-editor/helix/pull/3403))
+- Refactor tree-sitter textobject motions as repeatable motions ([#3264](https://github.com/helix-editor/helix/pull/3264))
+- Avoid command execution hooks on closed docs ([#3613](https://github.com/helix-editor/helix/pull/3613))
+- Share `restore_term` code between panic and normal exits ([#2612](https://github.com/helix-editor/helix/pull/2612))
+- Show clipboard info in `--health` output ([#2947](https://github.com/helix-editor/helix/pull/2947))
+- Recalculate completion when going through prompt history ([#3193](https://github.com/helix-editor/helix/pull/3193))
+
+Themes:
+
+- Update `tokyonight` and `tokyonight_storm` themes ([#2606](https://github.com/helix-editor/helix/pull/2606))
+- Update `solarized_light` themes ([#2626](https://github.com/helix-editor/helix/pull/2626))
+- Fix `catpuccin` `ui.popup` theme ([#2644](https://github.com/helix-editor/helix/pull/2644))
+- Update selection style of `night_owl` ([#2668](https://github.com/helix-editor/helix/pull/2668))
+- Fix spelling of `catppuccin` theme ([#2713](https://github.com/helix-editor/helix/pull/2713))
+- Update `base16_default`'s `ui.menu` ([#2794](https://github.com/helix-editor/helix/pull/2794))
+- Add `noctis_bordo` ([#2830](https://github.com/helix-editor/helix/pull/2830))
+- Add `acme` ([#2876](https://github.com/helix-editor/helix/pull/2876))
+- Add `meliora` ([#2884](https://github.com/helix-editor/helix/pull/2884), [#2890](https://github.com/helix-editor/helix/pull/2890))
+- Add cursorline scopes to various themes ([33d287a](https://github.com/helix-editor/helix/commit/33d287a), [#2892](https://github.com/helix-editor/helix/pull/2892), [#2915](https://github.com/helix-editor/helix/pull/2915), [#2916](https://github.com/helix-editor/helix/pull/2916), [#2918](https://github.com/helix-editor/helix/pull/2918), [#2927](https://github.com/helix-editor/helix/pull/2927), [#2925](https://github.com/helix-editor/helix/pull/2925), [#2938](https://github.com/helix-editor/helix/pull/2938), [#2962](https://github.com/helix-editor/helix/pull/2962), [#3054](https://github.com/helix-editor/helix/pull/3054))
+- Add mode colors to various themes ([#2926](https://github.com/helix-editor/helix/pull/2926), [#2933](https://github.com/helix-editor/helix/pull/2933), [#2929](https://github.com/helix-editor/helix/pull/2929), [#3098](https://github.com/helix-editor/helix/pull/3098), [#3104](https://github.com/helix-editor/helix/pull/3104), [#3128](https://github.com/helix-editor/helix/pull/3128), [#3135](https://github.com/helix-editor/helix/pull/3135), [#3200](https://github.com/helix-editor/helix/pull/3200))
+- Add `nord_light` ([#2908](https://github.com/helix-editor/helix/pull/2908))
+- Update `night_owl` ([#2929](https://github.com/helix-editor/helix/pull/2929))
+- Update `autumn` ([2e70985](https://github.com/helix-editor/helix/commit/2e70985), [936ed3a](https://github.com/helix-editor/helix/commit/936ed3a))
+- Update `one_dark` ([#3011](https://github.com/helix-editor/helix/pull/3011))
+- Add `noctis` ([#3043](https://github.com/helix-editor/helix/pull/3043), [#3128](https://github.com/helix-editor/helix/pull/3128))
+- Update `boo_berry` ([#3191](https://github.com/helix-editor/helix/pull/3191))
+- Update `monokai` ([#3131](https://github.com/helix-editor/helix/pull/3131))
+- Add `ayu_dark`, `ayu_light`, `ayu_mirage` ([#3184](https://github.com/helix-editor/helix/pull/3184))
+- Update `onelight` ([#3226](https://github.com/helix-editor/helix/pull/3226))
+- Add `base16_transparent` ([#3216](https://github.com/helix-editor/helix/pull/3216), [b565fff](https://github.com/helix-editor/helix/commit/b565fff))
+- Add `flatwhite` ([#3236](https://github.com/helix-editor/helix/pull/3236))
+- Update `dark_plus` ([#3302](https://github.com/helix-editor/helix/pull/3302))
+- Add `doom_acario_dark` ([#3308](https://github.com/helix-editor/helix/pull/3308), [#3539](https://github.com/helix-editor/helix/pull/3539))
+- Add `rose_pine_moon` ([#3229](https://github.com/helix-editor/helix/pull/3229))
+- Update `spacebones_light` ([#3342](https://github.com/helix-editor/helix/pull/3342))
+- Fix typos in themes ([8deaebd](https://github.com/helix-editor/helix/commit/8deaebd), [#3412](https://github.com/helix-editor/helix/pull/3412))
+- Add `emacs` ([#3410](https://github.com/helix-editor/helix/pull/3410))
+- Add `papercolor-light` ([#3426](https://github.com/helix-editor/helix/pull/3426), [#3470](https://github.com/helix-editor/helix/pull/3470), [#3585](https://github.com/helix-editor/helix/pull/3585))
+- Add `penumbra+` ([#3398](https://github.com/helix-editor/helix/pull/3398))
+- Add `fleetish` ([#3591](https://github.com/helix-editor/helix/pull/3591), [#3607](https://github.com/helix-editor/helix/pull/3607))
+- Add `sonokai` ([#3595](https://github.com/helix-editor/helix/pull/3595))
+- Update all themes for theme lints ([#3587](https://github.com/helix-editor/helix/pull/3587))
+
+LSP:
+
+- V ([#2526](https://github.com/helix-editor/helix/pull/2526))
+- Prisma ([#2703](https://github.com/helix-editor/helix/pull/2703))
+- Clojure ([#2780](https://github.com/helix-editor/helix/pull/2780))
+- WGSL ([#2872](https://github.com/helix-editor/helix/pull/2872))
+- Elvish ([#2948](https://github.com/helix-editor/helix/pull/2948))
+- Idris ([#2971](https://github.com/helix-editor/helix/pull/2971))
+- Fortran ([#3025](https://github.com/helix-editor/helix/pull/3025))
+- Gleam ([#3139](https://github.com/helix-editor/helix/pull/3139))
+- Odin ([#3214](https://github.com/helix-editor/helix/pull/3214))
+
+New languages:
+
+- V ([#2526](https://github.com/helix-editor/helix/pull/2526))
+- EDoc ([#2640](https://github.com/helix-editor/helix/pull/2640))
+- JSDoc ([#2650](https://github.com/helix-editor/helix/pull/2650))
+- OpenSCAD ([#2680](https://github.com/helix-editor/helix/pull/2680))
+- Prisma ([#2703](https://github.com/helix-editor/helix/pull/2703))
+- Clojure ([#2780](https://github.com/helix-editor/helix/pull/2780))
+- Starlark ([#2903](https://github.com/helix-editor/helix/pull/2903))
+- Elvish ([#2948](https://github.com/helix-editor/helix/pull/2948))
+- Fortran ([#3025](https://github.com/helix-editor/helix/pull/3025))
+- Ungrammar ([#3048](https://github.com/helix-editor/helix/pull/3048))
+- SCSS ([#3074](https://github.com/helix-editor/helix/pull/3074))
+- Go Template ([#3091](https://github.com/helix-editor/helix/pull/3091))
+- Graphviz dot ([#3241](https://github.com/helix-editor/helix/pull/3241))
+- Cue ([#3262](https://github.com/helix-editor/helix/pull/3262))
+- Slint ([#3355](https://github.com/helix-editor/helix/pull/3355))
+- Beancount ([#3297](https://github.com/helix-editor/helix/pull/3297))
+- Taskwarrior ([#3468](https://github.com/helix-editor/helix/pull/3468))
+- xit ([#3521](https://github.com/helix-editor/helix/pull/3521))
+- ESDL ([#3526](https://github.com/helix-editor/helix/pull/3526))
+- Awk ([#3528](https://github.com/helix-editor/helix/pull/3528), [#3535](https://github.com/helix-editor/helix/pull/3535))
+- Pascal ([#3542](https://github.com/helix-editor/helix/pull/3542))
+
+Updated languages and queries:
+
+- Nix ([#2472](https://github.com/helix-editor/helix/pull/2472))
+- Elixir ([#2619](https://github.com/helix-editor/helix/pull/2619))
+- CPON ([#2643](https://github.com/helix-editor/helix/pull/2643))
+- Textobjects queries for Erlang, Elixir, Gleam ([#2661](https://github.com/helix-editor/helix/pull/2661))
+- Capture rust closures as function textobjects ([4a27e2d](https://github.com/helix-editor/helix/commit/4a27e2d))
+- Heex ([#2800](https://github.com/helix-editor/helix/pull/2800), [#3170](https://github.com/helix-editor/helix/pull/3170))
+- Add `<<=` operator highlighting for Rust ([#2805](https://github.com/helix-editor/helix/pull/2805))
+- Fix comment injection in JavaScript/TypeScript ([#2763](https://github.com/helix-editor/helix/pull/2763))
+- Nickel ([#2859](https://github.com/helix-editor/helix/pull/2859))
+- Add `Rakefile` and `Gemfile` to Ruby file-types ([#2875](https://github.com/helix-editor/helix/pull/2875))
+- Erlang ([#2910](https://github.com/helix-editor/helix/pull/2910), [ac669ad](https://github.com/helix-editor/helix/commit/ac669ad))
+- Markdown ([#2910](https://github.com/helix-editor/helix/pull/2910), [#3108](https://github.com/helix-editor/helix/pull/3108), [#3400](https://github.com/helix-editor/helix/pull/3400))
+- Bash ([#2910](https://github.com/helix-editor/helix/pull/2910))
+- Rust ([#2910](https://github.com/helix-editor/helix/pull/2910), [#3397](https://github.com/helix-editor/helix/pull/3397))
+- Edoc ([#2910](https://github.com/helix-editor/helix/pull/2910))
+- HTML ([#2910](https://github.com/helix-editor/helix/pull/2910))
+- Make ([#2910](https://github.com/helix-editor/helix/pull/2910))
+- TSQ ([#2910](https://github.com/helix-editor/helix/pull/2910), [#2960](https://github.com/helix-editor/helix/pull/2960))
+- git-commit ([#2910](https://github.com/helix-editor/helix/pull/2910))
+- Use default fallback for Python indents ([9ae70cc](https://github.com/helix-editor/helix/commit/9ae70cc))
+- Add Haskell LSP roots ([#2954](https://github.com/helix-editor/helix/pull/2954))
+- Ledger ([#2936](https://github.com/helix-editor/helix/pull/2936), [#2988](https://github.com/helix-editor/helix/pull/2988))
+- Nickel ([#2987](https://github.com/helix-editor/helix/pull/2987))
+- JavaScript/TypeScript ([#2961](https://github.com/helix-editor/helix/pull/2961), [#3219](https://github.com/helix-editor/helix/pull/3219), [#3213](https://github.com/helix-editor/helix/pull/3213), [#3280](https://github.com/helix-editor/helix/pull/3280), [#3301](https://github.com/helix-editor/helix/pull/3301))
+- GLSL ([#3051](https://github.com/helix-editor/helix/pull/3051))
+- Fix locals tracking in Rust ([#3027](https://github.com/helix-editor/helix/pull/3027), [#3212](https://github.com/helix-editor/helix/pull/3212), [#3345](https://github.com/helix-editor/helix/pull/3345))
+- Verilog ([#3158](https://github.com/helix-editor/helix/pull/3158))
+- Ruby ([#3173](https://github.com/helix-editor/helix/pull/3173), [#3527](https://github.com/helix-editor/helix/pull/3527))
+- Svelte ([#3147](https://github.com/helix-editor/helix/pull/3147))
+- Add Elixir and HEEx comment textobjects ([#3179](https://github.com/helix-editor/helix/pull/3179))
+- Python ([#3103](https://github.com/helix-editor/helix/pull/3103), [#3201](https://github.com/helix-editor/helix/pull/3201), [#3284](https://github.com/helix-editor/helix/pull/3284))
+- PHP ([#3317](https://github.com/helix-editor/helix/pull/3317))
+- Latex ([#3370](https://github.com/helix-editor/helix/pull/3370))
+- Clojure ([#3387](https://github.com/helix-editor/helix/pull/3387))
+- Swift ([#3461](https://github.com/helix-editor/helix/pull/3461))
+- C# ([#3480](https://github.com/helix-editor/helix/pull/3480), [#3494](https://github.com/helix-editor/helix/pull/3494))
+- Org ([#3489](https://github.com/helix-editor/helix/pull/3489))
+- Elm ([#3497](https://github.com/helix-editor/helix/pull/3497))
+- Dart ([#3419](https://github.com/helix-editor/helix/pull/3419))
+- Julia ([#3507](https://github.com/helix-editor/helix/pull/3507))
+- Fix Rust textobjects ([#3590](https://github.com/helix-editor/helix/pull/3590))
+- C ([00d88e5](https://github.com/helix-editor/helix/commit/00d88e5))
+- Update Rust ([0ef0ef9](https://github.com/helix-editor/helix/commit/0ef0ef9))
+
+Packaging:
+
+- Add `rust-analyzer` to Nix flake devShell ([#2739](https://github.com/helix-editor/helix/pull/2739))
+- Add cachix information to the Nix flake ([#2999](https://github.com/helix-editor/helix/pull/2999))
+- Pass makeWrapperArgs to wrapProgram in the Nix flake ([#3003](https://github.com/helix-editor/helix/pull/3003))
+- Add a way to override which grammars are built by Nix ([#3141](https://github.com/helix-editor/helix/pull/3141))
+- Add a GitHub actions release for `aarch64-macos` ([#3137](https://github.com/helix-editor/helix/pull/3137))
+- Add shell auto-completions for Elvish ([#3331](https://github.com/helix-editor/helix/pull/3331))
+
 # 22.05 (2022-05-28)
 
 An even bigger shout out than usual to all the contributors - we had a whopping

From ee94031fc48ca0a4437c543221266a38e8e1ff87 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 31 Aug 2022 11:43:51 -0500
Subject: [PATCH 045/884] Bump VERSION to 22.08

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index bb7635c7..dea5911d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-22.05
\ No newline at end of file
+22.08
\ No newline at end of file

From 1cbf5525540531f26cd6bd765de93b20d96078f5 Mon Sep 17 00:00:00 2001
From: Saber Haj Rabiee <sabify@users.noreply.github.com>
Date: Wed, 31 Aug 2022 18:29:15 -0700
Subject: [PATCH 046/884] fix: prevents storing last prompt if is top of stack
 (#3609)

---
 helix-term/src/commands.rs  |  2 +-
 helix-term/src/ui/prompt.rs | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 41960d35..cd92c42d 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1977,7 +1977,7 @@ fn extend_line_impl(cx: &mut Context, extend: Extend) {
         let end = text.line_to_char(
             match extend {
                 Extend::Above => end_line + 1, // the start of next line
-                Extend::Below => (end_line + count),
+                Extend::Below => end_line + count,
             }
             .min(text.len_lines()),
         );
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 1b2c35e9..24fc8233 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -533,18 +533,24 @@ impl Component for Prompt {
                 if self.selection.is_some() && self.line.ends_with(std::path::MAIN_SEPARATOR) {
                     self.recalculate_completion(cx.editor);
                 } else {
+                    let last_item = self
+                        .history_register
+                        .and_then(|reg| cx.editor.registers.last(reg).cloned())
+                        .map(|entry| entry.into())
+                        .unwrap_or_else(|| Cow::from(""));
+
                     // handle executing with last command in history if nothing entered
                     let input: Cow<str> = if self.line.is_empty() {
-                        // latest value in the register list
-                        self.history_register
-                            .and_then(|reg| cx.editor.registers.last(reg).cloned())
-                            .map(|entry| entry.into())
-                            .unwrap_or_else(|| Cow::from(""))
+                        last_item
                     } else {
-                        if let Some(register) = self.history_register {
+                        if last_item != self.line {
                             // store in history
-                            let register = cx.editor.registers.get_mut(register);
-                            register.push(self.line.clone());
+                            if let Some(register) = self.history_register {
+                                cx.editor
+                                    .registers
+                                    .get_mut(register)
+                                    .push(self.line.clone());
+                            };
                         }
 
                         self.line.as_str().into()

From 10d9355b340f65ba534c66772e9d930188ed0a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Thu, 1 Sep 2022 16:00:19 +0900
Subject: [PATCH 047/884] Update deps

---
 Cargo.lock | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dd3ec09f..b2225f88 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -22,9 +22,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.62"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1485d4d2cc45e7b201ee3767015c96faa5904387c9d87c6efdd0fb511f12d305"
+checksum = "a26fa4d7e3f2eebadf743988fc8aec9fa9a9e82611acafd77c1462ed6262440a"
 
 [[package]]
 name = "arc-swap"
@@ -57,9 +57,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.10.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
+checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
 
 [[package]]
 name = "bytecount"
@@ -199,9 +199,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be"
+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
 
 [[package]]
 name = "encoding_rs"
@@ -629,9 +629,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.127"
+version = "0.2.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "505e71a4706fa491e9b1b55f51b95d4037d0821ee40131190475f692b35b009b"
+checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
 
 [[package]]
 name = "libloading"
@@ -645,9 +645,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
+checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -689,9 +689,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "memmap2"
-version = "0.5.5"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a79b39c93a7a5a27eeaf9a23b5ff43f1b9e0ad6b1cdd441140ae53c35613fc7"
+checksum = "95af15f345b17af2efc8ead6080fb8bc376f8cec1b35277b935637595fe77498"
 dependencies = [
  "libc",
 ]
@@ -1062,9 +1062,9 @@ checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043"
 
 [[package]]
 name = "socket2"
-version = "0.4.4"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
 dependencies = [
  "libc",
  "winapi",
@@ -1126,18 +1126,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.32"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994"
+checksum = "3d0a539a918745651435ac7db7a18761589a94cd7e94cd56999f828bf73c8a57"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.32"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21"
+checksum = "c251e90f708e16c49a16f4917dc2131e75222b72edfa9cb7f7c58ae56aae0c09"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1388,13 +1388,13 @@ checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
 
 [[package]]
 name = "which"
-version = "4.2.5"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae"
+checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
 dependencies = [
  "either",
- "lazy_static",
  "libc",
+ "once_cell",
 ]
 
 [[package]]

From 5c2b77b41fadd0e65e02455d36d8509f622bc520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Thu, 1 Sep 2022 16:14:38 +0900
Subject: [PATCH 048/884] Make mode editor-wide rather than per-document

---
 helix-term/src/commands.rs      | 68 ++++++++++++++++-----------------
 helix-term/src/ui/editor.rs     | 32 ++++++++--------
 helix-term/src/ui/statusline.rs |  4 +-
 helix-view/src/document.rs      |  9 -----
 helix-view/src/editor.rs        | 16 +++++---
 helix-view/src/gutter.rs        |  2 +-
 6 files changed, 62 insertions(+), 69 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index cd92c42d..906f201a 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -586,7 +586,7 @@ fn goto_line_end(cx: &mut Context) {
     goto_line_end_impl(
         view,
         doc,
-        if doc.mode == Mode::Select {
+        if cx.editor.mode == Mode::Select {
             Movement::Extend
         } else {
             Movement::Move
@@ -616,7 +616,7 @@ fn goto_line_end_newline(cx: &mut Context) {
     goto_line_end_newline_impl(
         view,
         doc,
-        if doc.mode == Mode::Select {
+        if cx.editor.mode == Mode::Select {
             Movement::Extend
         } else {
             Movement::Move
@@ -647,7 +647,7 @@ fn goto_line_start(cx: &mut Context) {
     goto_line_start_impl(
         view,
         doc,
-        if doc.mode == Mode::Select {
+        if cx.editor.mode == Mode::Select {
             Movement::Extend
         } else {
             Movement::Move
@@ -752,7 +752,7 @@ fn goto_first_nonwhitespace(cx: &mut Context) {
 
         if let Some(pos) = find_first_non_whitespace_char(text.line(line)) {
             let pos = pos + text.line_to_char(line);
-            range.put_cursor(text, pos, doc.mode == Mode::Select)
+            range.put_cursor(text, pos, cx.editor.mode == Mode::Select)
         } else {
             range
         }
@@ -952,7 +952,7 @@ where
     let motion = move |editor: &mut Editor| {
         let (view, doc) = current!(editor);
         let text = doc.text().slice(..);
-        let behavior = if doc.mode == Mode::Select {
+        let behavior = if editor.mode == Mode::Select {
             Movement::Extend
         } else {
             Movement::Move
@@ -985,7 +985,7 @@ fn goto_file_start(cx: &mut Context) {
         let selection = doc
             .selection(view.id)
             .clone()
-            .transform(|range| range.put_cursor(text, 0, doc.mode == Mode::Select));
+            .transform(|range| range.put_cursor(text, 0, cx.editor.mode == Mode::Select));
         push_jump(view, doc);
         doc.set_selection(view.id, selection);
     }
@@ -998,7 +998,7 @@ fn goto_file_end(cx: &mut Context) {
     let selection = doc
         .selection(view.id)
         .clone()
-        .transform(|range| range.put_cursor(text, pos, doc.mode == Mode::Select));
+        .transform(|range| range.put_cursor(text, pos, cx.editor.mode == Mode::Select));
     push_jump(view, doc);
     doc.set_selection(view.id, selection);
 }
@@ -1375,7 +1375,7 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction) {
     if line != cursor.row {
         let head = pos_at_coords(text, Position::new(line, cursor.col), true); // this func will properly truncate to line end
 
-        let anchor = if doc.mode == Mode::Select {
+        let anchor = if cx.editor.mode == Mode::Select {
             range.anchor
         } else {
             head
@@ -2098,7 +2098,7 @@ fn delete_selection_impl(cx: &mut Context, op: Operation) {
             exit_select_mode(cx);
         }
         Operation::Change => {
-            enter_insert_mode(doc);
+            enter_insert_mode(cx);
         }
     }
 }
@@ -2167,14 +2167,14 @@ fn ensure_selections_forward(cx: &mut Context) {
     doc.set_selection(view.id, selection);
 }
 
-fn enter_insert_mode(doc: &mut Document) {
-    doc.mode = Mode::Insert;
+fn enter_insert_mode(cx: &mut Context) {
+    cx.editor.mode = Mode::Insert;
 }
 
 // inserts at the start of each selection
 fn insert_mode(cx: &mut Context) {
+    enter_insert_mode(cx);
     let (view, doc) = current!(cx.editor);
-    enter_insert_mode(doc);
 
     log::trace!(
         "entering insert mode with sel: {:?}, text: {:?}",
@@ -2192,8 +2192,8 @@ fn insert_mode(cx: &mut Context) {
 
 // inserts at the end of each selection
 fn append_mode(cx: &mut Context) {
+    enter_insert_mode(cx);
     let (view, doc) = current!(cx.editor);
-    enter_insert_mode(doc);
     doc.restore_cursor = true;
     let text = doc.text().slice(..);
 
@@ -2421,9 +2421,9 @@ impl ui::menu::Item for MappableCommand {
 pub fn command_palette(cx: &mut Context) {
     cx.callback = Some(Box::new(
         move |compositor: &mut Compositor, cx: &mut compositor::Context| {
-            let doc = doc_mut!(cx.editor);
-            let keymap =
-                compositor.find::<ui::EditorView>().unwrap().keymaps.map()[&doc.mode].reverse_map();
+            let keymap = compositor.find::<ui::EditorView>().unwrap().keymaps.map()
+                [&cx.editor.mode]
+                .reverse_map();
 
             let mut commands: Vec<MappableCommand> = MappableCommand::STATIC_COMMAND_LIST.into();
             commands.extend(typed::TYPABLE_COMMAND_LIST.iter().map(|cmd| {
@@ -2464,14 +2464,13 @@ fn last_picker(cx: &mut Context) {
 // I inserts at the first nonwhitespace character of each line with a selection
 fn prepend_to_line(cx: &mut Context) {
     goto_first_nonwhitespace(cx);
-    let doc = doc_mut!(cx.editor);
-    enter_insert_mode(doc);
+    enter_insert_mode(cx);
 }
 
 // A inserts at the end of each line with a selection
 fn append_to_line(cx: &mut Context) {
+    enter_insert_mode(cx);
     let (view, doc) = current!(cx.editor);
-    enter_insert_mode(doc);
 
     let selection = doc.selection(view.id).clone().transform(|range| {
         let text = doc.text().slice(..);
@@ -2527,8 +2526,8 @@ pub enum Open {
 
 fn open(cx: &mut Context, open: Open) {
     let count = cx.count();
+    enter_insert_mode(cx);
     let (view, doc) = current!(cx.editor);
-    enter_insert_mode(doc);
 
     let text = doc.text().slice(..);
     let contents = doc.text();
@@ -2606,13 +2605,12 @@ fn open_above(cx: &mut Context) {
 }
 
 fn normal_mode(cx: &mut Context) {
-    let (view, doc) = current!(cx.editor);
-
-    if doc.mode == Mode::Normal {
+    if cx.editor.mode == Mode::Normal {
         return;
     }
 
-    doc.mode = Mode::Normal;
+    cx.editor.mode = Mode::Normal;
+    let (view, doc) = current!(cx.editor);
 
     try_restore_indent(doc, view.id);
 
@@ -2690,7 +2688,7 @@ fn goto_line_impl(editor: &mut Editor, count: Option<NonZeroUsize>) {
         let selection = doc
             .selection(view.id)
             .clone()
-            .transform(|range| range.put_cursor(text, pos, doc.mode == Mode::Select));
+            .transform(|range| range.put_cursor(text, pos, editor.mode == Mode::Select));
 
         push_jump(view, doc);
         doc.set_selection(view.id, selection);
@@ -2710,7 +2708,7 @@ fn goto_last_line(cx: &mut Context) {
     let selection = doc
         .selection(view.id)
         .clone()
-        .transform(|range| range.put_cursor(text, pos, doc.mode == Mode::Select));
+        .transform(|range| range.put_cursor(text, pos, cx.editor.mode == Mode::Select));
 
     push_jump(view, doc);
     doc.set_selection(view.id, selection);
@@ -2733,7 +2731,7 @@ fn goto_last_modification(cx: &mut Context) {
         let selection = doc
             .selection(view.id)
             .clone()
-            .transform(|range| range.put_cursor(text, pos, doc.mode == Mode::Select));
+            .transform(|range| range.put_cursor(text, pos, cx.editor.mode == Mode::Select));
         doc.set_selection(view.id, selection);
     }
 }
@@ -2770,13 +2768,12 @@ fn select_mode(cx: &mut Context) {
     });
     doc.set_selection(view.id, selection);
 
-    doc_mut!(cx.editor).mode = Mode::Select;
+    cx.editor.mode = Mode::Select;
 }
 
 fn exit_select_mode(cx: &mut Context) {
-    let doc = doc_mut!(cx.editor);
-    if doc.mode == Mode::Select {
-        doc.mode = Mode::Normal;
+    if cx.editor.mode == Mode::Select {
+        cx.editor.mode = Mode::Normal;
     }
 }
 
@@ -3439,11 +3436,11 @@ fn paste_impl(values: &[String], doc: &mut Document, view: &View, action: Paste,
 
 pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {
     let count = cx.count();
-    let (view, doc) = current!(cx.editor);
-    let paste = match doc.mode {
+    let paste = match cx.editor.mode {
         Mode::Insert | Mode::Select => Paste::Cursor,
         Mode::Normal => Paste::Before,
     };
+    let (view, doc) = current!(cx.editor);
     paste_impl(&[contents], doc, view, paste, count);
 }
 
@@ -3838,8 +3835,7 @@ pub fn completion(cx: &mut Context) {
     cx.callback(
         future,
         move |editor, compositor, response: Option<lsp::CompletionResponse>| {
-            let doc = doc!(editor);
-            if doc.mode() != Mode::Insert {
+            if editor.mode != Mode::Insert {
                 // we're not in insert mode anymore
                 return;
             }
@@ -4046,7 +4042,7 @@ fn match_brackets(cx: &mut Context) {
             if let Some(pos) =
                 match_brackets::find_matching_bracket_fuzzy(syntax, doc.text(), range.cursor(text))
             {
-                range.put_cursor(text, pos, doc.mode == Mode::Select)
+                range.put_cursor(text, pos, cx.editor.mode == Mode::Select)
             } else {
                 range
             }
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index f4e2d13e..539e164c 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -122,7 +122,13 @@ impl EditorView {
         let highlights: Box<dyn Iterator<Item = HighlightEvent>> = if is_focused {
             Box::new(syntax::merge(
                 highlights,
-                Self::doc_selection_highlights(doc, view, theme, &editor.config().cursor_shape),
+                Self::doc_selection_highlights(
+                    editor.mode(),
+                    doc,
+                    view,
+                    theme,
+                    &editor.config().cursor_shape,
+                ),
             ))
         } else {
             Box::new(highlights)
@@ -297,6 +303,7 @@ impl EditorView {
 
     /// Get highlight spans for selections in a document view.
     pub fn doc_selection_highlights(
+        mode: Mode,
         doc: &Document,
         view: &View,
         theme: &Theme,
@@ -306,7 +313,6 @@ impl EditorView {
         let selection = doc.selection(view.id);
         let primary_idx = selection.primary_index();
 
-        let mode = doc.mode();
         let cursorkind = cursor_shape_config.from_mode(mode);
         let cursor_is_block = cursorkind == CursorKind::Block;
 
@@ -775,17 +781,9 @@ impl EditorView {
         let key_result = self.keymaps.get(mode, event);
         cxt.editor.autoinfo = self.keymaps.sticky().map(|node| node.infobox());
 
-        // Track the currently open doc
-        let view = view!(cxt.editor);
-        let doc_id = view.doc;
-
         let mut execute_command = |command: &commands::MappableCommand| {
             command.execute(cxt);
-            let doc = match cxt.editor.documents.get(&doc_id) {
-                Some(doc) => doc,
-                None => return,
-            };
-            let current_mode = doc.mode();
+            let current_mode = cxt.editor.mode();
             match (last_mode, current_mode) {
                 (Mode::Normal, Mode::Insert) => {
                     // HAXX: if we just entered insert mode from normal, clear key buf
@@ -956,8 +954,8 @@ impl EditorView {
 
     pub fn handle_idle_timeout(&mut self, cx: &mut crate::compositor::Context) -> EventResult {
         if self.completion.is_some()
+            || cx.editor.mode != Mode::Insert
             || !cx.editor.config().auto_completion
-            || doc!(cx.editor).mode != Mode::Insert
         {
             return EventResult::Ignored(None);
         }
@@ -1177,12 +1175,13 @@ impl Component for EditorView {
                 cx.editor.count = None;
 
                 let config = cx.editor.config();
+                let mode = cx.editor.mode();
                 let (view, doc) = current!(cx.editor);
                 view.ensure_cursor_in_view(doc, config.scrolloff);
 
                 // Store a history state if not in insert mode. Otherwise wait till we exit insert
                 // to include any edits to the paste in the history state.
-                if doc.mode() != Mode::Insert {
+                if mode != Mode::Insert {
                     doc.append_changes_to_history(view.id);
                 }
 
@@ -1200,9 +1199,9 @@ impl Component for EditorView {
                 // clear status
                 cx.editor.status_msg = None;
 
-                let (view, doc) = current!(cx.editor);
+                let mode = cx.editor.mode();
+                let (view, _) = current!(cx.editor);
                 let focus = view.id;
-                let mode = doc.mode();
 
                 if let Some(on_next_key) = self.on_next_key.take() {
                     // if there's a command waiting input, do that first
@@ -1265,6 +1264,7 @@ impl Component for EditorView {
                     return EventResult::Ignored(None);
                 }
                 let config = cx.editor.config();
+                let mode = cx.editor.mode();
                 let view = cx.editor.tree.get_mut(focus);
                 let doc = cx.editor.documents.get_mut(&view.doc).unwrap();
 
@@ -1272,7 +1272,7 @@ impl Component for EditorView {
 
                 // Store a history state if not in insert mode. This also takes care of
                 // committing changes when leaving insert mode.
-                if doc.mode() != Mode::Insert {
+                if mode != Mode::Insert {
                     doc.append_changes_to_history(view.id);
                 }
 
diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index b2836f50..365e1ca9 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -160,7 +160,7 @@ where
         format!(
             " {} ",
             if visible {
-                match context.doc.mode() {
+                match context.editor.mode() {
                     Mode::Insert => "INS",
                     Mode::Select => "SEL",
                     Mode::Normal => "NOR",
@@ -171,7 +171,7 @@ where
             }
         ),
         if visible && context.editor.config().color_modes {
-            match context.doc.mode() {
+            match context.editor.mode() {
                 Mode::Insert => Some(context.editor.theme.get("ui.statusline.insert")),
                 Mode::Select => Some(context.editor.theme.get("ui.statusline.select")),
                 Mode::Normal => Some(context.editor.theme.get("ui.statusline.normal")),
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index b2a66415..3c406f8b 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -90,8 +90,6 @@ pub struct Document {
     path: Option<PathBuf>,
     encoding: &'static encoding::Encoding,
 
-    /// Current editing mode.
-    pub mode: Mode,
     pub restore_cursor: bool,
 
     /// Current indent style.
@@ -133,7 +131,6 @@ impl fmt::Debug for Document {
             .field("selections", &self.selections)
             .field("path", &self.path)
             .field("encoding", &self.encoding)
-            .field("mode", &self.mode)
             .field("restore_cursor", &self.restore_cursor)
             .field("syntax", &self.syntax)
             .field("language", &self.language)
@@ -349,7 +346,6 @@ impl Document {
             selections: HashMap::default(),
             indent_style: DEFAULT_INDENT,
             line_ending: DEFAULT_LINE_ENDING,
-            mode: Mode::Normal,
             restore_cursor: false,
             syntax: None,
             language: None,
@@ -925,11 +921,6 @@ impl Document {
         self.last_saved_revision = current_revision;
     }
 
-    /// Current editing mode for the [`Document`].
-    pub fn mode(&self) -> Mode {
-        self.mode
-    }
-
     /// Corresponding language scope name. Usually `source.<lang>`.
     pub fn language_scope(&self) -> Option<&str> {
         self.language
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 0bf7ebd0..ed1813b3 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -595,6 +595,8 @@ pub struct Breakpoint {
 }
 
 pub struct Editor {
+    /// Current editing mode.
+    pub mode: Mode,
     pub tree: Tree,
     pub next_document_id: DocumentId,
     pub documents: BTreeMap<DocumentId, Document>,
@@ -677,6 +679,7 @@ impl Editor {
         area.height -= 1;
 
         Self {
+            mode: Mode::Normal,
             tree: Tree::new(area),
             next_document_id: DocumentId::default(),
             documents: BTreeMap::new(),
@@ -708,6 +711,11 @@ impl Editor {
         }
     }
 
+    /// Current editing mode for the [`Editor`].
+    pub fn mode(&self) -> Mode {
+        self.mode
+    }
+
     pub fn config(&self) -> DynGuard<Config> {
         self.config.load()
     }
@@ -1103,8 +1111,7 @@ impl Editor {
 
         // if leaving the view: mode should reset
         if prev_id != view_id {
-            let doc_id = self.tree.get(prev_id).doc;
-            self.documents.get_mut(&doc_id).unwrap().mode = Mode::Normal;
+            self.mode = Mode::Normal;
         }
     }
 
@@ -1115,8 +1122,7 @@ impl Editor {
 
         // if leaving the view: mode should reset
         if prev_id != id {
-            let doc_id = self.tree.get(prev_id).doc;
-            self.documents.get_mut(&doc_id).unwrap().mode = Mode::Normal;
+            self.mode = Mode::Normal;
         }
     }
 
@@ -1187,7 +1193,7 @@ impl Editor {
             let inner = view.inner_area();
             pos.col += inner.x as usize;
             pos.row += inner.y as usize;
-            let cursorkind = config.cursor_shape.from_mode(doc.mode());
+            let cursorkind = config.cursor_shape.from_mode(self.mode);
             (Some(pos), cursorkind)
         } else {
             (None, CursorKind::default())
diff --git a/helix-view/src/gutter.rs b/helix-view/src/gutter.rs
index 8f7c3062..ab0e2986 100644
--- a/helix-view/src/gutter.rs
+++ b/helix-view/src/gutter.rs
@@ -72,7 +72,7 @@ pub fn line_numbers<'doc>(
         .char_to_line(doc.selection(view.id).primary().cursor(text));
 
     let line_number = editor.config().line_number;
-    let mode = doc.mode;
+    let mode = editor.mode;
 
     Box::new(move |line: usize, selected: bool, out: &mut String| {
         if line == last_line && !draw_last {

From 04e1cbe33f5197719f1b6da09e74e81014403145 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Thu, 1 Sep 2022 05:41:15 -0700
Subject: [PATCH 049/884] fix: typo in tutor about searching compared to vim
 (#3625)

---
 runtime/tutor.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/tutor.txt b/runtime/tutor.txt
index 66d5389f..fe7b15d2 100644
--- a/runtime/tutor.txt
+++ b/runtime/tutor.txt
@@ -453,7 +453,7 @@ _________________________________________________________________
  Like the select command, searching also uses regex.
 
  Note: To search backwards, type ? (shift-/).
- Note: Unlike Vim, N doesn't change the search direction.
+ Note: Unlike Vim, ? doesn't change the search direction.
        N always goes backwards and n always goes forwards.
 
 

From ec28b2b5ccf162e9df550e59a28e043d51796621 Mon Sep 17 00:00:00 2001
From: Fanda Vacek <fanda.vacek@gmail.com>
Date: Thu, 1 Sep 2022 14:45:22 +0200
Subject: [PATCH 050/884] Change MonokaiProSpectrum theme error background from
 red to magenta. (#3627)

Co-authored-by: Fanda Vacek <fvacek@elektroline.cz>
---
 runtime/themes/monokai_pro_spectrum.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/themes/monokai_pro_spectrum.toml b/runtime/themes/monokai_pro_spectrum.toml
index 137571ed..a42a2681 100644
--- a/runtime/themes/monokai_pro_spectrum.toml
+++ b/runtime/themes/monokai_pro_spectrum.toml
@@ -65,7 +65,7 @@
 "variable.parameter" = "#f59762"
 
 # error
-"error" = { bg = "red", fg = "yellow" }
+"error" = { bg = "magenta", fg = "yellow" }
 
 # annotations, decorators
 "special" = "#f59762"

From 45dbcb67832e31ca5eea936628f34f5dc26c4381 Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Thu, 1 Sep 2022 19:59:39 +0300
Subject: [PATCH 051/884] Fix closing buffer with custom keymap (#3633)

* Fix closing buffer with custom keymap

* Add comment explaining if
---
 helix-term/src/ui/editor.rs | 25 ++++++++++++++-----------
 helix-view/src/tree.rs      | 17 +++++++++++++++++
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 539e164c..fa437a7e 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1263,17 +1263,20 @@ impl Component for EditorView {
                 if cx.editor.should_close() {
                     return EventResult::Ignored(None);
                 }
-                let config = cx.editor.config();
-                let mode = cx.editor.mode();
-                let view = cx.editor.tree.get_mut(focus);
-                let doc = cx.editor.documents.get_mut(&view.doc).unwrap();
-
-                view.ensure_cursor_in_view(doc, config.scrolloff);
-
-                // Store a history state if not in insert mode. This also takes care of
-                // committing changes when leaving insert mode.
-                if mode != Mode::Insert {
-                    doc.append_changes_to_history(view.id);
+                // if the focused view still exists and wasn't closed
+                if cx.editor.tree.contains(focus) {
+                    let config = cx.editor.config();
+                    let mode = cx.editor.mode();
+                    let view = cx.editor.tree.get_mut(focus);
+                    let doc = cx.editor.documents.get_mut(&view.doc).unwrap();
+
+                    view.ensure_cursor_in_view(doc, config.scrolloff);
+
+                    // Store a history state if not in insert mode. This also takes care of
+                    // committing changes when leaving insert mode.
+                    if mode != Mode::Insert {
+                        doc.append_changes_to_history(view.id);
+                    }
                 }
 
                 EventResult::Consumed(callback)
diff --git a/helix-view/src/tree.rs b/helix-view/src/tree.rs
index eaf1dbd2..72f6af57 100644
--- a/helix-view/src/tree.rs
+++ b/helix-view/src/tree.rs
@@ -270,10 +270,18 @@ impl Tree {
             })
     }
 
+    /// Get reference to a [`view`] by index.
+    /// # Panics
+    ///
+    /// Panics if `index` is not in self.nodes, or if the node's content is not [`Content::View`] . This can be checked with [`contains`]
     pub fn get(&self, index: ViewId) -> &View {
         self.try_get(index).unwrap()
     }
 
+    /// Try to get reference to a [`view`] by index. Returns `None` if node content is not a [`Content::View`]
+    /// # Panics
+    ///
+    /// Panics if `index` is not in self.nodes. This can be checked with [`Self::contains`]
     pub fn try_get(&self, index: ViewId) -> Option<&View> {
         match &self.nodes[index] {
             Node {
@@ -284,6 +292,10 @@ impl Tree {
         }
     }
 
+    /// Get a mutable reference to a [`view`] by index.
+    /// # Panics
+    ///
+    /// Panics if `index` is not in self.nodes, or if the node's content is not [`Content::View`] . This can be checked with [`Self::contains`]
     pub fn get_mut(&mut self, index: ViewId) -> &mut View {
         match &mut self.nodes[index] {
             Node {
@@ -294,6 +306,11 @@ impl Tree {
         }
     }
 
+    /// Check if tree contains a [`Node`] with a given index.
+    pub fn contains(&self, index: ViewId) -> bool {
+        self.nodes.contains_key(index)
+    }
+
     pub fn is_empty(&self) -> bool {
         match &self.nodes[self.root] {
             Node {

From 66276ce630cead06c84394768927fe20490d0638 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 1 Sep 2022 12:07:46 -0500
Subject: [PATCH 052/884] Changelog notes for 22.08.1 (#3639)

---
 CHANGELOG.md | 6 +++++-
 VERSION      | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 112bf211..73d37a57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,8 @@
-# 22.08 (2022-08-02)
+# 22.08.1 (2022-09-01)
+
+This is a patch release that fixes a panic caused by closing splits or buffers. ([#3633](https://github.com/helix-editor/helix/pull/3633))
+
+# 22.08 (2022-08-31)
 
 A big _thank you_ to our contributors! This release had 87 contributors.
 
diff --git a/VERSION b/VERSION
index dea5911d..b9ed4c22 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-22.08
\ No newline at end of file
+22.08.1
\ No newline at end of file

From 04a4033b6c46e072eebb8b8bf1ec1745022d482d Mon Sep 17 00:00:00 2001
From: Bertrand Bousquet <b.kamek@gmail.com>
Date: Fri, 2 Sep 2022 00:57:37 +0000
Subject: [PATCH 053/884] theme: Add Varua color scheme (#3610)

---
 runtime/themes/varua.toml | 96 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 runtime/themes/varua.toml

diff --git a/runtime/themes/varua.toml b/runtime/themes/varua.toml
new file mode 100644
index 00000000..63c85887
--- /dev/null
+++ b/runtime/themes/varua.toml
@@ -0,0 +1,96 @@
+# Varua: an easy on the eyes color palette based on Gruvbox Material and Everforest by sainnhe.
+# Author : Kamek <b.kamek@gmail.com>
+
+"constant.character.escape" = "orange"
+"type" = "blue"
+"constant" = "purple"
+"constant.numeric" = "purple"
+"string" = "green"
+"comment" = "grey0"
+"variable" = "fg"
+"variable.builtin" = "blue"
+"variable.parameter" = "fg"
+"variable.other.member" = "fg"
+"label" = "aqua"
+"punctuation" = "grey2"
+"punctuation.delimiter" = "grey2"
+"punctuation.bracket" = "fg"
+"keyword" = "purple"
+"operator" = "orange"
+"function" = "green"
+"function.builtin" = "blue"
+"function.macro" = "aqua"
+"tag" = "yellow"
+"namespace" = "aqua"
+"attribute" = "aqua"
+"constructor" = "aqua"
+"module" = "blue"
+"special" = "orange"
+
+"markup.heading.marker" = "grey2"
+"markup.heading.1" = { fg = "red", modifiers = ["bold"] }
+"markup.heading.2" = { fg = "orange", modifiers = ["bold"] }
+"markup.heading.3" = { fg = "yellow", modifiers = ["bold"] }
+"markup.heading.4" = { fg = "green", modifiers = ["bold"] }
+"markup.heading.5" = { fg = "blue", modifiers = ["bold"] }
+"markup.heading.6" = { fg = "fg", modifiers = ["bold"] }
+"markup.list" = "red"
+"markup.link.url" = { fg = "blue", modifiers = ["underlined"] }
+"markup.link.text" = "purple"
+"markup.quote" = "grey2"
+"markup.raw" = "green"
+
+"diff.plus" = "green"
+"diff.delta" = "orange"
+"diff.minus" = "red"
+
+"ui.background" = { bg = "bg0" }
+"ui.cursorline.primary" = { bg = "bg2" }
+"ui.cursor" = { fg = "bg0", bg = "fg" }
+"ui.cursor.match" = { fg = "orange", bg = "bg_yellow" }
+"ui.cursor.insert" = { fg = "bg0", bg = "grey1" }
+"ui.cursor.select" = { fg = "bg0", bg = "blue" }
+"ui.linenr" = "grey0"
+"ui.linenr.selected" = "fg"
+"ui.statusline" = { fg = "fg", bg = "bg2" }
+"ui.statusline.inactive" = { fg = "grey0", bg = "bg1" }
+"ui.popup" = { fg = "grey0", bg = "bg2" }
+"ui.window" = { fg = "grey0", bg = "bg1" }
+"ui.help" = { fg = "fg", bg = "bg1" }
+"ui.text" = "fg"
+"ui.text.focus" = "fg"
+"ui.menu" = { fg = "fg", bg = "bg2" }
+"ui.menu.selected" = { fg = "fg", bg = "bg1" }
+"ui.selection" = { bg = "bg3" }
+"ui.virtual.whitespace" = "grey0"
+
+"hint" = "blue"
+"info" = "aqua"
+"warning" = "yellow"
+"error" = "red"
+"diagnostic" = { modifiers = ["underlined"] }
+
+[palette]
+bg0 = "#282828"
+bg1 = "#45403d"
+bg2 = "#32302f"
+bg3 = "#3c3836"
+bg4 = "#4c555b"
+bg5 = "#53605c"
+bg_visual = "#503946"
+bg_red = "#4e3e43"
+bg_green = "#404d44"
+bg_blue = "#394f5a"
+bg_yellow = "#4a4940"
+
+fg = "#dfbf8e"
+red = "#e67e80"
+orange = "#e69875"
+yellow = "#dbbc7f"
+green = "#a7c080"
+aqua = "#83c092"
+blue = "#7fbbb3"
+purple = "#d699b6"
+grey0 = "#928374"
+grey1 = "#859289"
+grey2 = "#9da9a0"

From e8730ca5fd72e3bb275b4d825de40475eabea174 Mon Sep 17 00:00:00 2001
From: aaron404 <54856541+aaron404@users.noreply.github.com>
Date: Thu, 1 Sep 2022 22:39:38 -0400
Subject: [PATCH 054/884] initial implementation of bufferline (#2759)

* initial implementation of bufferline

* fixed lint

* changed to 'bufferline', added enum for config modes, some cleanup

* fixed lint

* added file modification indicator

* removed redundant code, added proper themeing with fallback, changed 'file modified' indicator

* remove commented code

* Update helix-term/src/ui/editor.rs

simplify text and offset computation

Co-authored-by: Gokul Soumya <gokulps15@gmail.com>

* add ui.bufferline.background key for themes

Co-authored-by: lazytanuki <43273245+lazytanuki@users.noreply.github.com>

* address PR comments

* Update helix-term/src/ui/editor.rs

* simplify computation of editor area:

* change to set_stringn to avoid overflow

* Update configuration.md

Updates documentation to reflect decision re: defaulting to never showing bufferline.

* addressed pr comments

* fix build error

* address pr comments

* revert accidental change

Co-authored-by: Gokul Soumya <gokulps15@gmail.com>
Co-authored-by: lazytanuki <43273245+lazytanuki@users.noreply.github.com>
Co-authored-by: Seth Bromberger <sbromberger@users.noreply.github.com>
---
 book/src/configuration.md   |  1 +
 helix-term/src/ui/editor.rs | 78 +++++++++++++++++++++++++++++++++++--
 helix-view/src/editor.rs    | 21 ++++++++++
 3 files changed, 97 insertions(+), 3 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index affd497c..fdabe768 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -49,6 +49,7 @@ You may also specify a file to use for configuration with the `-c` or
 | `auto-info` | Whether to display infoboxes | `true` |
 | `true-color` | Set to `true` to override automatic detection of terminal truecolor support in the event of a false negative. | `false` |
 | `rulers` | List of column positions at which to display the rulers. Can be overridden by language specific `rulers` in `languages.toml` file. | `[]` |
+| `bufferline` | Renders a line at the top of the editor displaying open buffers. Can be `always`, `never` or `multiple` (only shown if more than one buffer is in use) | `never` |
 | `color-modes` | Whether to color the mode indicator with different colors depending on the mode itself | `false` |
 
 ### `[editor.statusline]` Section
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index fa437a7e..d0def9ba 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -16,14 +16,14 @@ use helix_core::{
     LineEnding, Position, Range, Selection, Transaction,
 };
 use helix_view::{
-    document::Mode,
+    document::{Mode, SCRATCH_BUFFER_NAME},
     editor::{CompleteAction, CursorShapeConfig},
     graphics::{Color, CursorKind, Modifier, Rect, Style},
     input::{KeyEvent, MouseButton, MouseEvent, MouseEventKind},
     keyboard::{KeyCode, KeyModifiers},
     Document, Editor, Theme, View,
 };
-use std::borrow::Cow;
+use std::{borrow::Cow, path::PathBuf};
 
 use tui::buffer::Buffer as Surface;
 
@@ -619,6 +619,59 @@ impl EditorView {
         }
     }
 
+    /// Render bufferline at the top
+    pub fn render_bufferline(editor: &Editor, viewport: Rect, surface: &mut Surface) {
+        let scratch = PathBuf::from(SCRATCH_BUFFER_NAME); // default filename to use for scratch buffer
+        surface.clear_with(
+            viewport,
+            editor
+                .theme
+                .try_get("ui.bufferline.background")
+                .unwrap_or_else(|| editor.theme.get("ui.statusline")),
+        );
+
+        let bufferline_active = editor
+            .theme
+            .try_get("ui.bufferline.active")
+            .unwrap_or_else(|| editor.theme.get("ui.statusline.active"));
+
+        let bufferline_inactive = editor
+            .theme
+            .try_get("ui.bufferline")
+            .unwrap_or_else(|| editor.theme.get("ui.statusline.inactive"));
+
+        let mut x = viewport.x;
+        let current_doc = view!(editor).doc;
+
+        for doc in editor.documents() {
+            let fname = doc
+                .path()
+                .unwrap_or(&scratch)
+                .file_name()
+                .unwrap_or_default()
+                .to_str()
+                .unwrap_or_default();
+
+            let style = if current_doc == doc.id() {
+                bufferline_active
+            } else {
+                bufferline_inactive
+            };
+
+            let text = format!(" {}{} ", fname, if doc.is_modified() { "[+]" } else { "" });
+            let used_width = viewport.x.saturating_sub(x);
+            let rem_width = surface.area.width.saturating_sub(used_width);
+
+            x = surface
+                .set_stringn(x, viewport.y, text, rem_width as usize, style)
+                .0;
+
+            if x >= surface.area.right() {
+                break;
+            }
+        }
+    }
+
     pub fn render_gutter(
         editor: &Editor,
         doc: &Document,
@@ -1291,8 +1344,27 @@ impl Component for EditorView {
         // clear with background color
         surface.set_style(area, cx.editor.theme.get("ui.background"));
         let config = cx.editor.config();
+
+        // check if bufferline should be rendered
+        use helix_view::editor::BufferLine;
+        let use_bufferline = match config.bufferline {
+            BufferLine::Always => true,
+            BufferLine::Multiple if cx.editor.documents.len() > 1 => true,
+            _ => false,
+        };
+
+        // -1 for commandline and -1 for bufferline
+        let mut editor_area = area.clip_bottom(1);
+        if use_bufferline {
+            editor_area = editor_area.clip_top(1);
+        }
+
         // if the terminal size suddenly changed, we need to trigger a resize
-        cx.editor.resize(area.clip_bottom(1)); // -1 from bottom for commandline
+        cx.editor.resize(editor_area);
+
+        if use_bufferline {
+            Self::render_bufferline(cx.editor, area.with_height(1), surface);
+        }
 
         for (view, is_focused) in cx.editor.tree.views() {
             let doc = cx.editor.document(view.doc).unwrap();
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index ed1813b3..65e64b16 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -162,6 +162,8 @@ pub struct Config {
     pub rulers: Vec<u16>,
     #[serde(default)]
     pub whitespace: WhitespaceConfig,
+    /// Persistently display open buffers along the top
+    pub bufferline: BufferLine,
     /// Vertical indent width guides.
     pub indent_guides: IndentGuidesConfig,
     /// Whether to color modes with different colors. Defaults to `false`.
@@ -367,6 +369,24 @@ impl Default for CursorShapeConfig {
     }
 }
 
+/// bufferline render modes
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
+pub enum BufferLine {
+    /// Don't render bufferline
+    Never,
+    /// Always render
+    Always,
+    /// Only if multiple buffers are open
+    Multiple,
+}
+
+impl Default for BufferLine {
+    fn default() -> Self {
+        BufferLine::Never
+    }
+}
+
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub enum LineNumber {
@@ -554,6 +574,7 @@ impl Default for Config {
             terminal: get_terminal_provider(),
             rulers: Vec::new(),
             whitespace: WhitespaceConfig::default(),
+            bufferline: BufferLine::default(),
             indent_guides: IndentGuidesConfig::default(),
             color_modes: false,
         }

From 6e5e38c2ba3a99d1827fa53851b88a50055f744a Mon Sep 17 00:00:00 2001
From: voroskoi <60064214+voroskoi@users.noreply.github.com>
Date: Sat, 3 Sep 2022 00:22:07 +0200
Subject: [PATCH 055/884] update zig grammar and highlight rules (#3621)

---
 languages.toml                     |  3 +-
 runtime/queries/zig/highlights.scm | 96 ++++++++++++++----------------
 2 files changed, 46 insertions(+), 53 deletions(-)

diff --git a/languages.toml b/languages.toml
index 05608b81..06921534 100644
--- a/languages.toml
+++ b/languages.toml
@@ -735,10 +735,9 @@ language-server = { command = "zls" }
 indent = { tab-width = 4, unit = "    " }
 formatter = { command = "zig" , args = ["fmt", "--stdin"] }
 
-
 [[grammar]]
 name = "zig"
-source = { git = "https://github.com/maxxnino/tree-sitter-zig", rev = "93331b8bd8b4ebee2b575490b2758f16ad4e9f30" }
+source = { git = "https://github.com/maxxnino/tree-sitter-zig", rev = "8d3224c3bd0890fe08358886ebf54fca2ed448a6" }
 
 [[language]]
 name = "prolog"
diff --git a/runtime/queries/zig/highlights.scm b/runtime/queries/zig/highlights.scm
index 62c99acc..e2e79518 100644
--- a/runtime/queries/zig/highlights.scm
+++ b/runtime/queries/zig/highlights.scm
@@ -1,20 +1,11 @@
 [
   (container_doc_comment)
   (doc_comment)
-  (line_comment)
-] @comment
+] @comment.documentation
 
 [
-  variable: (IDENTIFIER)
-  variable_type_function: (IDENTIFIER)
-] @variable
-
-parameter: (IDENTIFIER) @variable.parameter
-
-[
-  field_member: (IDENTIFIER)
-  field_access: (IDENTIFIER)
-] @variable.other.member
+  (line_comment)
+] @comment.line
 
 ;; assume TitleCase is a type
 (
@@ -25,6 +16,7 @@ parameter: (IDENTIFIER) @variable.parameter
   ] @type
   (#match? @type "^[A-Z]([a-z]+[A-Za-z0-9]*)*$")
 )
+
 ;; assume camelCase is a function
 (
   [
@@ -44,29 +36,33 @@ parameter: (IDENTIFIER) @variable.parameter
   (#match? @constant "^[A-Z][A-Z_0-9]+$")
 )
 
-[
-  function_call: (IDENTIFIER)
-  function: (IDENTIFIER)
-] @function
-
-exception: "!" @function.macro
-
+;; _
 (
   (IDENTIFIER) @variable.builtin
   (#eq? @variable.builtin "_")
 )
 
+;; C Pointers [*c]T
 (PtrTypeStart "c" @variable.builtin)
 
-(
-  (ContainerDeclType
-    [
-      (ErrorUnionExpr)
-      "enum"
-    ]
-  )
-  (ContainerField (IDENTIFIER) @constant)
-)
+[
+  variable: (IDENTIFIER)
+  variable_type_function: (IDENTIFIER)
+] @variable
+
+parameter: (IDENTIFIER) @variable.parameter
+
+[
+  field_member: (IDENTIFIER)
+  field_access: (IDENTIFIER)
+] @variable.other.member
+
+[
+  function_call: (IDENTIFIER)
+  function: (IDENTIFIER)
+] @function
+
+exception: "!" @keyword.control.exception
 
 field_constant: (IDENTIFIER) @constant
 
@@ -89,8 +85,6 @@ field_constant: (IDENTIFIER) @constant
 (FormatSequence) @string.special
 
 [
-  "allowzero"
-  "volatile"
   "anytype"
   "anyframe"
   (BuildinTypeExpr)
@@ -125,44 +119,53 @@ field_constant: (IDENTIFIER) @constant
   "or"
   "and"
   "orelse"
-] @operator
+] @keyword.operator
 
 [
   "struct"
   "enum"
   "union"
-  "error"
   "packed"
   "opaque"
-] @keyword
+  "export"
+  "extern"
+  "linksection"
+] @keyword.storage.type
+
+[
+  "const"
+  "var"
+  "threadlocal"
+  "allowzero"
+  "volatile"
+  "align"
+] @keyword.storage.modifier
 
 [
   "try"
   "error"
   "catch"
-] @function.macro
+] @keyword.control.exception
 
-; VarDecl
 [
-  "threadlocal"
   "fn"
 ] @keyword.function
 
 [
-  "const"
-  "var"
   "test"
+] @keyword
+
+[
   "pub"
   "usingnamespace"
-] @keyword
+] @keyword.control.import
 
 [
   "return"
   "break"
   "continue"
-] @keyword.control
+] @keyword.control.return
 
-; Macro
 [
   "defer"
   "errdefer"
@@ -171,11 +174,8 @@ field_constant: (IDENTIFIER) @constant
   "await"
   "suspend"
   "resume"
-  "export"
-  "extern"
 ] @function.macro
 
-; PrecProc
 [
   "comptime"
   "inline"
@@ -185,11 +185,6 @@ field_constant: (IDENTIFIER) @constant
   "noalias"
 ] @keyword.directive
 
-[
-  "linksection"
-  "align"
-] @function.builtin
-
 [
   (CompareOp)
   (BitwiseOp)
@@ -230,5 +225,4 @@ field_constant: (IDENTIFIER) @constant
   (PtrIndexPayload "|")
 ] @punctuation.bracket
 
-; Error
-(ERROR) @keyword
+(ERROR) @keyword.control.exception

From b3b164f0d5decd02a02d7c3b571749fac47d7005 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Fri, 2 Sep 2022 15:26:42 -0700
Subject: [PATCH 056/884] Highlight SQL in `sqlx::{query,query_as}!()` in Rust
 (#3647)

---
 runtime/queries/rust/injections.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/runtime/queries/rust/injections.scm b/runtime/queries/rust/injections.scm
index 77c70805..704d8494 100644
--- a/runtime/queries/rust/injections.scm
+++ b/runtime/queries/rust/injections.scm
@@ -24,3 +24,30 @@
     name: (identifier) @_new (#eq? @_new "new"))
   arguments: (arguments (raw_string_literal) @injection.content)
   (#set! injection.language "regex"))
+
+; Highlight SQL in `sqlx::query!()`
+(macro_invocation
+  macro: (scoped_identifier
+    path: (identifier) @_sqlx (#eq? @_sqlx "sqlx")
+    name: (identifier) @_query (#eq? @_query "query"))
+  (token_tree
+    ; Only the first argument is SQL
+    .
+    [(string_literal) (raw_string_literal)] @injection.content
+  )
+  (#set! injection.language "sql"))
+
+; Highlight SQL in `sqlx::query_as!()`
+(macro_invocation
+  macro: (scoped_identifier
+    path: (identifier) @_sqlx (#eq? @_sqlx "sqlx")
+    name: (identifier) @_query_as (#eq? @_query_as "query_as"))
+  (token_tree
+    ; Only the second argument is SQL
+    .
+    ; Allow anything as the first argument in case the user has lower case type
+    ; names for some reason
+    (_)
+    [(string_literal) (raw_string_literal)] @injection.content
+  )
+  (#set! injection.language "sql"))

From 3c38fe9c7001a7f447bde06784d01468e0a4ecec Mon Sep 17 00:00:00 2001
From: bootra <91094662+bootradev@users.noreply.github.com>
Date: Fri, 2 Sep 2022 18:34:22 -0400
Subject: [PATCH 057/884] update boo_berry theme for statusline and
 indent-guide (#3653)

---
 runtime/themes/boo_berry.toml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/runtime/themes/boo_berry.toml b/runtime/themes/boo_berry.toml
index a582e87e..da78db90 100644
--- a/runtime/themes/boo_berry.toml
+++ b/runtime/themes/boo_berry.toml
@@ -30,13 +30,16 @@
 "ui.background" = { bg = "berry" }
 "ui.cursor" =  { fg = "berry", bg = "lilac" }
 "ui.cursor.match" = { fg = "berry", bg = "berry_desaturated" }
-"ui.cursor.select" = { fg = "berry", bg = "mint" }
+"ui.cursor.select" = { fg = "berry", bg = "violet" }
 "ui.cursor.insert" = { fg = "berry", bg = "mint" }
 "ui.linenr" = { fg = "berry_desaturated" }
 "ui.linenr.selected" = { fg = "lilac" }
 "ui.cursorline" = { fg = "lilac", bg = "berry_dim" }
 "ui.statusline" = { fg = "lilac", bg = "berry_saturated" }
 "ui.statusline.inactive" = { fg = "berry_desaturated", bg = "berry_saturated" }
+"ui.statusline.normal" = { fg = "berry_saturated", bg = "lilac" }
+"ui.statusline.insert" = { fg = "berry_saturated", bg = "mint" }
+"ui.statusline.select" = { fg = "berry_saturated", bg = "violet" }
 "ui.popup" = { fg = "lilac", bg = "berry_saturated" }
 "ui.window" = { fg = "berry_desaturated", bg = "berry" }
 "ui.help" = { fg = "lilac", bg = "berry_saturated" }
@@ -46,7 +49,8 @@
 "ui.menu.selected" = { fg = "mint", bg = "berry_saturated" }
 "ui.selection" = { bg = "berry_saturated" }
 "ui.virtual.whitespace" = { fg = "berry_desaturated" }
-"ui.virtual.ruler" = { bg ="berry_dim" }
+"ui.virtual.ruler" = { bg = "berry_dim" }
+"ui.virtual.indent-guide" = { fg = "berry_fade" }
 
 "diff.plus" = { fg = "mint" }
 "diff.delta" = { fg = "gold" }
@@ -60,6 +64,7 @@
 
 [palette]
 berry = "#3A2A4D"
+berry_fade = "#5A3D6E"
 berry_dim = "#47345E"
 berry_saturated = "#2B1C3D"
 berry_desaturated = "#886C9C"

From e917a8e0be29aa3f8aaa537e0aa88e6df8ce974e Mon Sep 17 00:00:00 2001
From: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
Date: Sat, 3 Sep 2022 01:54:07 +0300
Subject: [PATCH 058/884] build(nix): update nci, refactor flake, seperate
 wrapping, add source filtering (#3657)

---
 .github/workflows/cachix.yml |   2 +-
 flake.lock                   |  66 +++++-----
 flake.nix                    | 249 ++++++++++++++++++++---------------
 3 files changed, 177 insertions(+), 140 deletions(-)

diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index 113f7fa1..2d37b36a 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -23,4 +23,4 @@ jobs:
         authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
     - name: Build nix flake
-      run: nix build
+      run: nix build -L
diff --git a/flake.lock b/flake.lock
index 4f0841a7..bb8c96a0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "crane": {
       "flake": false,
       "locked": {
-        "lastModified": 1654444508,
-        "narHash": "sha256-4OBvQ4V7jyt7afs6iKUvRzJ1u/9eYnKzVQbeQdiamuY=",
+        "lastModified": 1661875961,
+        "narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "db5482bf225acc3160899124a1df5a617cfa27b5",
+        "rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24",
         "type": "github"
       },
       "original": {
@@ -19,11 +19,11 @@
     "devshell": {
       "flake": false,
       "locked": {
-        "lastModified": 1655976588,
-        "narHash": "sha256-VreHyH6ITkf/1EX/8h15UqhddJnUleb0HgbC3gMkAEQ=",
+        "lastModified": 1660811669,
+        "narHash": "sha256-V6lmsaLNFz41myppL0yxglta92ijkSvpZ+XVygAh+bU=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "899ca4629020592a13a46783587f6e674179d1db",
+        "rev": "c2feacb46ee69949124c835419861143c4016fb5",
         "type": "github"
       },
       "original": {
@@ -35,49 +35,45 @@
     "dream2nix": {
       "inputs": {
         "alejandra": [
-          "nixCargoIntegration",
+          "nci",
           "nixpkgs"
         ],
         "crane": "crane",
         "devshell": [
-          "nixCargoIntegration",
+          "nci",
           "devshell"
         ],
         "flake-utils-pre-commit": [
-          "nixCargoIntegration",
+          "nci",
           "nixpkgs"
         ],
         "gomod2nix": [
-          "nixCargoIntegration",
+          "nci",
           "nixpkgs"
         ],
         "mach-nix": [
-          "nixCargoIntegration",
+          "nci",
           "nixpkgs"
         ],
         "nixpkgs": [
-          "nixCargoIntegration",
-          "nixpkgs"
-        ],
-        "node2nix": [
-          "nixCargoIntegration",
+          "nci",
           "nixpkgs"
         ],
         "poetry2nix": [
-          "nixCargoIntegration",
+          "nci",
           "nixpkgs"
         ],
         "pre-commit-hooks": [
-          "nixCargoIntegration",
+          "nci",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1655975833,
-        "narHash": "sha256-g8sdfuglIZ24oWVbntVzniNTJW+Z3n9DNL9w9Tt+UCE=",
+        "lastModified": 1662083074,
+        "narHash": "sha256-GL4/CLKPYUzkKD1l7oi2XB+vi3z4xGpCVLDdG3tRqvs=",
         "owner": "nix-community",
         "repo": "dream2nix",
-        "rev": "4e75e665ec3a1cddae5266bed0dd72fce0b74a23",
+        "rev": "c6c039fcc6abdf4d828b940b576944a224cf8622",
         "type": "github"
       },
       "original": {
@@ -88,11 +84,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1637014545,
-        "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
+        "lastModified": 1656928814,
+        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
+        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
         "type": "github"
       },
       "original": {
@@ -101,7 +97,7 @@
         "type": "github"
       }
     },
-    "nixCargoIntegration": {
+    "nci": {
       "inputs": {
         "devshell": "devshell",
         "dream2nix": "dream2nix",
@@ -113,11 +109,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1656453541,
-        "narHash": "sha256-ZCPVnS6zJOZJvIlwU3rKR8MBVm6A3F4/0mA7G1lQ3D0=",
+        "lastModified": 1662143940,
+        "narHash": "sha256-3eJfehnZLWJGXylfpAMeLR0Q3sx8pAjGiHBQPqOH9+U=",
         "owner": "yusdacra",
         "repo": "nix-cargo-integration",
-        "rev": "9eb74345b30cd2e536d9dac9d4435d3c475605c7",
+        "rev": "e83f2598aecbe1114783ff9bdae0b85939de35a3",
         "type": "github"
       },
       "original": {
@@ -128,11 +124,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1655624069,
-        "narHash": "sha256-7g1zwTdp35GMTERnSzZMWJ7PG3QdDE8VOX3WsnOkAtM=",
+        "lastModified": 1662019588,
+        "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0d68d7c857fe301d49cdcd56130e0beea4ecd5aa",
+        "rev": "2da64a81275b68fdad38af669afeda43d401e94b",
         "type": "github"
       },
       "original": {
@@ -144,7 +140,7 @@
     },
     "root": {
       "inputs": {
-        "nixCargoIntegration": "nixCargoIntegration",
+        "nci": "nci",
         "nixpkgs": "nixpkgs",
         "rust-overlay": "rust-overlay"
       }
@@ -157,11 +153,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1655779671,
-        "narHash": "sha256-6feeiGa6fb7ZPVHR71uswkmN1701TAJpwYQA8QffmRk=",
+        "lastModified": 1662087605,
+        "narHash": "sha256-Gpf2gp2JenKGf+TylX/YJpttY2bzsnvAMLdLaxoZRyU=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "8159585609a772b041cce6019d5c21d240709244",
+        "rev": "60c2cfaa8b90ed8cebd18b214fac8682dcf222dd",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 7b6f0685..abcb2cb2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,128 +7,169 @@
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nixCargoIntegration = {
+    nci = {
       url = "github:yusdacra/nix-cargo-integration";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.rust-overlay.follows = "rust-overlay";
     };
   };
 
-  outputs = inputs @ {
+  outputs = {
+    self,
     nixpkgs,
-    nixCargoIntegration,
+    nci,
     ...
   }: let
-    outputs = config:
-      nixCargoIntegration.lib.makeOutputs {
-        root = ./.;
-        renameOutputs = {"helix-term" = "helix";};
-        # Set default app to hx (binary is from helix-term release build)
-        # Set default package to helix-term release build
-        defaultOutputs = {
-          app = "hx";
-          package = "helix";
-        };
-        overrides = {
-          cCompiler = common:
-            with common.pkgs;
-              if stdenv.isLinux
-              then gcc
-              else clang;
-          crateOverrides = common: _: {
-            helix-term = prev: let
-              inherit (common) pkgs;
-              mkRootPath = rel:
-                builtins.path {
-                  path = "${common.root}/${rel}";
-                  name = rel;
-                };
-              grammars = pkgs.callPackage ./grammars.nix config;
-              runtimeDir = pkgs.runCommandNoCC "helix-runtime" {} ''
-                mkdir -p $out
-                ln -s ${mkRootPath "runtime"}/* $out
-                rm -r $out/grammars
-                ln -s ${grammars} $out/grammars
-              '';
-              overridedAttrs = {
-                # disable fetching and building of tree-sitter grammars in the helix-term build.rs
-                HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
-                # link languages and theme toml files since helix-term expects them (for tests)
-                preConfigure =
-                  pkgs.lib.concatMapStringsSep
-                  "\n"
-                  (path: "ln -sf ${mkRootPath path} ..")
-                  ["languages.toml" "theme.toml" "base16_theme.toml"];
-                buildInputs = (prev.buildInputs or []) ++ [common.cCompiler.cc.lib];
-                nativeBuildInputs = [pkgs.makeWrapper];
+    lib = nixpkgs.lib;
+    mkRootPath = rel:
+      builtins.path {
+        path = "${toString ./.}/${rel}";
+        name = rel;
+      };
+    outputs = nci.lib.makeOutputs {
+      root = ./.;
+      renameOutputs = {"helix-term" = "helix";};
+      # Set default app to hx (binary is from helix-term release build)
+      # Set default package to helix-term release build
+      defaultOutputs = {
+        app = "hx";
+        package = "helix";
+      };
+      overrides = {
+        cCompiler = common:
+          with common.pkgs;
+            if stdenv.isLinux
+            then gcc
+            else clang;
+        crateOverrides = common: _: {
+          helix-term = prev: {
+            src = builtins.path {
+              name = "helix-source";
+              path = toString ./.;
+              # filter out unneeded stuff that cause rebuilds
+              filter = path: type:
+                lib.all
+                (n: builtins.baseNameOf path != n)
+                [
+                  ".envrc"
+                  ".ignore"
+                  ".github"
+                  "runtime"
+                  "screenshot.png"
+                  "book"
+                  "contrib"
+                  "docs"
+                  "README.md"
+                  "shell.nix"
+                  "default.nix"
+                  "grammars.nix"
+                  "flake.nix"
+                  "flake.lock"
+                ];
+            };
 
-                postFixup = ''
-                  if [ -f "$out/bin/hx" ]; then
-                    wrapProgram "$out/bin/hx" ''${makeWrapperArgs[@]} --set HELIX_RUNTIME "${runtimeDir}"
-                  fi
-                '';
-              };
-            in
-              overridedAttrs
-              // (
-                pkgs.lib.optionalAttrs
-                (config ? makeWrapperArgs)
-                {inherit (config) makeWrapperArgs;}
-              );
-          };
-          shell = common: prev: {
-            packages =
-              prev.packages
-              ++ (
-                with common.pkgs;
-                [lld_13 lldb cargo-flamegraph rust-analyzer] ++
-                (lib.optional (stdenv.isx86_64 && stdenv.isLinux) cargo-tarpaulin)
-              );
-            env =
-              prev.env
-              ++ [
-                {
-                  name = "HELIX_RUNTIME";
-                  eval = "$PWD/runtime";
-                }
-                {
-                  name = "RUST_BACKTRACE";
-                  value = "1";
-                }
-                {
-                  name = "RUSTFLAGS";
-                  value =
-                    if common.pkgs.stdenv.isLinux
-                    then "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment"
-                    else "";
-                }
-              ];
+            # disable fetching and building of tree-sitter grammars in the helix-term build.rs
+            HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
+
+            buildInputs = (prev.buildInputs or []) ++ [common.cCompiler.cc.lib];
+
+            # link languages and theme toml files since helix-term expects them (for tests)
+            preConfigure = ''
+              ${prev.preConfigure or ""}
+              ${
+                lib.concatMapStringsSep
+                "\n"
+                (path: "ln -sf ${mkRootPath path} ..")
+                ["languages.toml" "theme.toml" "base16_theme.toml"]
+              }
+            '';
+
+            meta.mainProgram = "hx";
           };
         };
+        shell = common: prev: {
+          packages =
+            prev.packages
+            ++ (
+              with common.pkgs;
+                [lld_13 lldb cargo-flamegraph rust-analyzer]
+                ++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) cargo-tarpaulin)
+            );
+          env =
+            prev.env
+            ++ [
+              {
+                name = "HELIX_RUNTIME";
+                eval = "$PWD/runtime";
+              }
+              {
+                name = "RUST_BACKTRACE";
+                value = "1";
+              }
+              {
+                name = "RUSTFLAGS";
+                value =
+                  if common.pkgs.stdenv.isLinux
+                  then "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment"
+                  else "";
+              }
+            ];
+        };
       };
-    defaultOutputs = outputs {};
-    makeOverridableHelix = system: old:
-      old
-      // {
-        override = args:
-          makeOverridableHelix
-          system
-          (outputs args).packages.${system}.helix;
-      };
+    };
+    makeOverridableHelix = system: old: config: let
+      pkgs = nixpkgs.legacyPackages.${system};
+      grammars = pkgs.callPackage ./grammars.nix config;
+      runtimeDir = pkgs.runCommand "helix-runtime" {} ''
+        mkdir -p $out
+        ln -s ${mkRootPath "runtime"}/* $out
+        rm -r $out/grammars
+        ln -s ${grammars} $out/grammars
+      '';
+      helix-wrapped =
+        pkgs.runCommand "${old.name}-wrapped"
+        {
+          inherit (old) pname version meta;
+
+          nativeBuildInputs = [pkgs.makeWrapper];
+          makeWrapperArgs = config.makeWrapperArgs or [];
+        }
+        ''
+          mkdir -p $out
+          cp -r --no-preserve=mode,ownership ${old}/* $out/
+          chmod +x $out/bin/*
+          wrapProgram "$out/bin/hx" ''${makeWrapperArgs[@]} --set HELIX_RUNTIME "${runtimeDir}"
+        '';
+    in
+      helix-wrapped
+      // {override = makeOverridableHelix system old;};
   in
-    defaultOutputs
+    outputs
     // {
+      apps =
+        lib.mapAttrs
+        (
+          system: apps: rec {
+            default = hx;
+            hx = {
+              type = "app";
+              program = lib.getExe self.${system}.packages.helix;
+            };
+          }
+        )
+        outputs.apps;
       packages =
-        nixpkgs.lib.mapAttrs
+        lib.mapAttrs
         (
-          system: packages:
-            packages
-            // rec {
-              default = helix;
-              helix = makeOverridableHelix system packages.helix;
-            }
+          system: packages: rec {
+            default = helix;
+            helix = makeOverridableHelix system helix-unwrapped {};
+            helix-debug = makeOverridableHelix system helix-unwrapped-debug {};
+            helix-unwrapped = packages.helix;
+            helix-unwrapped-debug = packages.helix-debug;
+          }
         )
-        defaultOutputs.packages;
+        outputs.packages;
     };
 
   nixConfig = {

From 1caba2d3e8e16752d7d659b58c51931451a1cb47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Sat, 3 Sep 2022 12:18:08 +0900
Subject: [PATCH 059/884] lsp: Don't log "LSP not defined" errors in the
 logfile

---
 helix-lsp/src/lib.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index 79d9609e..516c93ca 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -356,7 +356,11 @@ impl Registry {
                         .await;
 
                     if let Err(e) = value {
-                        log::error!("failed to initialize language server: {}", e);
+                        if let Error::LspNotDefined = e {
+                            // Skip logging "lsp not defined"
+                        } else {
+                            log::error!("failed to initialize language server: {}", e);
+                        }
                         return;
                     }
 

From 6ec4017a8d9f690dd9c9e5c54eadbafdff8be620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Sat, 3 Sep 2022 12:36:06 +0900
Subject: [PATCH 060/884] Expand doc/view macros to allow fetching specific id

This simplifies the code and hides away unwraps
---
 helix-term/src/ui/editor.rs |  8 ++++----
 helix-view/src/editor.rs    | 12 ++++++------
 helix-view/src/macros.rs    | 14 +++++++++++++-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index d0def9ba..64e95e33 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1061,7 +1061,7 @@ impl EditorView {
                 let editor = &mut cxt.editor;
 
                 if let Some((pos, view_id)) = pos_and_view(editor, row, column) {
-                    let doc = editor.document_mut(editor.tree.get(view_id).doc).unwrap();
+                    let doc = doc_mut!(editor, &view!(editor, view_id).doc);
 
                     if modifiers == KeyModifiers::ALT {
                         let selection = doc.selection(view_id).clone();
@@ -1190,7 +1190,7 @@ impl EditorView {
                 }
 
                 if let Some((pos, view_id)) = pos_and_view(editor, row, column) {
-                    let doc = editor.document_mut(editor.tree.get(view_id).doc).unwrap();
+                    let doc = doc_mut!(editor, &view!(editor, view_id).doc);
                     doc.set_selection(view_id, Selection::point(pos));
                     cxt.editor.focus(view_id);
                     commands::MappableCommand::paste_primary_clipboard_before.execute(cxt);
@@ -1320,8 +1320,8 @@ impl Component for EditorView {
                 if cx.editor.tree.contains(focus) {
                     let config = cx.editor.config();
                     let mode = cx.editor.mode();
-                    let view = cx.editor.tree.get_mut(focus);
-                    let doc = cx.editor.documents.get_mut(&view.doc).unwrap();
+                    let view = view_mut!(cx.editor, focus);
+                    let doc = doc_mut!(cx.editor, &view.doc);
 
                     view.ensure_cursor_in_view(doc, config.scrolloff);
 
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 65e64b16..b6947e44 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -890,7 +890,7 @@ impl Editor {
         view.doc = doc_id;
         view.offset = Position::default();
 
-        let doc = self.documents.get_mut(&doc_id).unwrap();
+        let doc = doc_mut!(self, &doc_id);
         doc.ensure_view_init(view.id);
 
         // TODO: reuse align_view
@@ -961,7 +961,7 @@ impl Editor {
             }
             Action::Load => {
                 let view_id = view!(self).id;
-                let doc = self.documents.get_mut(&id).unwrap();
+                let doc = doc_mut!(self, &id);
                 doc.ensure_view_init(view_id);
                 return;
             }
@@ -982,7 +982,7 @@ impl Editor {
                     },
                 );
                 // initialize selection for view
-                let doc = self.documents.get_mut(&id).unwrap();
+                let doc = doc_mut!(self, &id);
                 doc.ensure_view_init(view_id);
             }
         }
@@ -1036,9 +1036,9 @@ impl Editor {
     }
 
     pub fn close(&mut self, id: ViewId) {
-        let view = self.tree.get(self.tree.focus);
+        let (_view, doc) = current!(self);
         // remove selection
-        self.documents.get_mut(&view.doc).unwrap().remove_view(id);
+        doc.remove_view(id);
         self.tree.remove(id);
         self._refresh();
     }
@@ -1112,7 +1112,7 @@ impl Editor {
                 .unwrap_or_else(|| self.new_document(Document::default()));
             let view = View::new(doc_id, self.config().gutters.clone());
             let view_id = self.tree.insert(view);
-            let doc = self.documents.get_mut(&doc_id).unwrap();
+            let doc = doc_mut!(self, &doc_id);
             doc.ensure_view_init(view_id);
         }
 
diff --git a/helix-view/src/macros.rs b/helix-view/src/macros.rs
index 04f8df94..53ab4346 100644
--- a/helix-view/src/macros.rs
+++ b/helix-view/src/macros.rs
@@ -14,7 +14,7 @@ macro_rules! current {
     ($editor:expr) => {{
         let view = $crate::view_mut!($editor);
         let id = view.doc;
-        let doc = $editor.documents.get_mut(&id).unwrap();
+        let doc = $crate::doc_mut!($editor, &id);
         (view, doc)
     }};
 }
@@ -32,6 +32,9 @@ macro_rules! current_ref {
 /// Returns `&mut Document`
 #[macro_export]
 macro_rules! doc_mut {
+    ($editor:expr, $id:expr) => {{
+        $editor.documents.get_mut($id).unwrap()
+    }};
     ($editor:expr) => {{
         $crate::current!($editor).1
     }};
@@ -41,6 +44,9 @@ macro_rules! doc_mut {
 /// Returns `&mut View`
 #[macro_export]
 macro_rules! view_mut {
+    ($editor:expr, $id:expr) => {{
+        $editor.tree.get_mut($id)
+    }};
     ($editor:expr) => {{
         $editor.tree.get_mut($editor.tree.focus)
     }};
@@ -50,6 +56,9 @@ macro_rules! view_mut {
 /// Returns `&View`
 #[macro_export]
 macro_rules! view {
+    ($editor:expr, $id:expr) => {{
+        $editor.tree.get($id)
+    }};
     ($editor:expr) => {{
         $editor.tree.get($editor.tree.focus)
     }};
@@ -57,6 +66,9 @@ macro_rules! view {
 
 #[macro_export]
 macro_rules! doc {
+    ($editor:expr, $id:expr) => {{
+        $editor.documents[$id]
+    }};
     ($editor:expr) => {{
         $crate::current_ref!($editor).1
     }};

From 59f7b07c86309083c24b9c8858a9abe0dc3d68c8 Mon Sep 17 00:00:00 2001
From: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
Date: Sat, 3 Sep 2022 07:16:34 +0300
Subject: [PATCH 061/884] build(nix): update flake deps (#3663)

---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index bb8c96a0..f28ec884 100644
--- a/flake.lock
+++ b/flake.lock
@@ -69,11 +69,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1662083074,
-        "narHash": "sha256-GL4/CLKPYUzkKD1l7oi2XB+vi3z4xGpCVLDdG3tRqvs=",
+        "lastModified": 1662176993,
+        "narHash": "sha256-Sy7DsGAveDUFBb6YDsUSYZd/AcXfP/MOMIwMt/NgY84=",
         "owner": "nix-community",
         "repo": "dream2nix",
-        "rev": "c6c039fcc6abdf4d828b940b576944a224cf8622",
+        "rev": "809bc5940214744eb29778a9a0b03f161979c1b2",
         "type": "github"
       },
       "original": {
@@ -109,11 +109,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1662143940,
-        "narHash": "sha256-3eJfehnZLWJGXylfpAMeLR0Q3sx8pAjGiHBQPqOH9+U=",
+        "lastModified": 1662177071,
+        "narHash": "sha256-x6XF//RdZlw81tFAYM1TkjY+iQIpyMCWZ46r9o4wVQY=",
         "owner": "yusdacra",
         "repo": "nix-cargo-integration",
-        "rev": "e83f2598aecbe1114783ff9bdae0b85939de35a3",
+        "rev": "65270dea87bb82fc02102a15221677eea237680e",
         "type": "github"
       },
       "original": {

From c93d52cc8a8fd4aafcdbe13c0684d9ddec68ef90 Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Sat, 3 Sep 2022 17:58:16 +0300
Subject: [PATCH 062/884] Fix cargo doc warnings, and add GitHub action to
 ensure it (#3650)

---
 .github/workflows/build.yml |  8 ++++++++
 helix-core/src/indent.rs    | 10 +++++-----
 helix-term/src/ui/prompt.rs |  2 +-
 helix-view/src/tree.rs      | 14 +++++++-------
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2a1950df..ef47a277 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -103,6 +103,14 @@ jobs:
           command: clippy
           args: --all-targets -- -D warnings
 
+      - name: Run cargo doc
+        uses: actions-rs/cargo@v1
+        with:
+          command: doc
+          args: --no-deps --workspace --document-private-items
+        env:
+          RUSTDOCFLAGS: -D warnings
+
   docs:
     name: Docs
     runs-on: ubuntu-latest
diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index 137b8822..ad079c25 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -230,14 +230,14 @@ fn get_first_in_line(mut node: Node, byte_pos: usize, new_line: bool) -> Vec<boo
 /// - Successively add indent captures to get the (added) indent from a single line
 /// - Successively add the indent results for each line
 #[derive(Default)]
-struct Indentation {
+pub struct Indentation {
     /// The total indent (the number of indent levels) is defined as max(0, indent-outdent).
     /// The string that this results in depends on the indent style (spaces or tabs, etc.)
     indent: usize,
     outdent: usize,
 }
 impl Indentation {
-    /// Add some other [IndentResult] to this.
+    /// Add some other [Indentation] to this.
     /// The added indent should be the total added indent from one line
     fn add_line(&mut self, added: &Indentation) {
         if added.indent > 0 && added.outdent == 0 {
@@ -433,7 +433,7 @@ fn query_indents(
 ///     after pos were moved to a new line.
 ///
 /// The indentation is determined by traversing all the tree-sitter nodes containing the position.
-/// Each of these nodes produces some [AddedIndent] for:
+/// Each of these nodes produces some [Indentation] for:
 ///
 /// - The line of the (beginning of the) node. This is defined by the scope `all` if this is the first node on its line.
 /// - The line after the node. This is defined by:
@@ -441,9 +441,9 @@ fn query_indents(
 ///   - The scope `all` if this node is not the first node on its line.
 /// Intuitively, `all` applies to everything contained in this node while `tail` applies to everything except for the first line of the node.
 /// The indents from different nodes for the same line are then combined.
-/// The [IndentResult] is simply the sum of the [AddedIndent] for all lines.
+/// The result [Indentation] is simply the sum of the [Indentation] for all lines.
 ///
-/// Specifying which line exactly an [AddedIndent] applies to is important because indents on the same line combine differently than indents on different lines:
+/// Specifying which line exactly an [Indentation] applies to is important because indents on the same line combine differently than indents on different lines:
 /// ```ignore
 /// some_function(|| {
 ///     // Both the function parameters as well as the contained block should be indented.
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 24fc8233..d66e32be 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -101,7 +101,7 @@ impl Prompt {
     }
 
     /// Compute the cursor position after applying movement
-    /// Taken from: https://github.com/wez/wezterm/blob/e0b62d07ca9bf8ce69a61e30a3c20e7abc48ce7e/termwiz/src/lineedit/mod.rs#L516-L611
+    /// Taken from: <https://github.com/wez/wezterm/blob/e0b62d07ca9bf8ce69a61e30a3c20e7abc48ce7e/termwiz/src/lineedit/mod.rs#L516-L611>
     fn eval_movement(&self, movement: Movement) -> usize {
         match movement {
             Movement::BackwardChar(rep) => {
diff --git a/helix-view/src/tree.rs b/helix-view/src/tree.rs
index 72f6af57..a1977764 100644
--- a/helix-view/src/tree.rs
+++ b/helix-view/src/tree.rs
@@ -270,18 +270,18 @@ impl Tree {
             })
     }
 
-    /// Get reference to a [`view`] by index.
+    /// Get reference to a [View] by index.
     /// # Panics
     ///
-    /// Panics if `index` is not in self.nodes, or if the node's content is not [`Content::View`] . This can be checked with [`contains`]
+    /// Panics if `index` is not in self.nodes, or if the node's content is not [Content::View]. This can be checked with [Self::contains].
     pub fn get(&self, index: ViewId) -> &View {
         self.try_get(index).unwrap()
     }
 
-    /// Try to get reference to a [`view`] by index. Returns `None` if node content is not a [`Content::View`]
+    /// Try to get reference to a [View] by index. Returns `None` if node content is not a [Content::View]
     /// # Panics
     ///
-    /// Panics if `index` is not in self.nodes. This can be checked with [`Self::contains`]
+    /// Panics if `index` is not in self.nodes. This can be checked with [Self::contains]
     pub fn try_get(&self, index: ViewId) -> Option<&View> {
         match &self.nodes[index] {
             Node {
@@ -292,10 +292,10 @@ impl Tree {
         }
     }
 
-    /// Get a mutable reference to a [`view`] by index.
+    /// Get a mutable reference to a [View] by index.
     /// # Panics
     ///
-    /// Panics if `index` is not in self.nodes, or if the node's content is not [`Content::View`] . This can be checked with [`Self::contains`]
+    /// Panics if `index` is not in self.nodes, or if the node's content is not [Content::View]. This can be checked with [Self::contains].
     pub fn get_mut(&mut self, index: ViewId) -> &mut View {
         match &mut self.nodes[index] {
             Node {
@@ -306,7 +306,7 @@ impl Tree {
         }
     }
 
-    /// Check if tree contains a [`Node`] with a given index.
+    /// Check if tree contains a [Node] with a given index.
     pub fn contains(&self, index: ViewId) -> bool {
         self.nodes.contains_key(index)
     }

From 0d76775453fcb99653c106bce62ec179eda2b196 Mon Sep 17 00:00:00 2001
From: Fangrui Song <i@maskray.me>
Date: Sat, 3 Sep 2022 15:30:03 -0700
Subject: [PATCH 063/884] Fix typos in tutor (#3664)

---
 runtime/tutor.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/tutor.txt b/runtime/tutor.txt
index fe7b15d2..4a6c4425 100644
--- a/runtime/tutor.txt
+++ b/runtime/tutor.txt
@@ -670,8 +670,8 @@ _________________________________________________________________
  3. Try using A-. with f and t, to select multiple sentences for
     instance.
 
- This is some text for you to repeat things. You can repeat
- insertions like changing words, or repeat selections like f/t.
+ --> This is some text for you to repeat things. You can repeat
+     insertions like changing words, or repeat selections like f/t.
 
 
 
@@ -911,7 +911,7 @@ lines.
  1. Move the cursor to the line below marked -->.
  2. Select the first "bat" and type * to set it to search.
  3. Type v to enter select mode.
- 4. Type n to select the othe "bat".
+ 4. Type n to select the other "bat".
  5. Use c or r to change the "bat"s to "cat".
 
  --> Everybody wants to be a bat,

From f0d1caafcf0f2941110084a29cf4ce9d83071433 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sat, 3 Sep 2022 23:29:20 -0500
Subject: [PATCH 064/884] Look for the external formatter before invoking it
 (#3670)

Currently it is not possible to save a file with a language that
has an external formatter configuration unless the external
formatter is installed, even if the language has a Language Server
configuration capable of auto-format. This change checks that the
external formatter exists before using it to create a formatting
callback.
---
 helix-view/src/document.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 3c406f8b..3f8dc4e6 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -407,7 +407,11 @@ impl Document {
     // We can't use anyhow::Result here since the output of the future has to be
     // clonable to be used as shared future. So use a custom error type.
     pub fn format(&self) -> Option<BoxFuture<'static, Result<Transaction, FormatterError>>> {
-        if let Some(formatter) = self.language_config().and_then(|c| c.formatter.clone()) {
+        if let Some(formatter) = self
+            .language_config()
+            .and_then(|c| c.formatter.clone())
+            .filter(|formatter| which::which(&formatter.command).is_ok())
+        {
             use std::process::Stdio;
             let text = self.text().clone();
             let mut process = tokio::process::Command::new(&formatter.command);

From cc4b71274a9fbffe4081243b19f2234ed6492fb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Sun, 4 Sep 2022 17:27:15 +0900
Subject: [PATCH 065/884] minor: Simplify another document_mut statement

---
 helix-term/src/application.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 9e79e7c9..1461c688 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -195,7 +195,7 @@ impl Application {
                         // `--vsplit` or `--hsplit` are used, the file which is
                         // opened last is focused on.
                         let view_id = editor.tree.focus;
-                        let doc = editor.document_mut(doc_id).unwrap();
+                        let doc = doc_mut!(editor, &doc_id);
                         let pos = Selection::point(pos_at_coords(doc.text().slice(..), pos, true));
                         doc.set_selection(view_id, pos);
                     }

From 44b447947c810b7fc6a13383b4379f0f48501c17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Sun, 4 Sep 2022 17:28:17 +0900
Subject: [PATCH 066/884] fix: lsp: Don't send didOpen events for documents
 with no URL

Fixes #3683
---
 helix-term/src/application.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 1461c688..9653b373 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -505,8 +505,13 @@ impl Application {
                             let language_id =
                                 doc.language_id().map(ToOwned::to_owned).unwrap_or_default();
 
+                            let url = match doc.url() {
+                                Some(url) => url,
+                                None => continue, // skip documents with no path
+                            };
+
                             tokio::spawn(language_server.text_document_did_open(
-                                doc.url().unwrap(),
+                                url,
                                 doc.version(),
                                 doc.text(),
                                 language_id,

From 20ed8c259519f1e37cf6c2a37479bdd681e9b924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Mon, 5 Sep 2022 10:50:32 +0900
Subject: [PATCH 067/884] tree-sitter-solidity: Use upstream, update queries

---
 languages.toml                          |   2 +-
 runtime/queries/solidity/highlights.scm | 134 +++++++++++++++---------
 runtime/queries/solidity/locals.scm     |   9 ++
 3 files changed, 92 insertions(+), 53 deletions(-)
 create mode 100644 runtime/queries/solidity/locals.scm

diff --git a/languages.toml b/languages.toml
index 06921534..b19fde6a 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1192,7 +1192,7 @@ language-server = { command = "solc", args = ["--lsp"] }
 
 [[grammar]]
 name = "solidity"
-source = { git = "https://github.com/slinlee/tree-sitter-solidity", rev = "f3a002274744e859bf64cf3524985f8c31ea84fd" }
+source = { git = "https://github.com/JoranHonig/tree-sitter-solidity", rev = "9004b86531cb424bd379424cf7266a4585f2af7d" }
 
 [[language]]
 name = "gleam"
diff --git a/runtime/queries/solidity/highlights.scm b/runtime/queries/solidity/highlights.scm
index 544cf3d9..08178c36 100644
--- a/runtime/queries/solidity/highlights.scm
+++ b/runtime/queries/solidity/highlights.scm
@@ -1,15 +1,16 @@
-(comment) @comment
+; identifiers
+; -----------
+(identifier) @variable
+(yul_identifier) @variable
 
 ; Pragma
 (pragma_directive) @tag
-(solidity_version_comparison_operator ">=" @tag)
-(solidity_version_comparison_operator "<=" @tag)
-(solidity_version_comparison_operator "=" @tag)
-(solidity_version_comparison_operator "~" @tag)
-(solidity_version_comparison_operator "^" @tag)
+(solidity_version_comparison_operator _ @tag)
 
 
 ; Literals
+; --------
+
 [
  (string)
  (hex_string_literal)
@@ -26,26 +27,38 @@
  (false)
 ] @constant.builtin
 
+(comment) @comment
+
+
+; Definitions and references
+; -----------
 
-; Type
 (type_name) @type
 (primitive_type) @type
-(struct_declaration struct_name: (identifier) @type)
-(enum_declaration enum_type_name: (identifier) @type)
+(user_defined_type (identifier) @type)
+
 ; Color payable in payable address conversion as type and not as keyword
 (payable_conversion_expression "payable" @type)
-(emit_statement . (identifier) @type)
-; Handles ContractA, ContractB in function foo() override(ContractA, contractB) {}
-(override_specifier (identifier) @type)
 ; Ensures that delimiters in mapping( ... => .. ) are not colored like types
 (type_name "(" @punctuation.bracket "=>" @punctuation.delimiter ")" @punctuation.bracket)
 
-
-
-; Functions and parameters
+; Definitions
+(struct_declaration 
+  name: (identifier) @type)
+(enum_declaration 
+  name: (identifier) @type)
+(contract_declaration
+  name: (identifier) @type) 
+(library_declaration
+  name: (identifier) @type) 
+(interface_declaration
+  name: (identifier) @type)
+(event_definition 
+  name: (identifier) @type) 
 
 (function_definition
-  function_name:  (identifier) @function)
+  name:  (identifier) @function)
+
 (modifier_definition
   name:  (identifier) @function)
 (yul_evm_builtin) @function.builtin
@@ -55,37 +68,38 @@
 (fallback_receive_definition "receive" @constructor)
 (fallback_receive_definition "fallback" @constructor)
 
-(modifier_invocation (identifier) @function)
+(struct_member name: (identifier) @variable.other.member)
+(enum_value) @constant
 
-; Handles expressions like structVariable.g();
-(call_expression . (member_expression (property_identifier) @function.method))
+; Invocations
+(emit_statement . (identifier) @type)
+(modifier_invocation (identifier) @function)
 
-; Handles expressions like g();
+(call_expression . (member_expression property: (identifier) @function.method))
 (call_expression . (identifier) @function)
 
 ; Function parameters
-(event_paramater name: (identifier) @variable.parameter) ; TODO fix spelling once fixed upstream
-(function_definition
-  function_name:  (identifier) @variable.parameter)
+(call_struct_argument name: (identifier) @field)
+(event_paramater name: (identifier) @variable.parameter)
+(parameter name: (identifier) @variable.parameter)
 
 ; Yul functions
 (yul_function_call function: (yul_identifier) @function)
-
-; Yul function parameters
 (yul_function_definition . (yul_identifier) @function (yul_identifier) @variable.parameter)
 
-(meta_type_expression "type" @keyword)
 
-(member_expression (property_identifier) @variable.other.member)
-(property_identifier) @variable.other.member
-(struct_expression ((identifier) @variable.other.member . ":"))
-(enum_value) @variable.other.member
+; Structs and members
+(member_expression property: (identifier) @variable.other.member)
+(struct_expression type: ((identifier) @type .))
+(struct_field_assignment name: (identifier) @variable.other.member)
 
+; Tokens
+; -------
 
 ; Keywords
+(meta_type_expression "type" @keyword)
 [
  "pragma"
- "import"
  "contract"
  "interface"
  "library"
@@ -95,19 +109,6 @@
  "event"
  "using"
  "assembly"
- "switch"
- "case"
- "default"
- "break"
- "continue"
- "if"
- "else"
- "for"
- "while"
- "do"
- "try"
- "catch"
- "return"
  "emit"
  "public"
  "internal"
@@ -117,20 +118,47 @@
  "view"
  "payable"
  "modifier"
- "returns"
  "memory"
  "storage"
  "calldata"
- "function"
  "var"
- (constant)
+ "constant"
  (virtual)
  (override_specifier)
  (yul_leave)
 ] @keyword
 
-(import_directive "as" @keyword)
-(import_directive "from" @keyword)
+[
+ "for"
+ "while"
+ "do"
+] @keyword.control.repeat
+
+[
+ "break"
+ "continue"
+ "if"
+ "else"
+ "switch"
+ "case"
+ "default"
+] @keyword.control.conditional
+
+[
+ "try"
+ "catch"
+] @keyword.control.exception
+
+[
+ "return"
+ "returns"
+] @keyword.control.return
+
+"function" @keyword.function
+
+"import" @keyword.control.import
+(import_directive "as" @keyword.control.import)
+(import_directive "from" @keyword.control.import)
 (event_paramater "indexed" @keyword) ; TODO fix spelling once fixed upstream
 
 ; Punctuation
@@ -142,7 +170,7 @@
   "]"
   "{"
   "}"
-]  @punctuation.bracket
+] @punctuation.bracket
 
 
 [
@@ -185,5 +213,7 @@
   "--"
 ] @operator
 
-(identifier) @variable
-(yul_identifier) @variable
+[
+  "delete"
+  "new"
+] @keyword.operator
diff --git a/runtime/queries/solidity/locals.scm b/runtime/queries/solidity/locals.scm
new file mode 100644
index 00000000..29bdc02c
--- /dev/null
+++ b/runtime/queries/solidity/locals.scm
@@ -0,0 +1,9 @@
+(function_definition) @local.scope
+(block_statement) @local.scope
+
+(function_definition (parameter name: (identifier) @local.definition))
+
+; still have to support tuple assignments
+(assignment_expression left: (identifier) @local.definition)
+
+(identifier) @local.reference
\ No newline at end of file

From 9c3c6a1c22db065512c5563e9ed1c9dca869c886 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 4 Sep 2022 21:34:49 -0500
Subject: [PATCH 068/884] Fix off-by-one in extend_line_above (#3689)

`extend_line_above` (and `extend_line` when facing backwards) skip
a line when the current range does not fully cover a line.

Before this change:

    foo
    b#[|a]#r
    baz

With `extend_line_above` or `extend_line` selected the line above.

    #[|foo
    bar]#
    baz

Which is inconsistent with `extend_line_below`. This commit changes
the behavior to select the current line when it is not already
selected.

    foo
    #[|bar]#
    baz

Then further calls of `extend_line_above` extend the selection up
line-wise.
---
 helix-term/src/commands.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 906f201a..babfb2c8 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1971,7 +1971,7 @@ fn extend_line_impl(cx: &mut Context, extend: Extend) {
         let (start_line, end_line) = range.line_range(text.slice(..));
 
         let start = text.line_to_char(match extend {
-            Extend::Above => start_line.saturating_sub(count),
+            Extend::Above => start_line.saturating_sub(count - 1),
             Extend::Below => start_line,
         });
         let end = text.line_to_char(
@@ -1985,7 +1985,7 @@ fn extend_line_impl(cx: &mut Context, extend: Extend) {
         // extend to previous/next line if current line is selected
         let (anchor, head) = if range.from() == start && range.to() == end {
             match extend {
-                Extend::Above => (end, text.line_to_char(start_line.saturating_sub(count + 1))),
+                Extend::Above => (end, text.line_to_char(start_line.saturating_sub(count))),
                 Extend::Below => (
                     start,
                     text.line_to_char((end_line + count + 1).min(text.len_lines())),

From 1acdfaa073327cb52c27186235d69ac095ab468d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Mon, 5 Sep 2022 11:57:41 +0900
Subject: [PATCH 069/884] fix: View needs to retain the original scroll offset
 on split

---
 helix-term/src/commands.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index babfb2c8..e869446e 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4142,12 +4142,16 @@ fn split(cx: &mut Context, action: Action) {
     let (view, doc) = current!(cx.editor);
     let id = doc.id();
     let selection = doc.selection(view.id).clone();
+    let offset = view.offset;
 
     cx.editor.switch(id, action);
 
     // match the selection in the previous view
     let (view, doc) = current!(cx.editor);
     doc.set_selection(view.id, selection);
+    // match the view scroll offset (switch doesn't handle this fully
+    // since the selection is only matched after the split)
+    view.offset = offset;
 }
 
 fn hsplit(cx: &mut Context) {

From 16197664ab8dc1921de880a5487c0adea450635c Mon Sep 17 00:00:00 2001
From: Michael Kohl <me@citizen428.net>
Date: Mon, 5 Sep 2022 13:11:06 +0700
Subject: [PATCH 070/884] Add file_picker_in_current_directory to keymap.md
 (#3701)

---
 book/src/keymap.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index a26fd7ea..698b504c 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -257,6 +257,7 @@ This layer is a kludge of mappings, mostly pickers.
 | Key     | Description                                                             | Command                             |
 | -----   | -----------                                                             | -------                             |
 | `f`     | Open file picker                                                        | `file_picker`                       |
+| `F`     | Open file picker at current working directory                           | `file_picker_in_current_directory`  |
 | `b`     | Open buffer picker                                                      | `buffer_picker`                     |
 | `j`     | Open jumplist picker                                                    | `jumplist_picker`                   |
 | `k`     | Show documentation for item under cursor in a [popup](#popup) (**LSP**) | `hover`                             |

From fb92d71d087e8e8f5c4b28acab9cfdd65857d4c1 Mon Sep 17 00:00:00 2001
From: Lennard Hofmann <lennard.hofmann@web.de>
Date: Mon, 5 Sep 2022 15:35:14 +0200
Subject: [PATCH 071/884] Update tree-sitter-fish to latest commit (#3704)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index b19fde6a..aee00f45 100644
--- a/languages.toml
+++ b/languages.toml
@@ -121,7 +121,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[grammar]]
 name = "fish"
-source = { git = "https://github.com/ram02z/tree-sitter-fish", rev = "04e54ab6585dfd4fee6ddfe5849af56f101b6d4f" }
+source = { git = "https://github.com/ram02z/tree-sitter-fish", rev = "84436cf24c2b3176bfbb220922a0fdbd0141e406" }
 
 [[language]]
 name = "mint"

From df1ed0a5fd02cc89ccfa3bf0912848249bebae6d Mon Sep 17 00:00:00 2001
From: NotAgentBilly <82730686+NotAgentBilly@users.noreply.github.com>
Date: Mon, 5 Sep 2022 13:42:17 +0000
Subject: [PATCH 072/884] xcopy - assume destination is a directory (#3686)

---
 README.md           | 4 ++--
 book/src/install.md | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 0d3dab4b..98ec7822 100644
--- a/README.md
+++ b/README.md
@@ -50,8 +50,8 @@ config directory (for example `~/.config/helix/runtime` on Linux/macOS, or `%App
 
 | OS                   | Command                                      |
 | -------------------- | -------------------------------------------- |
-| Windows (cmd.exe)    | `xcopy /e runtime %AppData%\helix\runtime`      |
-| Windows (PowerShell) | `xcopy /e runtime $Env:AppData\helix\runtime`   |
+| Windows (cmd.exe)    | `xcopy /e /i runtime %AppData%\helix\runtime`      |
+| Windows (PowerShell) | `xcopy /e /i runtime $Env:AppData\helix\runtime`   |
 | Linux/macOS          | `ln -s $PWD/runtime ~/.config/helix/runtime` |
 
 This location can be overridden via the `HELIX_RUNTIME` environment variable.
diff --git a/book/src/install.md b/book/src/install.md
index 497dd0a4..d7a51ac2 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -66,8 +66,8 @@ via the `HELIX_RUNTIME` environment variable.
 
 | OS                | command   |
 |-------------------|-----------|
-|windows(cmd.exe)   |`xcopy /e runtime %AppData%/helix/runtime`     |
-|windows(powershell)|`xcopy /e runtime $Env:AppData\helix\runtime`  |
+|windows(cmd.exe)   |`xcopy /e /i runtime %AppData%/helix/runtime`     |
+|windows(powershell)|`xcopy /e /i runtime $Env:AppData\helix\runtime`  |
 |linux/macos        |`ln -s $PWD/runtime ~/.config/helix/runtime`|
 
 ## Finishing up the installation 

From da8071047a8d48cb93dfb4a6ab9b8b2d08efb0dd Mon Sep 17 00:00:00 2001
From: Clay <connorlay@users.noreply.github.com>
Date: Mon, 5 Sep 2022 03:49:41 -1000
Subject: [PATCH 073/884] Elixir: update tree-sitter queries (#3645)

---
 runtime/queries/elixir/injections.scm  | 50 +++++++++++++++++++++-----
 runtime/queries/elixir/textobjects.scm |  2 +-
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/runtime/queries/elixir/injections.scm b/runtime/queries/elixir/injections.scm
index 5c58a863..4853b84b 100644
--- a/runtime/queries/elixir/injections.scm
+++ b/runtime/queries/elixir/injections.scm
@@ -1,20 +1,16 @@
+; Elixir Code Comments
 ((comment) @injection.content
  (#set! injection.language "comment"))
 
+; Elixir Regular Expressions
 ((sigil
   (sigil_name) @_sigil_name
   (quoted_content) @injection.content)
- (#match? @_sigil_name "^(r|R)$")
+ (#match? @_sigil_name "^(R|r)$")
  (#set! injection.language "regex")
  (#set! injection.combined))
 
-((sigil
-  (sigil_name) @_sigil_name
-  (quoted_content) @injection.content)
- (#eq? @_sigil_name "H")
- (#set! injection.language "heex")
- (#set! injection.combined))
-
+; Elixir Markdown Documentation
 (unary_operator
   operator: "@"
   operand: (call
@@ -23,3 +19,41 @@
       (string (quoted_content) @injection.content)
       (sigil (quoted_content) @injection.content)
   ])) (#set! injection.language "markdown"))
+
+; Zigler Sigils
+((sigil
+  (sigil_name) @_sigil_name
+  (quoted_content) @injection.content)
+ (#match? @_sigil_name "^(Z|z)$")
+ (#set! injection.language "zig")
+ (#set! injection.combined))
+
+; Jason Sigils
+((sigil
+  (sigil_name) @_sigil_name
+  (quoted_content) @injection.content)
+ (#match? @_sigil_name "^(J|j)$")
+ (#set! injection.language "json")
+ (#set! injection.combined))
+
+; Phoenix Live View HEEx Sigils
+((sigil
+  (sigil_name) @_sigil_name
+  (quoted_content) @injection.content)
+ (#eq? @_sigil_name "H")
+ (#set! injection.language "heex")
+ (#set! injection.combined))
+
+; Phoenix Live View Component Macros
+(call 
+  (identifier) @_identifier
+  (arguments
+    (atom)+
+    (keywords (pair 
+      ((keyword) @_keyword (#eq? @_keyword "doc: "))
+      [
+        (string (quoted_content) @injection.content)
+        (sigil (quoted_content) @injection.content)
+      ]))
+  (#match? @_identifier "^(attr|slot)$")
+  (#set! injection.language "markdown")))
diff --git a/runtime/queries/elixir/textobjects.scm b/runtime/queries/elixir/textobjects.scm
index cc1bee99..ab456584 100644
--- a/runtime/queries/elixir/textobjects.scm
+++ b/runtime/queries/elixir/textobjects.scm
@@ -32,4 +32,4 @@
   (do_block (_)* @test.inside)?)
  (#match? @_keyword "^(test|describe)$")) @test.around
 
-(comment) @comment.around @comment.inside
+(comment)+ @comment.around @comment.inside

From 8882615483bc1cd6ade59da83f1cb6c2a3c5acf5 Mon Sep 17 00:00:00 2001
From: Kirawi <67773714+kirawi@users.noreply.github.com>
Date: Mon, 5 Sep 2022 15:38:37 -0400
Subject: [PATCH 074/884] Delete hooks.md (#3711)

---
 book/src/SUMMARY.md | 1 -
 book/src/hooks.md   | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 book/src/hooks.md

diff --git a/book/src/SUMMARY.md b/book/src/SUMMARY.md
index ef214b12..eaf0c4f4 100644
--- a/book/src/SUMMARY.md
+++ b/book/src/SUMMARY.md
@@ -11,7 +11,6 @@
 - [Configuration](./configuration.md)
   - [Themes](./themes.md)
   - [Key Remapping](./remapping.md)
-  - [Hooks](./hooks.md)
   - [Languages](./languages.md)
 - [Guides](./guides/README.md)
   - [Adding Languages](./guides/adding_languages.md)
diff --git a/book/src/hooks.md b/book/src/hooks.md
deleted file mode 100644
index 744f34e8..00000000
--- a/book/src/hooks.md
+++ /dev/null
@@ -1 +0,0 @@
-# Hooks

From 5e1296b8885fc731ed05b4af01e3c7c2af343b47 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Sep 2022 18:33:01 -0500
Subject: [PATCH 075/884] build(deps): bump once_cell from 1.13.1 to 1.14.0
 (#3715)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock              | 4 ++--
 helix-core/Cargo.toml   | 2 +-
 helix-loader/Cargo.toml | 2 +-
 helix-term/Cargo.toml   | 2 +-
 helix-view/Cargo.toml   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b2225f88..e327e4b0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -739,9 +739,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.13.1"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e"
+checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
 
 [[package]]
 name = "parking_lot"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 0bae7b89..3ea7235d 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -26,7 +26,7 @@ unicode-general-category = "0.5"
 # slab = "0.4.2"
 slotmap = "1.0"
 tree-sitter = "0.20"
-once_cell = "1.13"
+once_cell = "1.14"
 arc-swap = "1"
 regex = "1"
 
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index 46144a30..e23e0290 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -19,7 +19,7 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.5"
 etcetera = "0.4"
 tree-sitter = "0.20"
-once_cell = "1.13"
+once_cell = "1.14"
 log = "0.4"
 
 # TODO: these two should be on !wasm32 only
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index f4a9642a..0ebcb24f 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -32,7 +32,7 @@ helix-dap = { version = "0.6", path = "../helix-dap" }
 helix-loader = { version = "0.6", path = "../helix-loader" }
 
 anyhow = "1"
-once_cell = "1.13"
+once_cell = "1.14"
 
 which = "4.2"
 
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index ef21f9a6..9182ce23 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -22,7 +22,7 @@ helix-dap = { version = "0.6", path = "../helix-dap" }
 crossterm = { version = "0.25", optional = true }
 
 # Conversion traits
-once_cell = "1.13"
+once_cell = "1.14"
 url = "2"
 
 arc-swap = { version = "1.5.1" }

From c34929b1346f2a8e26b9faa1a91e75fd067b0d7a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Sep 2022 18:33:50 -0500
Subject: [PATCH 076/884] build(deps): bump thiserror from 1.0.33 to 1.0.34
 (#3717)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e327e4b0..922d8b75 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1126,18 +1126,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.33"
+version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d0a539a918745651435ac7db7a18761589a94cd7e94cd56999f828bf73c8a57"
+checksum = "8c1b05ca9d106ba7d2e31a9dab4a64e7be2cce415321966ea3132c49a656e252"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.33"
+version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c251e90f708e16c49a16f4917dc2131e75222b72edfa9cb7f7c58ae56aae0c09"
+checksum = "e8f2591983642de85c921015f3f070c665a197ed69e417af436115e3a1407487"
 dependencies = [
  "proc-macro2",
  "quote",

From 8667a4d2bef393add4b5fa6da1697f7c9fa38a43 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Sep 2022 18:48:58 -0500
Subject: [PATCH 077/884] build(deps): bump anyhow from 1.0.63 to 1.0.64
 (#3718)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 922d8b75..6dcbd8ea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -22,9 +22,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.63"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26fa4d7e3f2eebadf743988fc8aec9fa9a9e82611acafd77c1462ed6262440a"
+checksum = "b9a8f622bcf6ff3df478e9deba3e03e4e04b300f8e6a139e192c05fa3490afc7"
 
 [[package]]
 name = "arc-swap"

From b85d0c597a094e53f1b3a5af15336d4d335a53ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Sep 2022 18:51:33 -0500
Subject: [PATCH 078/884] build(deps): bump tree-sitter from 0.20.8 to 0.20.9
 (#3719)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6dcbd8ea..ad7e089d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1231,9 +1231,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter"
-version = "0.20.8"
+version = "0.20.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "268bf3e3ca0c09e5d21b59c2638e12cb6dcf7ea2681250a696a2d0936cb57ba0"
+checksum = "d4423c784fe11398ca91e505cdc71356b07b1a924fc8735cfab5333afe3e18bc"
 dependencies = [
  "cc",
  "regex",

From f7c216d497efdca8de61a0deb34449c85c6d5229 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Sep 2022 11:25:54 +0900
Subject: [PATCH 079/884] build(deps): bump tokio from 1.20.1 to 1.21.0 (#3716)

Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.20.1 to 1.21.0.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.20.1...tokio-1.21.0)

---
updated-dependencies:
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock           | 4 ++--
 helix-lsp/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ad7e089d..341f0f6a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1179,9 +1179,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.20.1"
+version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581"
+checksum = "89797afd69d206ccd11fb0ea560a44bbb87731d020670e79416d442919257d42"
 dependencies = [
  "autocfg",
  "bytes",
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index b7d26662..2e5b8139 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -22,6 +22,6 @@ lsp-types = { version = "0.93", features = ["proposed"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-tokio = { version = "1.19", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
+tokio = { version = "1.21", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
 tokio-stream = "0.1.9"
 which = "4.2"

From 43b31f702a13d3ced2dc414d2febe5bcf222366a Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 5 Sep 2022 22:02:37 -0500
Subject: [PATCH 080/884] Update tree-sitter-diff (#3708)

This change also renames the grammar from `git-diff` to `diff`.
The grammar covers regular diff syntax so I renamed the repository
a while ago.
---
 book/src/generated/lang-support.md                | 2 +-
 languages.toml                                    | 6 +++---
 runtime/queries/{git-diff => diff}/highlights.scm | 0
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename runtime/queries/{git-diff => diff}/highlights.scm (100%)

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 467e4c5e..4e10ffc1 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -15,6 +15,7 @@
 | cue | ✓ |  |  | `cuelsp` |
 | dart | ✓ |  | ✓ | `dart` |
 | devicetree | ✓ |  |  |  |
+| diff | ✓ |  |  |  |
 | dockerfile | ✓ |  |  | `docker-langserver` |
 | dot | ✓ |  |  | `dot-language-server` |
 | edoc | ✓ |  |  |  |
@@ -32,7 +33,6 @@
 | git-attributes | ✓ |  |  |  |
 | git-commit | ✓ |  |  |  |
 | git-config | ✓ |  |  |  |
-| git-diff | ✓ |  |  |  |
 | git-ignore | ✓ |  |  |  |
 | git-rebase | ✓ |  |  |  |
 | gleam | ✓ | ✓ |  | `gleam` |
diff --git a/languages.toml b/languages.toml
index aee00f45..e288db8f 100644
--- a/languages.toml
+++ b/languages.toml
@@ -978,7 +978,7 @@ name = "git-commit"
 source = { git = "https://github.com/the-mikedavis/tree-sitter-git-commit", rev = "318dd72abfaa7b8044c1d1fbeabcd06deaaf038f" }
 
 [[language]]
-name = "git-diff"
+name = "diff"
 scope = "source.diff"
 roots = []
 file-types = ["diff"]
@@ -987,8 +987,8 @@ comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
-name = "git-diff"
-source = { git = "https://github.com/the-mikedavis/tree-sitter-git-diff", rev = "c12e6ecb54485f764250556ffd7ccb18f8e2942b" }
+name = "diff"
+source = { git = "https://github.com/the-mikedavis/tree-sitter-diff", rev = "fd74c78fa88a20085dbc7bbeaba066f4d1692b63" }
 
 [[language]]
 name = "git-rebase"
diff --git a/runtime/queries/git-diff/highlights.scm b/runtime/queries/diff/highlights.scm
similarity index 100%
rename from runtime/queries/git-diff/highlights.scm
rename to runtime/queries/diff/highlights.scm

From 665e27ff9dc017ee47f646187d98f5e4cdb18411 Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim@nrdxp.dev>
Date: Sun, 28 Aug 2022 20:16:10 -0600
Subject: [PATCH 081/884] nix: add language injections

By simply placing a comment with the name of the desired language just
before a multi-line string, that language will be injected.

Also, common functions and attributes which are expected to be shell
code are automatically injected.
---
 runtime/queries/nix/injections.scm | 39 ++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 runtime/queries/nix/injections.scm

diff --git a/runtime/queries/nix/injections.scm b/runtime/queries/nix/injections.scm
new file mode 100644
index 00000000..82d79cc7
--- /dev/null
+++ b/runtime/queries/nix/injections.scm
@@ -0,0 +1,39 @@
+; mark arbitary languages with a comment
+((((comment) @injection.language) .
+  (indented_string_expression (string_fragment) @injection.content))
+  (#set! injection.combined))
+
+((binding
+   attrpath: (attrpath (identifier) @_path)
+   expression: (indented_string_expression
+     (string_fragment) @injection.content))
+ (#match? @_path "(^\\w*Phase|(pre|post)\\w*|(.*\\.)?\\w*([sS]cript|[hH]ook)|(.*\\.)?startup)$")
+ (#set! injection.language "bash")
+ (#set! injection.combined))
+
+((apply_expression
+   function: (apply_expression function: (_) @_func)
+   argument: (indented_string_expression (string_fragment) @injection.content))
+ (#match? @_func "(^|\\.)writeShellScript(Bin)?$")
+ (#set! injection.language "bash")
+ (#set! injection.combined))
+
+(apply_expression
+  (apply_expression
+    function: (apply_expression
+      function: ((_) @_func)))
+    argument: (indented_string_expression (string_fragment) @injection.content)
+  (#match? @_func "(^|\\.)runCommand(((No)?(CC))?(Local)?)?$")
+  (#set! injection.language "bash")
+  (#set! injection.combined))
+
+(apply_expression
+  function: ((_) @_func)
+  argument: (_ (_)* (_ (_)* (binding
+    attrpath: (attrpath (identifier) @_path)
+     expression: (indented_string_expression
+       (string_fragment) @injection.content))))
+  (#match? @_func "(^|\\.)writeShellApplication$")
+  (#match? @_path "^text$")
+  (#set! injection.language "bash")
+  (#set! injection.combined))

From 5ed751c67d004544a05b0cf19ed0c9c99c534d97 Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim@nrdxp.dev>
Date: Fri, 2 Sep 2022 18:48:45 -0600
Subject: [PATCH 082/884] remove `^$` from injection regexs

---
 languages.toml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/languages.toml b/languages.toml
index e288db8f..d3051377 100644
--- a/languages.toml
+++ b/languages.toml
@@ -331,7 +331,7 @@ source = { git = "https://github.com/omertuc/tree-sitter-go-work", rev = "6dd9dd
 [[language]]
 name = "javascript"
 scope = "source.js"
-injection-regex = "^(js|javascript)$"
+injection-regex = "(js|javascript)"
 file-types = ["js", "jsx", "mjs", "cjs"]
 shebangs = ["node"]
 roots = []
@@ -370,7 +370,7 @@ grammar = "javascript"
 [[language]]
 name = "typescript"
 scope = "source.ts"
-injection-regex = "^(ts|typescript)$"
+injection-regex = "(ts|typescript)"
 file-types = ["ts"]
 shebangs = []
 roots = []
@@ -385,7 +385,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev =
 [[language]]
 name = "tsx"
 scope = "source.tsx"
-injection-regex = "^(tsx)$" # |typescript
+injection-regex = "(tsx)" # |typescript
 file-types = ["tsx"]
 roots = []
 # TODO: highlights-params
@@ -1183,7 +1183,7 @@ source = { git = "https://github.com/milisims/tree-sitter-org", rev = "698bb1a34
 [[language]]
 name = "solidity"
 scope = "source.sol"
-injection-regex = "^(sol|solidity)$"
+injection-regex = "(sol|solidity)"
 file-types = ["sol"]
 roots = []
 comment-token = "//"
@@ -1400,7 +1400,7 @@ source = { git = "https://github.com/archseer/tree-sitter-cairo", rev = "5155c6e
 [[language]]
 name = "cpon"
 scope = "scope.cpon"
-injection-regex = "^cpon$"
+injection-regex = "cpon"
 file-types = ["cpon", "cp"]
 roots = []
 auto-format = true

From 14f12c8a0b7992a6836ad0b9e3177329696e5dc1 Mon Sep 17 00:00:00 2001
From: Rohit K Viswanath <kvrohit@gmail.com>
Date: Wed, 7 Sep 2022 04:21:02 +0530
Subject: [PATCH 083/884] Theme: Rasmus (#3728)

---
 runtime/themes/rasmus.toml | 135 +++++++++++++++++++++++++++++++++++++
 1 file changed, 135 insertions(+)
 create mode 100644 runtime/themes/rasmus.toml

diff --git a/runtime/themes/rasmus.toml b/runtime/themes/rasmus.toml
new file mode 100644
index 00000000..a7baa83c
--- /dev/null
+++ b/runtime/themes/rasmus.toml
@@ -0,0 +1,135 @@
+# Author : Rohit K Viswanath <kvrohit@gmail.com>
+# Ported from : [rsms/sublime-theme](https://github.com/rsms/sublime-theme)
+
+"attribute" = "cyan"
+
+"keyword" = "blue"
+"keyword.control.conditional" = { fg = "blue", modifiers = ["italic"] }
+"keyword.directive" = "magenta" # -- preprocessor comments (#if in C)
+
+"namespace" = { fg = "blue", modifiers = ["italic"] }
+
+"punctuation" = "gray06"
+"punctuation.delimiter" = "gray06"
+
+"operator" = "yellow"
+"special" = "yellow"
+
+"variable" = "white"
+"variable.builtin" = "bright_blue"
+"variable.parameter" = "bright_white"
+"variable.other.member" = "white"
+
+"type" = "bright_white"
+"type.builtin" = "magenta"
+"type.enum.variant" = "magenta"
+
+"constructor" = "yellow"
+
+"function" = "white"
+"function.macro" = "blue"
+"function.builtin" = "blue"
+
+"tag" = "yellow"
+"comment" = { fg = "gray05", modifiers = ["italic"] }
+
+"string" = "cyan"
+"string.regexp" = "green"
+"string.special" = "blue"
+
+"constant" = "white"
+"constant.builtin" = "white"
+"constant.numeric" = "magenta"
+"constant.character.escape" = "magenta"
+
+# used for lifetimes
+"label" = "yellow"
+
+"markup.heading.marker" = { fg = "gray07" }
+"markup.heading.1" = { fg = "white", modifiers = ["bold"] }
+"markup.heading.2" = { fg = "gray07", modifiers = ["bold"] }
+"markup.heading.3" = { fg = "gray07", modifiers = ["bold"] }
+"markup.heading.4" = { fg = "gray07", modifiers = ["bold"] }
+"markup.heading.5" = { fg = "gray06", modifiers = ["bold"] }
+"markup.heading.6" = { fg = "gray06", modifiers = ["bold"] }
+"markup.list" = "gray07"
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.link.url" = { fg = "cyan", modifiers = ["underlined"] }
+"markup.link.text" = "blue"
+"markup.raw" = "yellow"
+
+"diff.plus" = "bright_green"
+"diff.minus" = "bright_red"
+"diff.delta" = "bright_cyan"
+
+"ui.background" = { bg = "bg" }
+"ui.background.separator" = { fg = "fg" }
+
+"ui.linenr" = { fg = "gray04" }
+"ui.linenr.selected" = { fg = "gray07" }
+
+"ui.statusline" = { fg = "gray07", bg = "gray02" }
+"ui.statusline.inactive" = { fg = "gray05", bg = "gray01" }
+"ui.statusline.normal" = { fg = "black", bg = "cyan", modifiers = ["bold"] }
+"ui.statusline.insert" = { fg = "black", bg = "blue", modifiers = ["bold"]  }
+"ui.statusline.select" = { fg = "black", bg = "magenta", modifiers = ["bold"]  }
+
+"ui.popup" = { bg = "gray01" }
+"ui.window" = { fg = "gray02" }
+"ui.help" = { bg = "gray01", fg = "fg" }
+
+"ui.text" = { fg = "fg" }
+"ui.text.focus" = { fg = "white" }
+
+"ui.virtual" = { fg = "gray03" }
+"ui.virtual.indent-guide" = { fg = "gray04" }
+
+"ui.selection" = { bg = "gray03" }
+"ui.selection.primary" = { bg = "gray03" }
+
+"ui.cursor" = { bg = "gray04" }
+"ui.cursor.insert" = { bg = "white" }
+"ui.cursor.match" = { fg = "bright_yellow" }
+"ui.cursor.select" = { bg = "gray03" }
+"ui.cursorline.primary" = { bg = "gray01" }
+
+"ui.highlight" = { bg = "gray03" }
+
+"ui.menu" = { fg = "white", bg = "gray01" }
+"ui.menu.selected" = { fg = "fg", bg = "gray03" }
+"ui.menu.scroll" = { fg = "white", bg = "gray01" }
+
+diagnostic = { modifiers = ["underlined"] }
+
+warning = "bright_yellow"
+error = "bright_red"
+info = "bright_blue"
+hint = "bright_cyan"
+
+[palette]
+bg = "#1a1a19"
+fg = "#d1d1d1"
+black = "#333332"
+red = "#ff968c"
+green = "#61957f"
+yellow = "#ffc591"
+blue = "#8db4d4"
+magenta = "#de9bc8"
+cyan = "#7bb099"
+white = "#d1d1d1"
+bright_black = "#4c4c4b"
+bright_red = "#ffafa5"
+bright_green = "#7aae98"
+bright_yellow = "#ffdeaa"
+bright_blue = "#a6cded"
+bright_magenta = "#f7b4e1"
+bright_cyan = "#94c9b2"
+bright_white = "#eaeaea"
+gray01 = "#222221"
+gray02 = "#2a2a29"
+gray03 = "#323231"
+gray04 = "#3a3a39"
+gray05 = "#6a6a69"
+gray06 = "#767675"
+gray07 = "#b6b6b5"

From 1fc97a9a203adce6a700cb871cddb75c655a4b98 Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Fri, 2 Sep 2022 12:42:25 +0900
Subject: [PATCH 084/884] chore(ci): install a pre-release version of Cross

---
 .github/workflows/release.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b8be1541..55233bfd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -100,6 +100,14 @@ jobs:
           target: ${{ matrix.target }}
           override: true
 
+      # Install a pre-release version of Cross
+      # TODO: We need to pre-install Cross because we need cross-rs/cross#591 to
+      #       get a newer C++ compiler toolchain. Remove this step when Cross
+      #       0.3.0, which includes cross-rs/cross#591, is released.
+      - name: Install Cross
+        if: "matrix.cross"
+        run: cargo install cross --git https://github.com/cross-rs/cross.git --rev 47df5c76e7cba682823a0b6aa6d95c17b31ba63a
+
       - name: Run cargo test
         uses: actions-rs/cargo@v1
         if: "!matrix.skip_tests"

From 038a91d204bd4a0038201f37d64cc55615ca9fca Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Fri, 2 Sep 2022 12:44:18 +0900
Subject: [PATCH 085/884] chore(ci): build binary for aarch64-linux

---
 .github/workflows/release.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 55233bfd..76e12eac 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -49,11 +49,11 @@ jobs:
           rust: stable
           target: x86_64-unknown-linux-gnu
           cross: false
-        # - build: aarch64-linux
-        #   os: ubuntu-20.04
-        #   rust: stable
-        #   target: aarch64-unknown-linux-gnu
-        #   cross: true
+        - build: aarch64-linux
+          os: ubuntu-20.04
+          rust: stable
+          target: aarch64-unknown-linux-gnu
+          cross: true
         - build: x86_64-macos
           os: macos-latest
           rust: stable

From b7380313a5d5e590970742bf7eaa2f2d695b6e0c Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Sat, 3 Sep 2022 21:49:45 +0900
Subject: [PATCH 086/884] chore(ci): build AppImage for aarch64-linux

---
 .github/workflows/release.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 76e12eac..7d723b98 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -138,7 +138,7 @@ jobs:
 
       - name: Build AppImage
         shell: bash
-        if: matrix.build == 'x86_64-linux'
+        if: matrix.build == 'aarch64-linux' || matrix.build == 'x86_64-linux'
         run: |
           mkdir dist
 
@@ -147,8 +147,10 @@ jobs:
             name=${GITHUB_REF:10}
           fi
 
+          build="${{ matrix.build }}"
+
           export VERSION="$name"
-          export ARCH=x86_64
+          export ARCH=${build%-linux}
           export APP=helix
           export OUTPUT="helix-$VERSION-$ARCH.AppImage"
           export UPDATE_INFORMATION="gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|helix|latest|$APP-*-$ARCH.AppImage.zsync"
@@ -245,7 +247,7 @@ jobs:
               mv bins-$platform/hx$exe $pkgname
               chmod +x $pkgname/hx$exe
 
-              if [[ "$platform" = "x86_64-linux" ]]; then
+              if [[ "$platform" = "aarch64-linux" || "$platform" = "x86_64-linux" ]]; then
                   mv bins-$platform/helix-*.AppImage* dist/
               fi
 

From 1fe32737faa5dbe9128427197b20be1768298a17 Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim@nrdxp.dev>
Date: Sun, 4 Sep 2022 17:46:31 -0600
Subject: [PATCH 087/884] nix: fix highlighting rules

* avoid coloring `identifier`s globally
* fix function application when not part of `select_expression`
* add `has_attribute_expression` highlighting
* fix precendence for interpolation, which should be after select
* highlight `@` as delimiter
---
 runtime/queries/nix/highlights.scm | 35 +++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/runtime/queries/nix/highlights.scm b/runtime/queries/nix/highlights.scm
index d5ff4032..ce8e3c1a 100644
--- a/runtime/queries/nix/highlights.scm
+++ b/runtime/queries/nix/highlights.scm
@@ -1,16 +1,20 @@
 (comment) @comment
 
+"assert" @keyword.control.exception
+"or" @keyword.operator
+"rec" @keyword.control.repeat
+
 [
   "if" 
   "then"
   "else"
+] @keyword.control.conditional
+
+[
   "let"
   "inherit"
   "in"
-  "rec"
   "with" 
-  "assert"
-  "or"
 ] @keyword
 
 ((identifier) @variable.builtin
@@ -42,14 +46,11 @@
 (integer_expression) @constant.numeric.integer
 (float_expression) @constant.numeric.float
 
-(interpolation
-  "${" @punctuation.special
-  "}" @punctuation.special) @embedded
-
 (escape_sequence) @constant.character.escape
 
 (function_expression
   universal: (identifier) @variable.parameter
+  "@"? @punctuation.delimiter
 )
 
 (formal
@@ -57,11 +58,15 @@
   "?"? @punctuation.delimiter)
 
 (select_expression
-  attrpath: (attrpath (identifier)) @variable.other.member)
+  attrpath: (attrpath attr: (identifier)) @variable.other.member)
+
+(interpolation
+  "${" @punctuation.special
+  "}" @punctuation.special) @embedded
 
 (apply_expression
   function: [
-    (variable_expression (identifier)) @function
+    (variable_expression name: (identifier) @function)
     (select_expression
       attrpath: (attrpath
         attr: (identifier) @function .))])
@@ -72,14 +77,18 @@
 (binary_expression
   operator: _ @operator)
 
-(variable_expression (identifier) @variable)
+(variable_expression name: (identifier) @variable)
 
 (binding
-  attrpath: (attrpath (identifier)) @variable.other.member)
+  attrpath: (attrpath attr: (identifier)) @variable.other.member)
 
-(identifier) @variable.other.member
+(inherit_from attrs: (inherited_attrs attr: (identifier) @variable))
 
-(inherit_from attrs: (inherited_attrs attr: (identifier) @variable.other.member) )
+(has_attr_expression
+  expression: (_)
+  "?" @operator
+  attrpath: (attrpath
+    attr: (identifier) @variable.other.member))
 
 [
   ";"

From 301f5d7cf704c2f2e4fc53e258125e39d1845176 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 6 Sep 2022 22:45:51 -0500
Subject: [PATCH 088/884] Fix Rust attribute highlights (#3729)

---
 runtime/queries/rust/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm
index 39a764a6..78a7abf0 100644
--- a/runtime/queries/rust/highlights.scm
+++ b/runtime/queries/rust/highlights.scm
@@ -258,6 +258,9 @@
 ; ---
 (meta_item
   (identifier) @function.macro)
+(attr_item
+  (identifier) @function.macro
+  (token_tree (identifier) @function.macro)?)
 
 (inner_attribute_item) @attribute
 

From fe37a66046b16eaf7829606f7b90c18bd73fae3e Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Wed, 7 Sep 2022 10:22:48 +0300
Subject: [PATCH 089/884] Handle formatter errors, and save anyway (#3684)

If formatting fails, report error to log and save without formatting.
---
 helix-view/src/document.rs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 3f8dc4e6..a0d50440 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -543,12 +543,19 @@ impl Document {
             }
 
             if let Some(fmt) = formatting {
-                let transaction = fmt.await?;
-                let success = transaction.changes().apply(&mut text);
-                if !success {
-                    // This shouldn't happen, because the transaction changes were generated
-                    // from the same text we're saving.
-                    log::error!("failed to apply format changes before saving");
+                match fmt.await {
+                    Ok(transaction) => {
+                        let success = transaction.changes().apply(&mut text);
+                        if !success {
+                            // This shouldn't happen, because the transaction changes were generated
+                            // from the same text we're saving.
+                            log::error!("failed to apply format changes before saving");
+                        }
+                    }
+                    Err(err) => {
+                        // formatting failed: report error, and save file without modifications
+                        log::error!("{}", err);
+                    }
                 }
             }
 

From a123fb60572720a5fd0817b194f4d34534f87b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Wed, 7 Sep 2022 16:42:33 +0900
Subject: [PATCH 090/884] Remove LspNotDefined, instead return an Option<>

---
 helix-lsp/src/lib.rs        | 16 +++++-----------
 helix-term/src/ui/editor.rs |  1 +
 helix-view/src/editor.rs    |  1 +
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index 516c93ca..a39325fa 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -38,8 +38,6 @@ pub enum Error {
     Timeout,
     #[error("server closed the stream")]
     StreamClosed,
-    #[error("LSP not defined")]
-    LspNotDefined,
     #[error("Unhandled")]
     Unhandled,
     #[error(transparent)]
@@ -320,14 +318,14 @@ impl Registry {
             .map(|(_, client)| client.as_ref())
     }
 
-    pub fn get(&mut self, language_config: &LanguageConfiguration) -> Result<Arc<Client>> {
+    pub fn get(&mut self, language_config: &LanguageConfiguration) -> Result<Option<Arc<Client>>> {
         let config = match &language_config.language_server {
             Some(config) => config,
-            None => return Err(Error::LspNotDefined),
+            None => return Ok(None),
         };
 
         match self.inner.entry(language_config.scope.clone()) {
-            Entry::Occupied(entry) => Ok(entry.get().1.clone()),
+            Entry::Occupied(entry) => Ok(Some(entry.get().1.clone())),
             Entry::Vacant(entry) => {
                 // initialize a new client
                 let id = self.counter.fetch_add(1, Ordering::Relaxed);
@@ -356,11 +354,7 @@ impl Registry {
                         .await;
 
                     if let Err(e) = value {
-                        if let Error::LspNotDefined = e {
-                            // Skip logging "lsp not defined"
-                        } else {
-                            log::error!("failed to initialize language server: {}", e);
-                        }
+                        log::error!("failed to initialize language server: {}", e);
                         return;
                     }
 
@@ -374,7 +368,7 @@ impl Registry {
                 });
 
                 entry.insert((id, client.clone()));
-                Ok(client)
+                Ok(Some(client))
             }
         }
     }
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 64e95e33..7cb29c3b 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1316,6 +1316,7 @@ impl Component for EditorView {
                 if cx.editor.should_close() {
                     return EventResult::Ignored(None);
                 }
+
                 // if the focused view still exists and wasn't closed
                 if cx.editor.tree.contains(focus) {
                     let config = cx.editor.config();
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index b6947e44..5eff9983 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -853,6 +853,7 @@ impl Editor {
                     )
                 })
                 .ok()
+                .flatten()
         });
         if let Some(language_server) = language_server {
             // only spawn a new lang server if the servers aren't the same

From e14b48af2ebeb84868334e3b3281844353a9371d Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Wed, 7 Sep 2022 20:50:54 +0300
Subject: [PATCH 091/884] Fix :reflow panic by enusring cursor in view (#3733)

---
 helix-term/src/commands/typed.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index ad4e7f4c..f005d9bf 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1324,6 +1324,7 @@ fn reflow(
         return Ok(());
     }
 
+    let scrolloff = cx.editor.config().scrolloff;
     let (view, doc) = current!(cx.editor);
 
     const DEFAULT_MAX_LEN: usize = 79;
@@ -1354,6 +1355,7 @@ fn reflow(
 
     doc.apply(&transaction, view.id);
     doc.append_changes_to_history(view.id);
+    view.ensure_cursor_in_view(doc, scrolloff);
 
     Ok(())
 }

From 5b1113766d5363c2e434ab596fcca64a1c707a55 Mon Sep 17 00:00:00 2001
From: Giorbo <43214182+Giorbo@users.noreply.github.com>
Date: Wed, 7 Sep 2022 20:13:06 +0200
Subject: [PATCH 092/884] Add syntax highlighting for SML (#3692)

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/generated/lang-support.md |  1 +
 languages.toml                     | 12 ++++
 runtime/queries/sml/highlights.scm | 91 ++++++++++++++++++++++++++++++
 3 files changed, 104 insertions(+)
 create mode 100644 runtime/queries/sml/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 4e10ffc1..a66fae21 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -95,6 +95,7 @@
 | scheme | ✓ |  |  |  |
 | scss | ✓ |  |  | `vscode-css-language-server` |
 | slint | ✓ |  | ✓ | `slint-lsp` |
+| sml | ✓ |  |  |  |
 | solidity | ✓ |  |  | `solc` |
 | sql | ✓ |  |  |  |
 | sshclientconfig | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index d3051377..38d9cb55 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1712,3 +1712,15 @@ language-server = { command = "pasls", args = [] }
 [[grammar]]
 name = "pascal"
 source = { git = "https://github.com/Isopod/tree-sitter-pascal", rev = "2fd40f477d3e2794af152618ccfac8d92eb72a66" }
+
+[[language]]
+name = "sml"
+scope = "source.sml"
+injection-regex = "sml"
+file-types = ["sml"]
+comment-token = "(*"
+roots = []
+
+[[grammar]]
+name = "sml"
+source = { git = "https://github.com/Giorbo/tree-sitter-sml", rev = "bd4055d5554614520d4a0706b34dc0c317c6b608" }
diff --git a/runtime/queries/sml/highlights.scm b/runtime/queries/sml/highlights.scm
new file mode 100644
index 00000000..dfbf5caf
--- /dev/null
+++ b/runtime/queries/sml/highlights.scm
@@ -0,0 +1,91 @@
+; Highlights queries from Matthew Fluet (https://github.com/MatthewFluet/tree-sitter-sml)
+;
+; MIT License
+;
+; Copyright (c) 2022 Matthew Fluet
+;
+; Permission is hereby granted, free of charge, to any person obtaining a copy
+; of this software and associated documentation files (the "Software"), to deal
+; in the Software without restriction, including without limitation the rights
+; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+; copies of the Software, and to permit persons to whom the Software is
+; furnished to do so, subject to the following conditions:
+;
+; The above copyright notice and this permission notice shall be included in all
+; copies or substantial portions of the Software.
+;
+; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+; SOFTWARE.
+
+;; *******************************************************************
+;; Comments
+;; *******************************************************************
+
+[(block_comment) (line_comment)] @comment
+
+;; *******************************************************************
+;; Keywords
+;; *******************************************************************
+
+[
+ ;; Reserved Words Core
+ "abstype" "and" "andalso" "as" "case" "datatype" "do" "else" "end"
+ "exception" "fn" "fun" "handle" "if" "in" "infix" "infixr" "let"
+ "local" "nonfix" "of" "op" "open" "orelse" "raise" "rec" "then"
+ "type" "val" "with" "withtype" "while"
+ ;; Reserved Words Modules
+ "eqtype" "functor" "include" "sharing" "sig" "signature" "struct"
+ "structure" "where"
+] @keyword
+
+;; *******************************************************************
+;; Constants
+;; *******************************************************************
+
+(integer_scon) @constant.numeric.integer
+(real_scon) @constant.numeric.float
+(word_scon) @constant.numeric
+(string_scon) @string
+(char_scon) @constant.character
+
+;; *******************************************************************
+;; Types
+;; *******************************************************************
+
+(fn_ty "->" @type)
+(tuple_ty "*" @type)
+(paren_ty ["(" ")"] @type)
+(tyvar_ty (tyvar) @type)
+(record_ty
+ ["{" "," "}"] @type
+ (tyrow [(lab) ":"] @type)?
+ (ellipsis_tyrow ["..." ":"] @type)?)
+(tycon_ty
+ (tyseq ["(" "," ")"] @type)?
+ (longtycon) @type)
+
+;; *******************************************************************
+;; Constructors
+;; *******************************************************************
+
+;; Assume value identifiers starting with capital letter are constructors
+((vid) @constructor
+ (#match? @constructor "^[A-Z].*"))
+
+((vid) @constant.builtin (#eq? @constant.builtin "nil"))
+((vid) @constant.builtin.boolean
+ (#match? @constant.builtin.boolean "^(true|false)$"))
+((vid) @operator (#eq? @operator "::"))
+((vid) @keyword.storage.modifier (#eq? @keyword.storage.modifier "ref"))
+
+;; *******************************************************************
+;; Punctuation
+;; *******************************************************************
+
+["(" ")" "[" "]" "{" "}"] @punctuation.bracket
+["." "," ":" ";" "|" "=>" ":>"] @punctuation.delimiter

From 16ce036bdf3a7899d14d62bc46bbc9a8b5fa99e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Cortier?= <bcortier@proton.me>
Date: Wed, 7 Sep 2022 16:29:41 -0400
Subject: [PATCH 093/884] Add good default rulers when editing git messages
 (#3738)

Around 50 columns for the summary is good because it is often used as
heading or as subject in emails. 72 columns for the body is generally
good because some tools do not wrap long lines (`git log` with pager
`less` is a good example). Helix's `:reflow` command is really good to
help with the second point.

Linux kernel documentation says:

> For these reasons, the ``summary`` must be no more than 70-75
> characters, and it must describe both what the patch changes, as well
> as why the patch might be necessary.  It is challenging to be both
> succinct and descriptive, but that is what a well-written summary
> should do.

Source:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst#n627

tpope:
https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html

Commit message style guide for Git:
https://commit.style/
---
 languages.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/languages.toml b/languages.toml
index 38d9cb55..c7bc982d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -972,6 +972,8 @@ roots = []
 file-types = ["COMMIT_EDITMSG"]
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
+rulers = [50, 72]
+max-line-length = 72
 
 [[grammar]]
 name = "git-commit"

From 5ab85283e944b9b0409c70953c7655b9c5f84067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= <matousdzivjak@gmail.com>
Date: Thu, 8 Sep 2022 16:04:18 +0200
Subject: [PATCH 094/884] feat(languages): jsonnet (#3714)

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/generated/lang-support.md     |  1 +
 languages.toml                         | 12 ++++++++
 runtime/queries/jsonnet/highlights.scm | 38 ++++++++++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 runtime/queries/jsonnet/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index a66fae21..88c9df91 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -53,6 +53,7 @@
 | javascript | ✓ | ✓ | ✓ | `typescript-language-server` |
 | jsdoc | ✓ |  |  |  |
 | json | ✓ |  | ✓ | `vscode-json-language-server` |
+| jsonnet | ✓ |  |  |  |
 | jsx | ✓ | ✓ | ✓ | `typescript-language-server` |
 | julia | ✓ |  |  | `julia` |
 | kotlin | ✓ |  |  | `kotlin-language-server` |
diff --git a/languages.toml b/languages.toml
index c7bc982d..12f02781 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1726,3 +1726,15 @@ roots = []
 [[grammar]]
 name = "sml"
 source = { git = "https://github.com/Giorbo/tree-sitter-sml", rev = "bd4055d5554614520d4a0706b34dc0c317c6b608" }
+
+[[language]]
+name = "jsonnet"
+scope = "source.jsonnet"
+file-types = ["libsonnet", "jsonnet"]
+roots = []
+comment-token = "//"
+indent = { tab-width = 2, unit = "  " }
+
+[[grammar]]
+name = "jsonnet"
+source = { git = "https://github.com/sourcegraph/tree-sitter-jsonnet", rev = "0475a5017ad7dc84845d1d33187f2321abcb261d" }
diff --git a/runtime/queries/jsonnet/highlights.scm b/runtime/queries/jsonnet/highlights.scm
new file mode 100644
index 00000000..f54e7d5c
--- /dev/null
+++ b/runtime/queries/jsonnet/highlights.scm
@@ -0,0 +1,38 @@
+["if" "then" "else"] @keyword.control.conditional
+[
+  (local)
+  "function"
+] @keyword
+(comment) @comment
+
+(string) @string
+(number) @constant.numeric
+[
+  (true)
+  (false)
+] @constant.builtin.boolean
+
+(binaryop) @operator
+(unaryop) @operator
+
+(param identifier: (id) @variable.parameter)
+(bind function: (id) @function)
+(fieldname (id) @variable.other.member)
+[
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+"for" @keyword.control.repeat
+"in" @keyword.operator
+[(self) (dollar)] @variable.builtin
+"assert" @keyword
+(null) @constant.builtin
+[
+  ":"
+  "::"
+  ";"
+  "="
+] @punctuation.delimiter
+(id) @variable

From e12690e2f5c881db731bc8e7efe8554d5d423e78 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Sat, 3 Sep 2022 14:22:17 -0400
Subject: [PATCH 095/884] Remove default insert mode movement bindings

Helix is first and foremost a modal editor. Willingness to support non-modal
editing is there, but it is not one that should be encouraged with the default
settings. There are an increasing number of users who are stumbling because
they are trying to use Helix as a non-modal editor, so this is an effort to
encourage new users to stop and take notice that Helix has a different paradigm
than VSCode, Sublime, etc. Users can still add these bindings back to their own
configs if they wish.
---
 book/src/keymap.md               | 34 +++++++++++++++++---------------
 helix-term/src/keymap/default.rs | 19 ------------------
 2 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 698b504c..da4433f3 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -315,10 +315,12 @@ Mappings in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaire
 
 ## Insert Mode
 
-We support many readline/emacs style bindings in insert mode for
-convenience. These can be helpful for making simple modifications
-without escaping to normal mode, but beware that you will not have an
-undo-able "save point" until you return to normal mode.
+Insert mode bindings are somewhat minimal by default. Helix is designed to
+be a modal editor, and this is reflected in the user experience and internal
+mechanics. For example, changes to the text are only saved for undos when
+escaping from insert mode to normal mode. For this reason, new users are
+strongly encouraged to learn the modal editing paradigm to get the smoothest
+experience.
 
 | Key                                         | Description                 | Command                 |
 | -----                                       | -----------                 | -------                 |
@@ -327,23 +329,23 @@ undo-able "save point" until you return to normal mode.
 | `Ctrl-r`                                    | Insert a register content   | `insert_register`       |
 | `Ctrl-w`, `Alt-Backspace`, `Ctrl-Backspace` | Delete previous word        | `delete_word_backward`  |
 | `Alt-d`, `Alt-Delete`, `Ctrl-Delete`        | Delete next word            | `delete_word_forward`   |
-| `Alt-b`, `Ctrl-Left`                        | Backward a word             | `move_prev_word_end`    |
-| `Ctrl-b`, `Left`                            | Backward a char             | `move_char_left`        |
-| `Alt-f`, `Ctrl-Right`                       | Forward a word              | `move_next_word_start`  |
-| `Ctrl-f`, `Right`                           | Forward a char              | `move_char_right`       |
-| `Ctrl-e`, `End`                             | Move to line end            | `goto_line_end_newline` |
-| `Ctrl-a`, `Home`                            | Move to line start          | `goto_line_start`       |
 | `Ctrl-u`                                    | Delete to start of line     | `kill_to_line_start`    |
 | `Ctrl-k`                                    | Delete to end of line       | `kill_to_line_end`      |
 | `Ctrl-j`, `Enter`                           | Insert new line             | `insert_newline`        |
 | `Backspace`, `Ctrl-h`                       | Delete previous char        | `delete_char_backward`  |
 | `Delete`, `Ctrl-d`                          | Delete next char            | `delete_char_forward`   |
-| `Ctrl-p`, `Up`                              | Move to previous line       | `move_line_up`          |
-| `Ctrl-n`, `Down`                            | Move to next line           | `move_line_down`        |
-| `PageUp`                                    | Move one page up            | `page_up`               |
-| `PageDown`                                  | Move one page down          | `page_down`             |
-| `Alt->`                                     | Go to end of buffer         | `goto_file_end`         |
-| `Alt-<`                                     | Go to start of buffer       | `goto_file_start`       |
+
+However, if you really want navigation in insert mode, this is supported. An
+example config that gives the ability to use arrow keys while still in insert
+mode:
+
+```toml
+[keys.insert]
+up = "move_line_up"
+down = "move_line_down"
+left = "move_char_left"
+right = "move_char_right"
+```
 
 ## Select / extend mode
 
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index fd7ea457..f07d4028 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -355,25 +355,6 @@ pub fn default() -> HashMap<Mode, Keymap> {
         "A-del" => delete_word_forward,
         "C-s" => commit_undo_checkpoint,
 
-        "left" => move_char_left,
-        "C-b" => move_char_left,
-        "down" => move_line_down,
-        "up" => move_line_up,
-        "right" => move_char_right,
-        "C-f" => move_char_right,
-        "A-b" => move_prev_word_end,
-        "C-left" => move_prev_word_end,
-        "A-f" => move_next_word_start,
-        "C-right" => move_next_word_start,
-        "A-<" => goto_file_start,
-        "A->" => goto_file_end,
-        "pageup" => page_up,
-        "pagedown" => page_down,
-        "home" => goto_line_start,
-        "C-a" => goto_line_start,
-        "end" => goto_line_end_newline,
-        "C-e" => goto_line_end_newline,
-
         "C-k" => kill_to_line_end,
         "C-u" => kill_to_line_start,
 

From 8a1047c844c9e84ad2a171473438236b6ad1a947 Mon Sep 17 00:00:00 2001
From: Akseli <akselmo@akselmo.dev>
Date: Fri, 9 Sep 2022 02:29:36 +0300
Subject: [PATCH 096/884] Add "markdown" as a possible filetype (#3749)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 12f02781..3082c127 100644
--- a/languages.toml
+++ b/languages.toml
@@ -904,7 +904,7 @@ source = { git = "https://github.com/Flakebi/tree-sitter-tablegen", rev = "568dd
 name = "markdown"
 scope = "source.md"
 injection-regex = "md|markdown"
-file-types = ["md"]
+file-types = ["md", "markdown"]
 roots = []
 indent = { tab-width = 2, unit = "  " }
 

From 7210b39587be031621a4a77b1866bbdbc6646992 Mon Sep 17 00:00:00 2001
From: ChemicalXandco <32775248+ChemicalXandco@users.noreply.github.com>
Date: Fri, 9 Sep 2022 00:36:03 +0100
Subject: [PATCH 097/884] change to openscad-lsp (#3750)

---
 book/src/generated/lang-support.md | 2 +-
 languages.toml                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 88c9df91..738bd5ec 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -75,7 +75,7 @@
 | ocaml | ✓ |  | ✓ | `ocamllsp` |
 | ocaml-interface | ✓ |  |  | `ocamllsp` |
 | odin | ✓ |  |  | `ols` |
-| openscad | ✓ |  |  | `openscad-language-server` |
+| openscad | ✓ |  |  | `openscad-lsp` |
 | org | ✓ |  |  |  |
 | pascal | ✓ | ✓ |  | `pasls` |
 | perl | ✓ | ✓ | ✓ |  |
diff --git a/languages.toml b/languages.toml
index 3082c127..7b4737cf 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1523,7 +1523,7 @@ injection-regex = "openscad"
 file-types = ["scad"]
 roots = []
 comment-token = "//"
-language-server = { command = "openscad-language-server" }
+language-server = { command = "openscad-lsp", args = ["--stdio"] }
 indent = { tab-width = 2, unit = "\t" }
 
 [[grammar]]

From 76b3f502c40913cb73096720bc9702c0a5242a5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= <matousdzivjak@gmail.com>
Date: Thu, 8 Sep 2022 20:16:11 +0200
Subject: [PATCH 098/884] feat(lsp): jsonnet-language-server

Add jsonnet-language-server for jsonnet language.
See: https://github.com/grafana/jsonnet-language-server
---
 book/src/generated/lang-support.md | 2 +-
 languages.toml                     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 738bd5ec..ca7c1248 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -53,7 +53,7 @@
 | javascript | ✓ | ✓ | ✓ | `typescript-language-server` |
 | jsdoc | ✓ |  |  |  |
 | json | ✓ |  | ✓ | `vscode-json-language-server` |
-| jsonnet | ✓ |  |  |  |
+| jsonnet | ✓ |  |  | `jsonnet-language-server` |
 | jsx | ✓ | ✓ | ✓ | `typescript-language-server` |
 | julia | ✓ |  |  | `julia` |
 | kotlin | ✓ |  |  | `kotlin-language-server` |
diff --git a/languages.toml b/languages.toml
index 7b4737cf..417c8280 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1734,6 +1734,7 @@ file-types = ["libsonnet", "jsonnet"]
 roots = []
 comment-token = "//"
 indent = { tab-width = 2, unit = "  " }
+language-server = { command = "jsonnet-language-server", args= ["-t"] }
 
 [[grammar]]
 name = "jsonnet"

From 321cce3f13b2609f7d7d4fc3bef4257809acf484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= <matousdzivjak@gmail.com>
Date: Thu, 8 Sep 2022 23:10:24 +0200
Subject: [PATCH 099/884] enable lint option

Enable lint option to highlight unused vars, etc.
and take full advantage of the running language server.
---
 languages.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/languages.toml b/languages.toml
index 417c8280..15fbe7fb 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1731,10 +1731,10 @@ source = { git = "https://github.com/Giorbo/tree-sitter-sml", rev = "bd4055d5554
 name = "jsonnet"
 scope = "source.jsonnet"
 file-types = ["libsonnet", "jsonnet"]
-roots = []
+roots = ["jsonnetfile.json"]
 comment-token = "//"
 indent = { tab-width = 2, unit = "  " }
-language-server = { command = "jsonnet-language-server", args= ["-t"] }
+language-server = { command = "jsonnet-language-server", args= ["-t", "--lint"] }
 
 [[grammar]]
 name = "jsonnet"

From fae9203c3efd4dee4ac0234090ab9c3163c3e4f7 Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <socvirnyl.estela@gmail.com>
Date: Fri, 9 Sep 2022 08:02:06 +0800
Subject: [PATCH 100/884] Add papercolor dark variant (#3742)

---
 runtime/themes/papercolor-dark.toml | 118 ++++++++++++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 runtime/themes/papercolor-dark.toml

diff --git a/runtime/themes/papercolor-dark.toml b/runtime/themes/papercolor-dark.toml
new file mode 100644
index 00000000..20950469
--- /dev/null
+++ b/runtime/themes/papercolor-dark.toml
@@ -0,0 +1,118 @@
+# Palette based on https://github.com/NLKNguyen/papercolor-theme
+# Author: Soc Virnyl Estela <socvirnyl.estela@gmail.com>
+
+"ui.linenr.selected" = { fg = "linenr_fg_selected" }
+"ui.background" = {bg="background"}
+"ui.text" = "foreground"
+"ui.text.focus" = { fg = "selection_background", modifiers = ["bold"]}
+"ui.selection" = {bg="selection_background", fg="selection_foreground"}
+"ui.cursorline" = {bg="cursorline_background"}
+"ui.statusline" = {bg="paper_bar_bg", fg="regular0"}
+"ui.statusline.select" = {bg="background", fg="bright7"}
+"ui.statusline.normal" = {bg="background", fg="bright3"}
+"ui.statusline.inactive" = {bg="background", fg="bright0"}
+"ui.virtual.whitespace" = { fg = "regular5" }
+"ui.virtual.ruler" = {bg="cursorline_background"}
+"ui.cursor.match" = {bg = "regular5", fg = "regular0"}
+"ui.cursor" = {bg = "regular5", fg = "background"}
+"ui.window" = {bg = "#303030", fg = "bright2"}
+"ui.help" = {bg = "background", fg = "bright2"}
+"ui.popup" = {bg = "#303030", fg = "bright6"}
+"ui.menu" = {bg = "#303030", fg = "bright6"}
+"ui.menu.selected" = {bg = "#C6C6C6", fg="selection_foreground"}
+
+"markup.heading" = { fg = "regular4", modifiers = ["bold"] }
+"markup.heading.1" = { fg = "bright2", modifiers = ["bold"] }
+"markup.heading.2" = { fg = "bright5", modifiers = ["bold"] }
+"markup.heading.3" = { fg = "bright3", modifiers = ["bold"] }
+"markup.heading.4" = { fg = "bright5", modifiers = ["bold"] }
+"markup.heading.5" = { fg = "bright5", modifiers = ["bold"] }
+"markup.heading.6" = { fg = "bright5", modifiers = ["bold"] }
+"markup.list" = "bright3"
+"markup.bold" = { fg = "foreground", modifiers = ["bold"] }
+"markup.italic" = { fg = "bright0", modifiers = ["italic"] }
+"markup.link.url" = { fg = "bright6", modifiers = ["underlined"] }
+"markup.link.text" = "bright2"
+"markup.link.label" = { fg = "regular2", modifiers = ["bold"] }
+"markup.raw" = "foreground"
+
+"string" = "foreground"
+"attribute" = "bright7"
+"keyword" = { fg = "regular4", modifiers = ["bold"]}
+"keyword.directive" = "regular4"
+"keyword.control.conditional" = "bright3"
+"keyword.function" = "regular4"
+"namespace" = "bright1"
+"type" = "bright2"
+"type.builtin" = { fg = "foreground", modifiers = ["bold"]}
+"variable" = "foreground"
+"variable.builtin" = "cyan"
+"variable.other.member" = "cyan"
+"variable.parameter" = "foreground"
+
+"special" = "#3E999F"
+"function"  = "bright6"
+"constructor" = "regular4"
+"function.builtin" = { fg = "foreground", modifiers = ["bold"]}
+"function.macro" = { fg = "regular4", modifiers = ["bold"] }
+"comment" = { fg = "#686868", modifiers = ["dim"] }
+"ui.linenr" = { fg = "bright0" }
+"module" = "regular4"
+"constant" = "bright5"
+"constant.builtin" = "bright6"
+"constant.numeric" = "bright5"
+"constant.character.escape" = { fg = "foreground", modifiers = ["bold"]}
+"operator" = { fg = "regular4", modifiers = ["bold"]}
+
+"label" = { fg = "selection_background", modifiers = ["bold", "italic"] }
+
+"diff.plus" = "regular2"
+"diff.delta" = "regular6"
+"diff.minus" = "regular1"
+
+"warning" = "bright4"
+"error" = "regular1"
+"info" = "bright4"
+diagnostic = { modifiers = ["bold", "underlined"]}
+
+
+[palette]
+background="#1c1c1c"
+foreground="#d0d0d0"
+regular0="#1c1c1c"
+regular1="#af005f"
+regular2="#5faf00"
+regular3="#d7af5f"
+regular4="#5fafd7"
+regular5="#808080"
+regular6="#d7875f"
+regular7="#d0d0d0"
+bright0="#585858"
+bright1="#5faf5f"
+bright2="#afd700"
+bright3="#af87d7"
+bright4="#FFAF00"
+bright5="#ff5faf"
+bright6="#00afaf"
+bright7="#5f8787"
+selection_foreground="#585858"
+selection_background="#8787AF"
+cursorline_background="#d0d0d0"
+paper_bar_bg="#5F8787"
+black="#1c1c1c"
+red="#af005f"
+green="#5faf00"
+yellow="#d7af5f"
+blue="#5fafd7"
+magenta="#808080"
+cyan="#d7875f"
+gray="#d0d0d0"
+light-red="#5faf5f"
+light-green="#afd700"
+light-yellow="#af87d7"
+light-blue="#FFAF00"
+light-magenta="#ff5faf"
+light-cyan="#00afaf"
+light-gray="#5f8787"
+white="#808080"
+linenr_fg_selected="#FFFF00"

From 01ee42bb149adee2fe17561806d9525370c84ef4 Mon Sep 17 00:00:00 2001
From: Evan Richter <evanjrichter@gmail.com>
Date: Sat, 10 Sep 2022 00:14:03 -0500
Subject: [PATCH 101/884] ordinals instead of indexes when listing grammar
 fetch errors (#3773)

---
 helix-loader/src/grammar.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-loader/src/grammar.rs b/helix-loader/src/grammar.rs
index 98a93e56..eb1895a5 100644
--- a/helix-loader/src/grammar.rs
+++ b/helix-loader/src/grammar.rs
@@ -139,7 +139,7 @@ pub fn fetch_grammars() -> Result<()> {
         let len = errors.len();
         println!("{} grammars failed to fetch", len);
         for (i, error) in errors.into_iter().enumerate() {
-            println!("\tFailure {}/{}: {}", i, len, error);
+            println!("\tFailure {}/{}: {}", i + 1, len, error);
         }
     }
 

From cc47d3fb9d048b7fe2546409a492f27f6199adf5 Mon Sep 17 00:00:00 2001
From: A-Walrus <ofek.r.guy@gmail.com>
Date: Mon, 8 Aug 2022 22:03:41 +0300
Subject: [PATCH 102/884] Add `text` to language completer

---
 helix-term/src/ui/mod.rs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 01ffe243..60ad3b24 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -330,13 +330,19 @@ pub mod completers {
     pub fn language(editor: &Editor, input: &str) -> Vec<Completion> {
         let matcher = Matcher::default();
 
-        let mut matches: Vec<_> = editor
+        let text: String = "text".into();
+
+        let language_ids = editor
             .syn_loader
             .language_configs()
-            .filter_map(|config| {
+            .map(|config| &config.language_id)
+            .chain(std::iter::once(&text));
+
+        let mut matches: Vec<_> = language_ids
+            .filter_map(|language_id| {
                 matcher
-                    .fuzzy_match(&config.language_id, input)
-                    .map(|score| (&config.language_id, score))
+                    .fuzzy_match(language_id, input)
+                    .map(|score| (language_id, score))
             })
             .collect();
 

From e8add6f46d0f208c96407151276a985dd34fc93f Mon Sep 17 00:00:00 2001
From: A-Walrus <ofek.r.guy@gmail.com>
Date: Mon, 8 Aug 2022 22:04:41 +0300
Subject: [PATCH 103/884] Add error handling to set language command

If you type a nonexistant language an appropriate message will show,
and the language won't be changed.
---
 helix-term/src/commands/typed.rs | 11 ++++++++++-
 helix-view/src/document.rs       |  6 +++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index f005d9bf..127eea0d 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1253,7 +1253,16 @@ fn language(
     }
 
     let doc = doc_mut!(cx.editor);
-    doc.set_language_by_language_id(&args[0], cx.editor.syn_loader.clone());
+
+    let loader = cx.editor.syn_loader.clone();
+    if args[0] == "text" {
+        doc.set_language(None, Some(loader))
+    } else {
+        let ok = doc.set_language_by_language_id(&args[0], loader);
+        if !ok {
+            anyhow::bail!("invalid language: {}", args[0]);
+        }
+    }
     doc.detect_indent_and_line_ending();
 
     let id = doc.id();
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index a0d50440..84c92320 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -683,9 +683,13 @@ impl Document {
         &mut self,
         language_id: &str,
         config_loader: Arc<syntax::Loader>,
-    ) {
+    ) -> bool {
         let language_config = config_loader.language_config_for_language_id(language_id);
+        if language_config.is_none() {
+            return false;
+        }
         self.set_language(language_config, Some(config_loader));
+        true
     }
 
     /// Set the LSP.

From 75e6a6432747eae6d2255afc52f20ced6902519b Mon Sep 17 00:00:00 2001
From: A-Walrus <ofek.r.guy@gmail.com>
Date: Tue, 9 Aug 2022 10:43:27 +0300
Subject: [PATCH 104/884] Switch to Result for invalid language

---
 helix-term/src/commands/typed.rs |  8 ++------
 helix-view/src/document.rs       | 13 ++++++-------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 127eea0d..674ce7a6 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1254,14 +1254,10 @@ fn language(
 
     let doc = doc_mut!(cx.editor);
 
-    let loader = cx.editor.syn_loader.clone();
     if args[0] == "text" {
-        doc.set_language(None, Some(loader))
+        doc.set_language(None, None)
     } else {
-        let ok = doc.set_language_by_language_id(&args[0], loader);
-        if !ok {
-            anyhow::bail!("invalid language: {}", args[0]);
-        }
+        doc.set_language_by_language_id(&args[0], cx.editor.syn_loader.clone())?;
     }
     doc.detect_indent_and_line_ending();
 
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 84c92320..8ebc9002 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -683,13 +683,12 @@ impl Document {
         &mut self,
         language_id: &str,
         config_loader: Arc<syntax::Loader>,
-    ) -> bool {
-        let language_config = config_loader.language_config_for_language_id(language_id);
-        if language_config.is_none() {
-            return false;
-        }
-        self.set_language(language_config, Some(config_loader));
-        true
+    ) -> anyhow::Result<()> {
+        let language_config = config_loader
+            .language_config_for_language_id(language_id)
+            .ok_or_else(|| anyhow!("invalid language id: {}", language_id))?;
+        self.set_language(Some(language_config), Some(config_loader));
+        Ok(())
     }
 
     /// Set the LSP.

From 9c627c65e55ab71e236d70406feb5d55bd8703bb Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Sat, 10 Sep 2022 16:32:49 +0300
Subject: [PATCH 105/884] Improve error handling for config-reload (#3668)

* Don't change config to default when refreshing invalid config

* Propely handle theme errors with config-reload

* Extract refresh theme into seperate function
---
 helix-term/src/application.rs | 48 +++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 9653b373..ec698321 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -366,29 +366,39 @@ impl Application {
         self.editor.refresh_config();
     }
 
-    fn refresh_config(&mut self) {
-        let config = Config::load_default().unwrap_or_else(|err| {
-            self.editor.set_error(err.to_string());
-            Config::default()
-        });
-
-        // Refresh theme
+    /// Refresh theme after config change
+    fn refresh_theme(&mut self, config: &Config) {
         if let Some(theme) = config.theme.clone() {
             let true_color = self.true_color();
-            self.editor.set_theme(
-                self.theme_loader
-                    .load(&theme)
-                    .map_err(|e| {
-                        log::warn!("failed to load theme `{}` - {}", theme, e);
-                        e
-                    })
-                    .ok()
-                    .filter(|theme| (true_color || theme.is_16_color()))
-                    .unwrap_or_else(|| self.theme_loader.default_theme(true_color)),
-            );
+            match self.theme_loader.load(&theme) {
+                Ok(theme) => {
+                    if true_color || theme.is_16_color() {
+                        self.editor.set_theme(theme);
+                    } else {
+                        self.editor
+                            .set_error("theme requires truecolor support, which is not available");
+                    }
+                }
+                Err(err) => {
+                    let err_string = format!("failed to load theme `{}` - {}", theme, err);
+                    self.editor.set_error(err_string);
+                }
+            }
         }
+    }
 
-        self.config.store(Arc::new(config));
+    fn refresh_config(&mut self) {
+        match Config::load_default() {
+            Ok(config) => {
+                self.refresh_theme(&config);
+
+                // Store new config
+                self.config.store(Arc::new(config));
+            }
+            Err(err) => {
+                self.editor.set_error(err.to_string());
+            }
+        }
     }
 
     fn true_color(&self) -> bool {

From 29fe0c3862a6bf549101c621f72502cc1e7b2631 Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Sat, 10 Sep 2022 22:35:35 +0900
Subject: [PATCH 106/884] Enable CI builds for `riscv64-linux` (#3685)

---
 .github/workflows/release.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7d723b98..66be880e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -54,6 +54,11 @@ jobs:
           rust: stable
           target: aarch64-unknown-linux-gnu
           cross: true
+        - build: riscv64-linux
+          os: ubuntu-20.04
+          rust: stable
+          target: riscv64gc-unknown-linux-gnu
+          cross: true
         - build: x86_64-macos
           os: macos-latest
           rust: stable

From 0090a2d86fd573127d28ce99546e200579390d9b Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Mon, 20 Jun 2022 12:31:14 +0900
Subject: [PATCH 107/884] chore(ci): support "preview" release CI runs

Expands the trigger sources of the release CI workflow (`release.yml`),
allowing the developers to test changes to `.github/workflows/release.yml`
easily. The new trigger sources start the workflow in a "preview" mode, in
which it publishes build outputs as a CI artifact instead of creating a new
release so that they can be manually inspected.

The following events trigger the preview mode:

- Pushing to any branch matching the glob pattern `patch/ci-release-*`.
- Opening a pull request that modifies `.github/workflows/release.yml`.
- Pushing versioning tags to a forked repository.
---
 .github/workflows/release.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 66be880e..c9510ec0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,6 +4,18 @@ on:
     tags:
     - '[0-9]+.[0-9]+'
     - '[0-9]+.[0-9]+.[0-9]+'
+    branches:
+    - 'patch/ci-release-*'
+  pull_request:
+    paths:
+    - '.github/workflows/release.yml'
+
+env:
+  # Preview mode: Publishes the build output as a CI artifact instead of creating
+  # a release, allowing for manual inspection of the output. This mode is
+  # activated if the CI run was triggered by events other than pushed tags, or
+  # if the repository is a fork.
+  preview: ${{ !startsWith(github.ref, 'refs/tags/') || github.repository != 'helix-editor/helix' }}
 
 jobs:
   fetch-grammars:
@@ -268,9 +280,17 @@ jobs:
 
       - name: Upload binaries to release
         uses: svenstaro/upload-release-action@v2
+        if: env.preview == 'false'
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: dist/*
           file_glob: true
           tag: ${{ steps.tagname.outputs.val }}
           overwrite: true
+      
+      - name: Upload binaries as artifact
+        uses: actions/upload-artifact@v2
+        if: env.preview == 'true'
+        with:
+          name: release
+          path: dist/*

From 02d6102540eb1d3d2ffda0e2050f65d0daf97258 Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Sat, 10 Sep 2022 13:15:49 +0900
Subject: [PATCH 108/884] chore(ci): upgrade `actions/upload-artifact` to v3

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c9510ec0..481e7b32 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -289,7 +289,7 @@ jobs:
           overwrite: true
       
       - name: Upload binaries as artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: env.preview == 'true'
         with:
           name: release

From 5489c9ad4e66af24165b9bc6d37a05275ccd19b4 Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Sat, 10 Sep 2022 17:36:53 +0900
Subject: [PATCH 109/884] chore: rename `.cargo/{config -> config.toml}`

---
 .cargo/{config => config.toml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .cargo/{config => config.toml} (100%)

diff --git a/.cargo/config b/.cargo/config.toml
similarity index 100%
rename from .cargo/config
rename to .cargo/config.toml

From 54e78dd24f2cfcf98a974d6f4d5846cc1cb5c9eb Mon Sep 17 00:00:00 2001
From: Erasin <erasinoo@gmail.com>
Date: Sat, 10 Sep 2022 21:45:52 +0800
Subject: [PATCH 110/884] Add godot resource support (#3759)

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/generated/lang-support.md            |  1 +
 languages.toml                                | 15 ++++++++++
 runtime/queries/godot-resource/highlights.scm | 28 +++++++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 runtime/queries/godot-resource/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index ca7c1248..70609464 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -38,6 +38,7 @@
 | gleam | ✓ | ✓ |  | `gleam` |
 | glsl | ✓ | ✓ | ✓ |  |
 | go | ✓ | ✓ | ✓ | `gopls` |
+| godot-resource | ✓ |  |  |  |
 | gomod | ✓ |  |  | `gopls` |
 | gotmpl | ✓ |  |  | `gopls` |
 | gowork | ✓ |  |  | `gopls` |
diff --git a/languages.toml b/languages.toml
index 15fbe7fb..1a3be93c 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1333,6 +1333,21 @@ indent = { tab-width = 4, unit = "    " }
 name = "gdscript"
 source = { git = "https://github.com/PrestonKnopp/tree-sitter-gdscript", rev = "2a6abdaa47fcb91397e09a97c7433fd995ea46c6" }
 
+[[language]]
+name = "godot-resource"
+scope = "source.tscn"
+injection-regex = "godot"
+file-types = ["tscn","tres"]
+shebangs = []
+roots = ["project.godot"]
+auto-format = false
+comment-token = "#"
+indent = { tab-width = 4, unit = "\t" }
+
+[[grammar]]
+name = "godot-resource"
+source = { git = "https://github.com/PrestonKnopp/tree-sitter-godot-resource", rev = "b6ef0768711086a86b3297056f9ffb5cc1d77b4a" }
+
 [[language]]
 name = "nu"
 scope = "source.nu"
diff --git a/runtime/queries/godot-resource/highlights.scm b/runtime/queries/godot-resource/highlights.scm
new file mode 100644
index 00000000..18dae41f
--- /dev/null
+++ b/runtime/queries/godot-resource/highlights.scm
@@ -0,0 +1,28 @@
+(section (identifier) @type.builtin)
+
+(attribute (identifier) @attribute)
+(property (path) @variable.other.member)
+(constructor (identifier) @constructor)
+
+(string) @string
+(integer) @constant.numeric.integer
+(float) @constant.numeric.float
+
+(true) @constant.builtin.boolean
+(false) @constant.builtin.boolean
+
+[
+  "["
+  "]"
+] @tag
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+] @punctuation.bracket
+
+"=" @operator
+
+(ERROR) @error
\ No newline at end of file

From a15420ed1c3b46df0dade6ec6d05a0e4b26e06e0 Mon Sep 17 00:00:00 2001
From: Erasin <erasinoo@gmail.com>
Date: Sat, 10 Sep 2022 21:47:08 +0800
Subject: [PATCH 111/884] Add textobject for gdscript (#3760)

---
 book/src/generated/lang-support.md       |  2 +-
 languages.toml                           |  2 +-
 runtime/queries/gdscript/highlights.scm  |  5 +++++
 runtime/queries/gdscript/textobjects.scm | 17 +++++++++++++++++
 4 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 runtime/queries/gdscript/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 70609464..37ceec16 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -29,7 +29,7 @@
 | esdl | ✓ |  |  |  |
 | fish | ✓ | ✓ | ✓ |  |
 | fortran | ✓ |  | ✓ | `fortls` |
-| gdscript | ✓ |  |  |  |
+| gdscript | ✓ | ✓ |  |  |
 | git-attributes | ✓ |  |  |  |
 | git-commit | ✓ |  |  |  |
 | git-config | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 1a3be93c..83e4affd 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1327,7 +1327,7 @@ shebangs = []
 roots = ["project.godot"]
 auto-format = true
 comment-token = "#"
-indent = { tab-width = 4, unit = "    " }
+indent = { tab-width = 4, unit = "\t" }
 
 [[grammar]]
 name = "gdscript"
diff --git a/runtime/queries/gdscript/highlights.scm b/runtime/queries/gdscript/highlights.scm
index 0849eedb..f36f4e35 100644
--- a/runtime/queries/gdscript/highlights.scm
+++ b/runtime/queries/gdscript/highlights.scm
@@ -3,6 +3,11 @@
 ((identifier) @constant
  (#match? @constant "^[A-Z][A-Z_]*$"))
 
+; class
+(class_name_statement (name) @type)
+(class_definition (name) @type)
+
+
 ; Function calls
 
 (attribute_call (identifier) @function)
diff --git a/runtime/queries/gdscript/textobjects.scm b/runtime/queries/gdscript/textobjects.scm
new file mode 100644
index 00000000..08954468
--- /dev/null
+++ b/runtime/queries/gdscript/textobjects.scm
@@ -0,0 +1,17 @@
+
+(class_definition
+  (body) @class.inside) @class.around
+
+(function_definition
+  (body) @function.inside) @function.around
+
+(parameters 
+  [
+    (identifier)
+    (typed_parameter)
+    (default_parameter)    
+    (typed_default_parameter)  
+  ] @parameter.inside @parameter.around)
+
+(comment) @comment.inside
+(comment)+ @comment.around

From c2e41082e4b2e0e1dba6a980a7f09ccaad88cbd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Sun, 11 Sep 2022 11:09:12 +0900
Subject: [PATCH 112/884] Remove the .txt suffix from tutor

The tutor file is loaded as .txt which can potentially spawn a
language server. Then the path is unset, but the LS remains active.
This can cause panics since updates are now submitted for a doc
with no path.

As a quick workaround we remove the extension which should avoid
detection.

Fixes #3730
---
 book/src/usage.md                | 2 +-
 helix-term/src/application.rs    | 2 +-
 helix-term/src/commands/typed.rs | 2 +-
 runtime/{tutor.txt => tutor}     | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename runtime/{tutor.txt => tutor} (100%)

diff --git a/book/src/usage.md b/book/src/usage.md
index ba631b62..164ae267 100644
--- a/book/src/usage.md
+++ b/book/src/usage.md
@@ -2,7 +2,7 @@
 
 (Currently not fully documented, see the [keymappings](./keymap.md) list for more.)
 
-See [tutor.txt](https://github.com/helix-editor/helix/blob/master/runtime/tutor.txt) (accessible via `hx --tutor` or `:tutor`) for a vimtutor-like introduction.
+See [tutor](https://github.com/helix-editor/helix/blob/master/runtime/tutor) (accessible via `hx --tutor` or `:tutor`) for a vimtutor-like introduction.
 
 ## Registers
 
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index ec698321..7ee5b7f1 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -157,7 +157,7 @@ impl Application {
         compositor.push(editor_view);
 
         if args.load_tutor {
-            let path = helix_loader::runtime_dir().join("tutor.txt");
+            let path = helix_loader::runtime_dir().join("tutor");
             editor.open(&path, Action::VerticalSplit)?;
             // Unset path to prevent accidentally saving to the original tutor file.
             doc_mut!(editor).set_path(None)?;
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 674ce7a6..c22f8712 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1147,7 +1147,7 @@ fn tutor(
         return Ok(());
     }
 
-    let path = helix_loader::runtime_dir().join("tutor.txt");
+    let path = helix_loader::runtime_dir().join("tutor");
     cx.editor.open(&path, Action::Replace)?;
     // Unset path to prevent accidentally saving to the original tutor file.
     doc_mut!(cx.editor).set_path(None)?;
diff --git a/runtime/tutor.txt b/runtime/tutor
similarity index 100%
rename from runtime/tutor.txt
rename to runtime/tutor

From b191ecf828b3bb2a20a8848fc2a45de771741502 Mon Sep 17 00:00:00 2001
From: yvt <i@yvt.jp>
Date: Sun, 11 Sep 2022 11:15:07 +0900
Subject: [PATCH 113/884] Strip release binary by setting
 `profile.release.strip` in a pre-build step (#3780)

* chore(ci): remove the strip step from the release CI workflow

* chore(ci): set `profile.release.strip = true` in the release CI workflow
---
 .github/workflows/release.yml | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 481e7b32..e7aca89b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -133,6 +133,14 @@ jobs:
           command: test
           args: --release --locked --target ${{ matrix.target }} --workspace
 
+      - name: Set profile.release.strip = true
+        shell: bash
+        run: |
+          cat >> .cargo/config.toml <<EOF
+          [profile.release]
+          strip = true
+          EOF
+
       - name: Build release binary
         uses: actions-rs/cargo@v1
         with:
@@ -140,19 +148,6 @@ jobs:
           command: build
           args: --release --locked --target ${{ matrix.target }}
 
-      - name: Strip release binary (linux and macos)
-        if: matrix.build == 'x86_64-linux' || endsWith(matrix.build, 'macos')
-        run: strip "target/${{ matrix.target }}/release/hx"
-
-      - name: Strip release binary (arm)
-        if: matrix.build == 'aarch64-linux'
-        run: |
-          docker run --rm -v \
-            "$PWD/target:/target:Z" \
-            rustembedded/cross:${{ matrix.target }} \
-            aarch64-linux-gnu-strip \
-            /target/${{ matrix.target }}/release/hx
-
       - name: Build AppImage
         shell: bash
         if: matrix.build == 'aarch64-linux' || matrix.build == 'x86_64-linux'

From 03612174ee4cef23217b5adf415ced4a851b4a44 Mon Sep 17 00:00:00 2001
From: Pablo Ovelleiro Corral <github@pablo.tools>
Date: Sun, 11 Sep 2022 13:11:35 +0200
Subject: [PATCH 114/884] Update usage.md with paragraph textobject(#3797)

---
 book/src/usage.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/book/src/usage.md b/book/src/usage.md
index 164ae267..600a514f 100644
--- a/book/src/usage.md
+++ b/book/src/usage.md
@@ -125,8 +125,6 @@ will move the selection over to the "func" `identifier`.
 
 ## Textobjects
 
-Currently supported: `word`, `surround`, `function`, `class`, `parameter`.
-
 ![textobject-demo](https://user-images.githubusercontent.com/23398472/124231131-81a4bb00-db2d-11eb-9d10-8e577ca7b177.gif)
 ![textobject-treesitter-demo](https://user-images.githubusercontent.com/23398472/132537398-2a2e0a54-582b-44ab-a77f-eb818942203d.gif)
 
@@ -137,6 +135,7 @@ Currently supported: `word`, `surround`, `function`, `class`, `parameter`.
 | ---                    | ---                      |
 | `w`                    | Word                     |
 | `W`                    | WORD                     |
+| `p`                    | Paragraph                |
 | `(`, `[`, `'`, etc     | Specified surround pairs |
 | `m`                    | Closest surround pair    |
 | `f`                    | Function                 |

From 865a1a4cb328bcd35e89e3fdb901283c39857686 Mon Sep 17 00:00:00 2001
From: Fanda Vacek <fanda.vacek@gmail.com>
Date: Mon, 12 Sep 2022 16:15:41 +0200
Subject: [PATCH 115/884] Make whitespace in monokai-pro-spectrum theme one
 step dimmer to avoid (#3814)

the white space confusion with hyphen

Co-authored-by: Fanda Vacek <fvacek@elektroline.cz>
---
 runtime/themes/monokai_pro_spectrum.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/themes/monokai_pro_spectrum.toml b/runtime/themes/monokai_pro_spectrum.toml
index a42a2681..89575e3a 100644
--- a/runtime/themes/monokai_pro_spectrum.toml
+++ b/runtime/themes/monokai_pro_spectrum.toml
@@ -6,7 +6,7 @@
 "ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
 "ui.menu" = { fg = "base8", bg = "base3" }
 "ui.menu.selected" = { fg = "base2", bg = "yellow" }
-"ui.virtual.whitespace" = "base5"
+"ui.virtual.whitespace" = "base4"
 "ui.virtual.ruler" = { bg = "base1" }
 
 "info" = "base8"

From 936ad884ebcec8f274a69bc4178f5866bafcdf4b Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 12 Sep 2022 09:15:54 -0500
Subject: [PATCH 116/884] Remove arrow key recommendation from tutor (#3811)

---
 runtime/tutor | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/tutor b/runtime/tutor
index 4a6c4425..dc0a345a 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -102,12 +102,12 @@ _________________________________________________________________
  --> Th stce misg so.
      This sentence is missing some text.
 
- Note: If you want to move the cursor while in Insert mode,
-       you may use the arrow keys instead of exiting and
-       reentering Insert mode.
  Note: The status bar will display your current mode.
        Notice that when you type i, 'NOR' changes to 'INS'.
 
+
+
+
 =================================================================
 =                      1.5 SAVING A FILE                        =
 =================================================================

From 23027a454a1f383739f353f722169a4d5b0506ff Mon Sep 17 00:00:00 2001
From: Alex Mayer <amayer5125@gmail.com>
Date: Mon, 12 Sep 2022 10:32:24 -0400
Subject: [PATCH 117/884] Clean Up Nord Theme (#3792)

- Add markup styles
- Replace custom colors with Nord colors
- Clean up code spacing
---
 runtime/themes/nord.toml | 63 ++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/runtime/themes/nord.toml b/runtime/themes/nord.toml
index a2aff585..6260ddbe 100644
--- a/runtime/themes/nord.toml
+++ b/runtime/themes/nord.toml
@@ -1,11 +1,10 @@
 # Author : RayGervais<raygervais@hotmail.ca>
 
-"ui.linenr.selected" = { fg = "nord4" }
+"ui.linenr.selected" = "nord4"
 "ui.cursorline.primary" = { bg = "nord1" }
-"ui.text.focus" = { fg = "nord8", modifiers= ["bold"] }
-"ui.menu" = { fg = "nord6", bg = "#232d38" }
+"ui.text.focus" = { fg = "nord8", modifiers = ["bold"] }
+"ui.menu" = { fg = "nord6", bg = "nord1" }
 "ui.menu.selected" = { fg = "nord8", bg = "nord2" }
-"ui.virtual.whitespace" = "gray"
 "ui.virtual.ruler" = { bg = "nord1" }
 
 "info" = "nord8"
@@ -14,33 +13,33 @@
 # Polar Night
 # nord0 - background color
 "ui.background" = { bg = "nord0" }
-"ui.statusline.inactive" = { fg = "nord8", bg = "nord1" }
 
+"ui.statusline.inactive" = { fg = "nord8", bg = "nord1" }
 "ui.statusline.normal" = { fg = "nord0", bg = "nord8" }
 "ui.statusline.insert" = { fg = "nord0", bg = "nord13" }
 "ui.statusline.select" = { fg = "nord0", bg = "nord15" }
 
 # nord1 - status bars, panels, modals, autocompletion
-"ui.statusline" = { fg = "nord4", bg = "#4c566a" }
-"ui.popup" = { bg = "#232d38" }
-"ui.window" = { bg = "#232d38" }
-"ui.help" = { bg = "#232d38", fg = "nord4" }
+"ui.statusline" = { fg = "nord4", bg = "nord1" }
+"ui.popup" = { bg = "nord1" }
+"ui.window" = { bg = "nord1" }
+"ui.help" = { bg = "nord1", fg = "nord4" }
 
 # nord2 - active line, highlighting
 "ui.selection" = { bg = "nord2" }
 "ui.cursor.match" = { bg = "nord2" }
 
-# nord3 - comments, nord3 based lighter color
-# relative: https://github.com/arcticicestudio/nord/issues/94
-"comment" = { fg = "gray", modifiers = ["italic"] }
-"ui.linenr" = { fg = "gray" }
+# nord3 - comments, invisible/non-printable characters
+"comment" = { fg = "nord3_bright", modifiers = ["italic"] }
+"ui.linenr" = "nord3_bright"
+"ui.virtual.whitespace" = "nord3_bright"
 
 # Snow Storm
 # nord4 - cursor, variables, constants, attributes, fields
 "ui.cursor.primary" = { fg = "nord4", modifiers = ["reversed"] }
 "attribute" = "nord4"
-"variable"  = "nord4"
-"constant"  = "nord4"
+"variable" = "nord4"
+"constant" = "nord4"
 "variable.builtin" = "nord4"
 "constant.builtin" = "nord4"
 "namespace" = "nord4"
@@ -48,28 +47,28 @@
 # nord5 - subtle UI text
 
 # nord6 - base text, punctuation
-"ui.text" = { fg = "nord6" }
+"ui.text" = "nord6"
 "punctuation" = "nord6"
 
 # Frost
 # nord7 - classes, types, primitives
 "type" = "nord7"
-"type.builtin" = { fg = "nord7"}
+"type.builtin" = "nord7"
 "label" = "nord7"
 
 # nord8 - declaration, methods, routines
 "constructor" = "nord8"
 "function" = "nord8"
-"function.macro" = { fg = "nord8" }
-"function.builtin" = { fg = "nord8" }
+"function.macro" = "nord8"
+"function.builtin" = "nord8"
 
 # nord9 - operator, tags, units, punctuations
 "punctuation.delimiter" = "nord9"
-"operator" = { fg = "nord9" }
+"operator" = "nord9"
 "variable.other.member" = "nord9"
 
 # nord10 - keywords, special
-"keyword" = { fg = "nord10" }
+"keyword" = "nord10"
 "keyword.directive" = "nord10"
 "variable.parameter" = "nord10"
 
@@ -83,7 +82,7 @@
 
 # nord13 - warnings, escape characters, regex
 "warning" = "nord13"
-"constant.character.escape" = { fg = "nord13" }
+"constant.character.escape" = "nord13"
 
 # nord14 - strings
 "string" = "nord14"
@@ -91,15 +90,13 @@
 # nord15 - integer, floating point
 "constant.numeric" = "nord15"
 
-# TODO markup
-"markup.heading" = "blue"
-"markup.list" = "red"
-"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
-"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
-"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
-"markup.link.text" = "red"
-"markup.quote" = "cyan"
-"markup.raw" = "green"
+# markup
+"markup.heading" = "nord8"
+"markup.list" = "nord9"
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.link.text" = "nord8"
+"markup.raw" = "nord7"
 
 # vcs
 "diff.plus" = "nord14"
@@ -110,6 +107,9 @@
 nord0 = "#2e3440"
 nord1 = "#3b4252"
 nord2 = "#434c5e"
+# we use a brighter nord3 based on discussion here:
+# https://github.com/arcticicestudio/nord/issues/94
+nord3_bright = "#616e88"
 nord4 = "#d8dee9"
 nord6 = "#eceff4"
 nord7 = "#8fbcbb"
@@ -121,4 +121,3 @@ nord12 = "#d08770"
 nord13 = "#ebcb8b"
 nord14 = "#a3be8c"
 nord15 = "#b48ead"
-gray = "#616e88"

From 800a4906767d69443cda183acd0e982f88c7b29a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Sep 2022 10:01:38 +0900
Subject: [PATCH 118/884] build(deps): bump url from 2.2.2 to 2.3.1 (#3828)

Bumps [url](https://github.com/servo/rust-url) from 2.2.2 to 2.3.1.
- [Release notes](https://github.com/servo/rust-url/releases)
- [Commits](https://github.com/servo/rust-url/compare/v2.2.2...v2.3.1)

---
updated-dependencies:
- dependency-name: url
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 341f0f6a..d8d82d28 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -268,11 +268,10 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
+checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
 dependencies = [
- "matches",
  "percent-encoding",
 ]
 
@@ -564,11 +563,10 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.2.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
 dependencies = [
- "matches",
  "unicode-bidi",
  "unicode-normalization",
 ]
@@ -675,12 +673,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "matches"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
-
 [[package]]
 name = "memchr"
 version = "2.5.0"
@@ -768,9 +760,9 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 
 [[package]]
 name = "pin-project-lite"
@@ -1298,13 +1290,12 @@ checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
 
 [[package]]
 name = "url"
-version = "2.2.2"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
+checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
 dependencies = [
  "form_urlencoded",
  "idna",
- "matches",
  "percent-encoding",
  "serde",
 ]

From 16b9a1841ff2d53e855522d24f0749b06ed30186 Mon Sep 17 00:00:00 2001
From: Alexander Brevig <alexanderbrevig@gmail.com>
Date: Tue, 13 Sep 2022 08:08:23 +0200
Subject: [PATCH 119/884] fix: map_err()? instead of unwrap (#3826)

---
 helix-core/src/syntax.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 6ec56bde..e0a984d2 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -985,7 +985,9 @@ impl LanguageLayer {
     }
 
     fn parse(&mut self, parser: &mut Parser, source: &Rope) -> Result<(), Error> {
-        parser.set_included_ranges(&self.ranges).unwrap();
+        parser
+            .set_included_ranges(&self.ranges)
+            .map_err(|_| Error::InvalidRanges)?;
 
         parser
             .set_language(self.config.language)
@@ -1135,6 +1137,7 @@ pub struct Highlight(pub usize);
 pub enum Error {
     Cancelled,
     InvalidLanguage,
+    InvalidRanges,
     Unknown,
 }
 

From 0d8ffa6b4ae8de827b24df9aaccc4a2e43465d58 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Tue, 13 Sep 2022 02:49:18 -0400
Subject: [PATCH 120/884] add example config for all removed insert mode
 bindings (#3827)

---
 book/src/keymap.md | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index da4433f3..5a506ba0 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -341,10 +341,25 @@ mode:
 
 ```toml
 [keys.insert]
-up = "move_line_up"
-down = "move_line_down"
-left = "move_char_left"
-right = "move_char_right"
+"up" = "move_line_up"
+"down" = "move_line_down"
+"left" = "move_char_left"
+"right" = "move_char_right"
+"C-b" = "move_char_left"
+"C-f" = "move_char_right"
+"A-b" = "move_prev_word_end"
+"C-left" = "move_prev_word_end"
+"A-f" = "move_next_word_start"
+"C-right" = "move_next_word_start"
+"A-<" = "goto_file_start"
+"A->" = "goto_file_end"
+"pageup" = "page_up"
+"pagedown" = "page_down"
+"home" = "goto_line_start"
+"C-a" = "goto_line_start"
+"end" = "goto_line_end_newline"
+"C-e" = "goto_line_end_newline"
+"A-left" = "goto_line_start"
 ```
 
 ## Select / extend mode

From ffb41a94f040e251a3269e0d13417b16bef244c0 Mon Sep 17 00:00:00 2001
From: Benjamin Streit <benjaminmstreit@gmail.com>
Date: Tue, 13 Sep 2022 01:53:55 -0500
Subject: [PATCH 121/884] feat: Syntax highlighting for Astro files (#3829)

---
 book/src/generated/lang-support.md   |  1 +
 languages.toml                       | 12 ++++++++++++
 runtime/queries/astro/highlights.scm |  3 +++
 runtime/queries/astro/injections.scm |  9 +++++++++
 4 files changed, 25 insertions(+)
 create mode 100644 runtime/queries/astro/highlights.scm
 create mode 100644 runtime/queries/astro/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 37ceec16..78362384 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -1,5 +1,6 @@
 | Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP |
 | --- | --- | --- | --- | --- |
+| astro | ✓ |  |  |  |
 | awk | ✓ | ✓ |  | `awk-language-server` |
 | bash | ✓ |  |  | `bash-language-server` |
 | beancount | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 83e4affd..5e563178 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1754,3 +1754,15 @@ language-server = { command = "jsonnet-language-server", args= ["-t", "--lint"]
 [[grammar]]
 name = "jsonnet"
 source = { git = "https://github.com/sourcegraph/tree-sitter-jsonnet", rev = "0475a5017ad7dc84845d1d33187f2321abcb261d" }
+
+[[language]]
+name = "astro"
+scope = "source.astro"
+injection-regex = "astro"
+file-types = ["astro"]
+roots = []
+indent = { tab-width = 2, unit = "  " }
+
+[[grammar]]
+name = "astro"
+source = { git = "https://github.com/virchau13/tree-sitter-astro", rev = "5f5c3e73c45967df9aa42f861fad2d77cd4e0900" }
diff --git a/runtime/queries/astro/highlights.scm b/runtime/queries/astro/highlights.scm
new file mode 100644
index 00000000..3d0792b8
--- /dev/null
+++ b/runtime/queries/astro/highlights.scm
@@ -0,0 +1,3 @@
+; inherits: html
+
+["---"] @punctuation.delimiter
diff --git a/runtime/queries/astro/injections.scm b/runtime/queries/astro/injections.scm
new file mode 100644
index 00000000..e3cff178
--- /dev/null
+++ b/runtime/queries/astro/injections.scm
@@ -0,0 +1,9 @@
+; inherits: html
+
+((frontmatter
+	(raw_text) @injection.content)
+ (#set! injection.language "typescript"))
+
+((interpolation
+	(raw_text) @injection.content)
+ (#set! injection.language "tsx"))

From ac460ac8371e2d7cfe99b9e06be9b8f5edac1c44 Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Tue, 13 Sep 2022 12:14:16 +0300
Subject: [PATCH 122/884] Render html <code> tags as code in markdown (#3425)

---
 helix-term/src/ui/markdown.rs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/helix-term/src/ui/markdown.rs b/helix-term/src/ui/markdown.rs
index a0b299e7..923dd73a 100644
--- a/helix-term/src/ui/markdown.rs
+++ b/helix-term/src/ui/markdown.rs
@@ -178,6 +178,21 @@ impl Markdown {
             .map(|key| get_theme(key))
             .collect();
 
+        // Transform text in `<code>` blocks into `Event::Code`
+        let mut in_code = false;
+        let parser = parser.filter_map(|event| match event {
+            Event::Html(tag) if *tag == *"<code>" => {
+                in_code = true;
+                None
+            }
+            Event::Html(tag) if *tag == *"</code>" => {
+                in_code = false;
+                None
+            }
+            Event::Text(text) if in_code => Some(Event::Code(text)),
+            _ => Some(event),
+        });
+
         for event in parser {
             match event {
                 Event::Start(Tag::List(list)) => {

From d38950bdf9ac786dc518fa723b92a3f189f2b960 Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Tue, 13 Sep 2022 12:24:48 +0300
Subject: [PATCH 123/884] Remove border from code actions popup (#3444)

---
 helix-term/src/commands/lsp.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 61eed638..1113b44e 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -491,8 +491,7 @@ pub fn code_action(cx: &mut Context) {
             });
             picker.move_down(); // pre-select the first item
 
-            let popup =
-                Popup::new("code-action", picker).margin(helix_view::graphics::Margin::all(1));
+            let popup = Popup::new("code-action", picker);
             compositor.replace_or_push("code-action", popup);
         },
     )

From ec81ec1e8d26e3a99ed713b79381a77daf817d34 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 13 Sep 2022 08:50:53 -0500
Subject: [PATCH 124/884] flake: Fix devShell on aarch64-darwin (#3810)

LLDB is marked broken on all arches except for x86_64-linux. With this
change, I can use `nix develop` on aarch64-darwin.
---
 flake.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index abcb2cb2..8cb4b663 100644
--- a/flake.nix
+++ b/flake.nix
@@ -92,8 +92,9 @@
             prev.packages
             ++ (
               with common.pkgs;
-                [lld_13 lldb cargo-flamegraph rust-analyzer]
+                [lld_13 cargo-flamegraph rust-analyzer]
                 ++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) cargo-tarpaulin)
+                ++ (lib.optional stdenv.isLinux lldb)
             );
           env =
             prev.env

From b5be72bff79075ef4b5b51922da15e003c274b9b Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Sun, 11 Sep 2022 09:13:45 +0200
Subject: [PATCH 125/884] Canonicalize executable path

When looking up the runtime/ directory relative to the executable path,
canonicalize the path first in case the executable is a symbolic link.

Fixes #3768
---
 helix-loader/src/lib.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs
index 015b39a5..3c9905f5 100644
--- a/helix-loader/src/lib.rs
+++ b/helix-loader/src/lib.rs
@@ -42,8 +42,10 @@ pub fn runtime_dir() -> PathBuf {
     }
 
     // fallback to location of the executable being run
+    // canonicalize the path in case the executable is symlinked
     std::env::current_exe()
         .ok()
+        .and_then(|path| std::fs::canonicalize(path).ok())
         .and_then(|path| path.parent().map(|path| path.to_path_buf().join(RT_DIR)))
         .unwrap()
 }

From 73f8e9902b02d30a5194d52fa8a3f65001608141 Mon Sep 17 00:00:00 2001
From: Kristoffer Flottorp <2630397+krfl@users.noreply.github.com>
Date: Fri, 16 Sep 2022 04:38:54 +0200
Subject: [PATCH 126/884] improve fleetish theme (#3844)

Co-authored-by: krfl <kr.fl@outlook.com>
---
 runtime/themes/fleetish.toml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/runtime/themes/fleetish.toml b/runtime/themes/fleetish.toml
index 70de2f8a..a5b09fe4 100644
--- a/runtime/themes/fleetish.toml
+++ b/runtime/themes/fleetish.toml
@@ -64,11 +64,12 @@
 "ui.window" = { fg = "dark", bg = "darkest" }
 "ui.help" = { fg = "light", bg = "dark" }
 "ui.text" = { fg = "light" } # .focus / .info
-# "ui.virtual" = {} # .ruler / .whitespace
+"ui.virtual" = { fg = "dark" } # .ruler / .whitespace
 "ui.virtual.ruler" = { bg = "darker"}
 "ui.menu" = { fg = "light", bg = "dark" } # .selected
 "ui.menu.selected" = { fg = "lightest", bg = "blue_accent" } # .selected
-"ui.selection" = { bg = "select" } # .primary
+"ui.selection" = { bg = "darker" } # .primary
+"ui.selection.primary" = { bg = "select" } # .primary
 "hint" = { fg = "blue_accent"}
 "info" = { fg = "yellow_accent" }
 "warning" = { fg = "orange_accent" }

From 111d2dafd3bbbacff68e1f9f21e4106db560b28f Mon Sep 17 00:00:00 2001
From: Kristoffer Flottorp <2630397+krfl@users.noreply.github.com>
Date: Fri, 16 Sep 2022 04:39:06 +0200
Subject: [PATCH 127/884] Improve flatwhite theme (#3843)

Co-authored-by: krfl <kr.fl@outlook.com>
---
 runtime/themes/flatwhite.toml | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/runtime/themes/flatwhite.toml b/runtime/themes/flatwhite.toml
index 030947e6..d4c837b6 100644
--- a/runtime/themes/flatwhite.toml
+++ b/runtime/themes/flatwhite.toml
@@ -1,30 +1,30 @@
-# Author: Alexander Brevig <alexanderbrevig@gmail.com>
+# Author: Alexander Brevig <alexanderbrevig@gmail.com>, krfl <kr.fl@outlook.com>
 # Adopted from https://github.com/biletskyy/flatwhite-syntax
 
 "attribute" = { fg = "blue_text", bg = "blue_bg" }
-"comment" = { fg = "base3", bg = "base7", modifiers = ["italic"] }
+"comment" = { fg = "base3", modifiers = ["italic"] }
 "comment.line" = {}
 "comment.block" = {}
 "comment.block.documentation" = { fg = "base2" }
 "constant" = { fg = "blue_text", bg = "blue_bg" }
-"constructor" = { fg = "base1", bg = "base7" }
-"function" = { fg = "base1", bg = "base7", modifiers = ["bold"] }
+"constructor" = { fg = "base1" }
+"function" = { fg = "base1", modifiers = ["bold"] }
 "keyword" = { fg = "purple_text", bg = "purple_bg" }
 "label" = { modifiers = ["bold"] }
 "namespace" = { fg = "teal_text", bg = "teal_bg" }
-"operator" = { fg = "base1", bg = "base7" }
+"operator" = { fg = "base1" }
 "punctuation.bracket" = { modifiers = ["bold"] }
 "special" = { fg = "blue_text", bg = "blue_bg" }
 "string" = { fg = "green_text", bg = "green_bg" }
-"type" = { fg = "base1", bg = "base7" }
-"variable" = { fg = "base1", bg = "base7" }
+"type" = { fg = "base1" }
+"variable" = { fg = "base1" }
 "variable.parameter" = { fg = "blue_text", bg = "blue_bg" }
 
 "diagnostic" = { modifiers = ["underlined"] }
 "info" = { fg = "orange_text", bg = "orange_bg" }
 "hint" = { modifiers = ["bold"] }
 "warning" = { fg = "orange_text", bg = "orange_bg" }
-"error" = { fg = "diff_delete", bg = "base7" }
+"error" = { fg = "diff_delete" }
 
 "markup.heading" = { fg = "purple_text", bg = "purple_bg", modifiers = [
   "bold",
@@ -47,11 +47,12 @@
 "ui.cursor" = { fg = "base1", bg = "base7", modifiers = ["reversed"] }
 "ui.cursor.primary" = { fg = "base1", bg = "base7", modifiers = ["reversed"] }
 "ui.cursor.match" = { fg = "base5", bg = "base3", modifiers = ["reversed"] }
-"ui.selection" = { bg = "base3" }
-"ui.selection.primary" = { fg = "base5", bg = "base3" }
+"ui.selection" = { bg = "base4" }
+"ui.selection.primary" = { fg = "base6", bg = "base2" }
 
-"ui.virtual" = { bg = "base6" }
-"ui.virtual.whitespace" = { bg = "base7" }
+"ui.virtual" = { fg = "base5", bg = "base6" }
+"ui.virtual.whitespace" = { fg = "base5" }
+"ui.virtual.ruler" = { bg = "base6" }
 
 "ui.linenr" = { bg = "base6" }
 "ui.linenr.selected" = { bg = "base6", modifiers = ["reversed"] }
@@ -66,15 +67,15 @@
   "bold",
 ] }
 
-"ui.text" = { fg = "base1", bg = "base7" }
-"ui.text.focus" = { fg = "base1", bg = "base6", modifiers = ["bold"] }
+"ui.text" = { fg = "base1" }
+"ui.text.focus" = { fg = "base1", modifiers = ["bold"] }
 
 "ui.menu" = { fg = "base1", bg = "base6" }
 "ui.menu.selected" = { fg = "base1", bg = "base6", modifiers = ["reversed"] }
 "ui.menu.scroll" = { fg = "base1", bg = "base6" }
-"ui.help" = { fg = "base1", bg = "base7" }
-"ui.popup" = { fg = "base1", bg = "base7" }
-"ui.window" = { fg = "base1", bg = "base7" }
+"ui.help" = { fg = "base1", bg = "base6" }
+"ui.popup" = { fg = "base1", bg = "base6" }
+"ui.window" = { fg = "base1", bg = "base6" }
 
 "diff.plus" = { bg = "diff_add" }
 "diff.delta" = { bg = "diff_change" }

From 714db9c66665133e599c6d494b7fb46fcaee1da1 Mon Sep 17 00:00:00 2001
From: Benjamin Streit <benjaminmstreit@gmail.com>
Date: Fri, 16 Sep 2022 02:51:19 -0500
Subject: [PATCH 128/884] fix: Improving JSX and TSX indents (#3853)

---
 languages.toml                  | 4 ++--
 runtime/queries/jsx/indents.scm | 8 ++++++++
 runtime/queries/tsx/indents.scm | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/languages.toml b/languages.toml
index 5e563178..0b46cc49 100644
--- a/languages.toml
+++ b/languages.toml
@@ -332,7 +332,7 @@ source = { git = "https://github.com/omertuc/tree-sitter-go-work", rev = "6dd9dd
 name = "javascript"
 scope = "source.js"
 injection-regex = "(js|javascript)"
-file-types = ["js", "jsx", "mjs", "cjs"]
+file-types = ["js", "mjs", "cjs"]
 shebangs = ["node"]
 roots = []
 comment-token = "//"
@@ -363,7 +363,7 @@ injection-regex = "jsx"
 file-types = ["jsx"]
 roots = []
 comment-token = "//"
-language-server = { command = "typescript-language-server", args = ["--stdio"], language-id = "javascript" }
+language-server = { command = "typescript-language-server", args = ["--stdio"], language-id = "javascriptreact" }
 indent = { tab-width = 2, unit = "  " }
 grammar = "javascript"
 
diff --git a/runtime/queries/jsx/indents.scm b/runtime/queries/jsx/indents.scm
index 04328f09..6cb82545 100644
--- a/runtime/queries/jsx/indents.scm
+++ b/runtime/queries/jsx/indents.scm
@@ -1 +1,9 @@
+[
+  (jsx_fragment)
+  (jsx_element)
+  (jsx_self_closing_element)
+] @indent
+
+(parenthesized_expression) @indent
+
 ; inherits: ecma
diff --git a/runtime/queries/tsx/indents.scm b/runtime/queries/tsx/indents.scm
index 1b61e36d..07391231 100644
--- a/runtime/queries/tsx/indents.scm
+++ b/runtime/queries/tsx/indents.scm
@@ -1 +1 @@
-; inherits: typescript
+; inherits: typescript,jsx

From 19384cc3a18ad56e3f06ecc43cf91c1641f36f90 Mon Sep 17 00:00:00 2001
From: Nick Ogden <nick@nickogden.org>
Date: Fri, 16 Sep 2022 17:21:56 +0100
Subject: [PATCH 129/884] Add darcula theme based upon Intelij Darcula (#3739)

---
 runtime/themes/darcula.toml | 91 +++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 runtime/themes/darcula.toml

diff --git a/runtime/themes/darcula.toml b/runtime/themes/darcula.toml
new file mode 100644
index 00000000..00176ff2
--- /dev/null
+++ b/runtime/themes/darcula.toml
@@ -0,0 +1,91 @@
+# Author : Nick Ogden <nick@nickogden.org>
+
+"ui.background" = { bg = "grey01" }
+"ui.menu" = { fg = "grey05", bg = "grey00" }
+"ui.menu.selected" = { fg = "grey01", bg = "grey04" }
+"ui.linenr" = { fg = "grey03", bg = "grey01" }
+"ui.linenr.selected" = { fg = "grey04", bg = "grey01", modifiers = ["bold"] }
+"ui.gutter" = { bg = "grey01" }
+"ui.popup" = { fg = "grey05", bg = "grey00" }
+"ui.window" = { bg = "grey01" }
+"ui.selection" = { bg = "grey03" }
+"ui.statusline" = { fg = "grey04", bg = "grey02" }
+"ui.statusline.insert" = { bg = "white", fg = "grey01" }
+"ui.statusline.select" = { bg = "orange", fg = "grey01" }
+"ui.help" = { fg = "grey04", bg = "grey01" }
+"ui.cursor" = { fg = "grey04", modifiers = ["reversed"] }
+"ui.cursor.primary" = { fg = "grey05", modifiers = ["reversed"] }
+"ui.cursor.match" = { fg = "white", modifiers = ["underlined"] }
+"ui.cursorline.primary" = { bg = "grey02" }
+"ui.cursorline.secondary" = { bg = "grey02" }
+"ui.text" = "white"
+"ui.text.focus" = "grey05"
+"ui.virtual.ruler" = { bg = "grey02" }
+"ui.virtual.indent-guide" = "grey02"
+"ui.virtual.whitespace" = "grey03"
+
+"operator" = "grey05"
+"variable" = "white"
+"variable.other.member" = "yellow"
+"constant" = "lightblue"
+"constant.numeric" = "lightblue"
+"constant.character.escape" = "white"
+"attribute" = "yellow"
+"type" = "orange"
+"string"  = "darkgreen"
+"function" = "yellow"
+"function.macro" = "green"
+"constructor" = "yellow"
+"special" = "green"
+"keyword" = "orange"
+"comment" = { fg = "grey", modifiers = ["italic"] }
+"label" = "purple"
+"namespace" = { fg = "purple", modifiers = ["italic"] }
+
+# HTML
+"tag" = "orange"
+
+"markup.heading.1" = "orange"
+"markup.heading.2" = "yellow"
+"markup.heading.3" = "darkred"
+"markup.heading.4" = "grey"
+"markup.heading.5" = "purple"
+"markup.heading.6" = "darkgreen"
+"markup.list" = "white"
+"markup.bold" = { fg = "white", modifiers = ["bold"] }
+"markup.italic" = { fg = "white", modifiers = ["italic"] }
+"markup.link.url" = { fg = "lightblue", modifiers = ["underlined"] }
+"markup.link.text" = "white"
+"markup.quote" = "darkgreen"
+"markup.raw" = "white"
+
+"diff.plus" = "green"
+"diff.delta" = "grey"
+"diff.minus" = "red"
+
+"diagnostic" = { modifiers = ["underlined"] }
+"info" = "grey05"
+"hint" = "grey05"
+"debug" = "grey05"
+"warning" = "orange"
+"error" = "red"
+
+[palette]
+grey00 = "#181818" # Default Background
+grey01 = "#282828" # Lighter Background (Used for status bars, line number and folding marks)
+grey02 = "#383838" # Selection Background
+grey03 = "#585858" # Comments, Invisibles, Line Highlighting
+grey04 = "#b8b8b8" # Dark Foreground (Used for status bars)
+grey05 = "#d8d8d8" # Default Foreground, Caret, Delimiters, Operators
+grey06 = "#e8e8e8" # Light Foreground (Not often used)
+grey07 = "#f8f8f8" # Light Background (Not often used)
+
+white = "#d0d0d0"
+yellow = "#eedd82"
+orange = "#cc7832"
+darkred = "#a34a27"
+purple = "#9876aa"
+green = "#32cd32"
+grey = "#808080"
+darkgreen = "#629755"
+lightblue = "#6897bb"

From a73e83ef4df18e2b70bf9b409928f5eb2fc26a99 Mon Sep 17 00:00:00 2001
From: taupiqueur <93834534+taupiqueur@users.noreply.github.com>
Date: Sat, 17 Sep 2022 13:34:48 +0200
Subject: [PATCH 130/884] Fix typos (#3858)

---
 CHANGELOG.md                        | 6 +++---
 README.md                           | 8 ++++----
 book/src/commands.md                | 2 +-
 book/src/from-vim.md                | 4 ++--
 book/src/guides/adding_languages.md | 2 +-
 book/src/keymap.md                  | 4 ++--
 book/src/usage.md                   | 4 ++--
 helix-core/src/movement.rs          | 2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73d37a57..56d85751 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -684,7 +684,7 @@ Usability improvements and fixes:
 - File picker configuration ([#988](https://github.com/helix-editor/helix/pull/988))
 - Fix surround cursor position calculation ([#1183](https://github.com/helix-editor/helix/pull/1183))
 - Accept count for goto_window ([#1033](https://github.com/helix-editor/helix/pull/1033))
-- Make kill_to_line_end behave like emacs ([#1235](https://github.com/helix-editor/helix/pull/1235))
+- Make kill_to_line_end behave like Emacs ([#1235](https://github.com/helix-editor/helix/pull/1235))
 - Only use a single documentation popup ([#1241](https://github.com/helix-editor/helix/pull/1241))
 - ui: popup: Don't allow scrolling past the end of content ([`3307f44c`](https://github.com/helix-editor/helix/commit/3307f44c))
 - Open files with spaces in filename, allow opening multiple files ([#1231](https://github.com/helix-editor/helix/pull/1231))
@@ -922,7 +922,7 @@ to distinguish it in bug reports..
   on cargo run. `~/.config/helix/runtime` can also be used.
 - Registers can now be selected via " (for example `"ay`)
 - Support for Nix files was added
-- Movement is now fully tested and matches kakoune implementation
+- Movement is now fully tested and matches Kakoune implementation
 - A per-file LSP symbol picker was added to space+s
 - Selection can be replaced with yanked text via R
 
@@ -946,7 +946,7 @@ Keymaps:
 - The runtime/ can now optionally be embedded in the binary
 - Haskell syntax added
 - Window mode (ctrl-w) added
-- Show matching bracket (vim's matchbrackets)
+- Show matching bracket (Vim's matchbrackets)
 - Themes now support style modifiers
 - First user contributed theme
 - Create a document if it doesn't exist yet on save
diff --git a/README.md b/README.md
index 98ec7822..ff0699c6 100644
--- a/README.md
+++ b/README.md
@@ -4,10 +4,10 @@
 
 ![Screenshot](./screenshot.png)
 
-A kakoune / neovim inspired editor, written in Rust.
+A Kakoune / Neovim inspired editor, written in Rust.
 
-The editing model is very heavily based on kakoune; during development I found
-myself agreeing with most of kakoune's design decisions.
+The editing model is very heavily based on Kakoune; during development I found
+myself agreeing with most of Kakoune's design decisions.
 
 For more information, see the [website](https://helix-editor.com) or
 [documentation](https://docs.helix-editor.com/).
@@ -24,7 +24,7 @@ All shortcuts/keymaps can be found [in the documentation on the website](https:/
 - Smart, incremental syntax highlighting and code editing via tree-sitter
 
 It's a terminal-based editor first, but I'd like to explore a custom renderer
-(similar to emacs) in wgpu or skulpin.
+(similar to Emacs) in wgpu or skulpin.
 
 Note: Only certain languages have indentation definitions at the moment. Check
 `runtime/queries/<lang>/` for `indents.scm`.
diff --git a/book/src/commands.md b/book/src/commands.md
index 4c4a5c05..d9a11386 100644
--- a/book/src/commands.md
+++ b/book/src/commands.md
@@ -1,5 +1,5 @@
 # Commands
 
-Command mode can be activated by pressing `:`, similar to vim. Built-in commands:
+Command mode can be activated by pressing `:`, similar to Vim. Built-in commands:
 
 {{#include ./generated/typable-cmd.md}}
diff --git a/book/src/from-vim.md b/book/src/from-vim.md
index 54f8d3b1..6ace9102 100644
--- a/book/src/from-vim.md
+++ b/book/src/from-vim.md
@@ -1,7 +1,7 @@
 # Migrating from Vim
 
-Helix's editing model is strongly inspired from vim and kakoune, and a notable
-difference from vim (and the most striking similarity to kakoune) is that Helix
+Helix's editing model is strongly inspired from Vim and Kakoune, and a notable
+difference from Vim (and the most striking similarity to Kakoune) is that Helix
 follows the `selection → action` model. This means that the whatever you are
 going to act on (a word, a paragraph, a line, etc) is selected first and the
 action itself (delete, change, yank, etc) comes second. A cursor is simply a
diff --git a/book/src/guides/adding_languages.md b/book/src/guides/adding_languages.md
index 5be7a264..6598b9bf 100644
--- a/book/src/guides/adding_languages.md
+++ b/book/src/guides/adding_languages.md
@@ -29,7 +29,7 @@ language with the path `runtime/queries/<name>/`. The tree-sitter
 gives more info on how to write queries.
 
 > NOTE: When evaluating queries, the first matching query takes
-precedence, which is different from other editors like neovim where
+precedence, which is different from other editors like Neovim where
 the last matching query supersedes the ones before it. See
 [this issue][neovim-query-precedence] for an example.
 
diff --git a/book/src/keymap.md b/book/src/keymap.md
index 5a506ba0..99b0f0ba 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -27,7 +27,7 @@
 
 ### Movement
 
-> NOTE: Unlike vim, `f`, `F`, `t` and `T` are not confined to the current line.
+> NOTE: Unlike Vim, `f`, `F`, `t` and `T` are not confined to the current line.
 
 | Key                   | Description                                        | Command                     |
 | -----                 | -----------                                        | -------                     |
@@ -229,7 +229,7 @@ TODO: Mappings for selecting syntax nodes (a superset of `[`).
 
 #### Window mode
 
-This layer is similar to vim keybindings as kakoune does not support window.
+This layer is similar to Vim keybindings as Kakoune does not support window.
 
 | Key                    | Description                                          | Command           |
 | -----                  | -------------                                        | -------           |
diff --git a/book/src/usage.md b/book/src/usage.md
index 600a514f..fc3a83ee 100644
--- a/book/src/usage.md
+++ b/book/src/usage.md
@@ -128,8 +128,8 @@ will move the selection over to the "func" `identifier`.
 ![textobject-demo](https://user-images.githubusercontent.com/23398472/124231131-81a4bb00-db2d-11eb-9d10-8e577ca7b177.gif)
 ![textobject-treesitter-demo](https://user-images.githubusercontent.com/23398472/132537398-2a2e0a54-582b-44ab-a77f-eb818942203d.gif)
 
-- `ma` - Select around the object (`va` in vim, `<alt-a>` in kakoune)
-- `mi` - Select inside the object (`vi` in vim, `<alt-i>` in kakoune)
+- `ma` - Select around the object (`va` in Vim, `<alt-a>` in Kakoune)
+- `mi` - Select inside the object (`vi` in Vim, `<alt-i>` in Kakoune)
 
 | Key after `mi` or `ma` | Textobject selected      |
 | ---                    | ---                      |
diff --git a/helix-core/src/movement.rs b/helix-core/src/movement.rs
index fa8cdf3a..c232484c 100644
--- a/helix-core/src/movement.rs
+++ b/helix-core/src/movement.rs
@@ -270,7 +270,7 @@ pub enum WordMotionTarget {
     NextWordEnd,
     PrevWordStart,
     PrevWordEnd,
-    // A "Long word" (also known as a WORD in vim/kakoune) is strictly
+    // A "Long word" (also known as a WORD in Vim/Kakoune) is strictly
     // delimited by whitespace, and can consist of punctuation as well
     // as alphanumerics.
     NextLongWordStart,

From 08937fc00e0f133f4393cae6b16ea65bcdd38487 Mon Sep 17 00:00:00 2001
From: Artem Pyanykh <artem.pyanykh@gmail.com>
Date: Sun, 21 Aug 2022 19:41:36 +0100
Subject: [PATCH 131/884] Add Markdown LSP via Marksman

Marksman is an LSP server for Markdown: https://github.com/artempyanykh/marksman
It supports a bunch of LSP features: symbols, references, rename, diag,
etc. and already has integrations with emacs, neovim, and vscode.
---
 book/src/generated/lang-support.md | 2 +-
 languages.toml                     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 78362384..faa2667e 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -67,7 +67,7 @@
 | llvm-mir-yaml | ✓ |  | ✓ |  |
 | lua | ✓ |  | ✓ | `lua-language-server` |
 | make | ✓ |  |  |  |
-| markdown | ✓ |  |  |  |
+| markdown | ✓ |  |  | `marksman` |
 | markdown.inline | ✓ |  |  |  |
 | meson | ✓ |  | ✓ |  |
 | mint |  |  |  | `mint` |
diff --git a/languages.toml b/languages.toml
index 0b46cc49..1dda58ae 100644
--- a/languages.toml
+++ b/languages.toml
@@ -905,7 +905,8 @@ name = "markdown"
 scope = "source.md"
 injection-regex = "md|markdown"
 file-types = ["md", "markdown"]
-roots = []
+roots = [".marksman.toml"]
+language-server = { command = "marksman", args=["server"] }
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]

From ea25ed6431d65265ea44b3438b062ff9e6fa5668 Mon Sep 17 00:00:00 2001
From: Alex Suraci <suraci.alex@gmail.com>
Date: Sun, 18 Sep 2022 13:06:51 -0400
Subject: [PATCH 132/884] add `bass` language + highlighting (#3771)

---
 book/src/generated/lang-support.md  |   1 +
 languages.toml                      |  14 ++++
 runtime/queries/bass/highlights.scm | 101 ++++++++++++++++++++++++++++
 3 files changed, 116 insertions(+)
 create mode 100644 runtime/queries/bass/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index faa2667e..86c26042 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -3,6 +3,7 @@
 | astro | ✓ |  |  |  |
 | awk | ✓ | ✓ |  | `awk-language-server` |
 | bash | ✓ |  |  | `bash-language-server` |
+| bass | ✓ |  |  | `bass` |
 | beancount | ✓ |  |  |  |
 | c | ✓ | ✓ | ✓ | `clangd` |
 | c-sharp | ✓ | ✓ |  | `OmniSharp` |
diff --git a/languages.toml b/languages.toml
index 1dda58ae..949dd372 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1767,3 +1767,17 @@ indent = { tab-width = 2, unit = "  " }
 [[grammar]]
 name = "astro"
 source = { git = "https://github.com/virchau13/tree-sitter-astro", rev = "5f5c3e73c45967df9aa42f861fad2d77cd4e0900" }
+
+[[language]]
+name = "bass"
+scope = "source.bass"
+injection-regex = "bass"
+file-types = ["bass"]
+roots = []
+comment-token = ";"
+indent = { tab-width = 2, unit = "  " }
+language-server = { command = "bass", args = ["--lsp"] }
+
+[[grammar]]
+name = "bass"
+source = { git = "https://github.com/vito/tree-sitter-bass", rev = "501133e260d768ed4e1fd7374912ed5c86d6fd90" }
diff --git a/runtime/queries/bass/highlights.scm b/runtime/queries/bass/highlights.scm
new file mode 100644
index 00000000..f8b70fc1
--- /dev/null
+++ b/runtime/queries/bass/highlights.scm
@@ -0,0 +1,101 @@
+; GENERATED VIA https://github.com/vito/tree-sitter-bass
+
+;;; comments
+
+(comment) @comment.line
+
+;;; punctuation
+
+["(" ")" "[" "]" "{" "}"] @punctuation.bracket
+
+;;; constants
+
+[(ignore) (null)] @constant.builtin
+
+(bool) @constant.builtin.boolean
+
+(int) @constant.numeric.integer
+
+;;; strings
+
+;; string literals
+
+(string) @string
+(string (string_escape) @constant.character.escape)
+
+;; keywords (symbol literals)
+
+(keyword) @string.special.symbol
+
+;; paths
+
+(dot) @string.special.path
+(dotdot) @string.special.path
+(command) @string.special.path
+(subpath (symbol) @string.special.path)
+
+; slashes in a path denote a combiner call
+(subpath (slash) @function)
+
+
+
+;;; specific highlighting for builtins & special forms
+
+;; symbol classification based highlighting
+
+(list . (symbol) @keyword.control.conditional (#match? @keyword.control.conditional "^(if|case|cond|when)$"))
+(cons . (symbol) @keyword.control.conditional (#match? @keyword.control.conditional "^(if|case|cond|when)$"))
+
+(list . (symbol) @keyword.control.repeat (#match? @keyword.control.repeat "^(each)$"))
+(cons . (symbol) @keyword.control.repeat (#match? @keyword.control.repeat "^(each)$"))
+
+(list . (symbol) @label (#match? @label "^(def|defop|defn)$"))
+(cons . (symbol) @label (#match? @label "^(def|defop|defn)$"))
+
+(list . (symbol) @function.builtin (#match? @function.builtin "^(dump|mkfs|json|log|error|now|cons|wrap|unwrap|eval|make-scope|bind|meta|with-meta|null\\?|ignore\\?|boolean\\?|number\\?|string\\?|symbol\\?|scope\\?|sink\\?|source\\?|list\\?|pair\\?|applicative\\?|operative\\?|combiner\\?|path\\?|empty\\?|thunk\\?|\\+|\\*|quot|-|max|min|=|>|>=|<|<=|list->source|across|emit|next|reduce-kv|assoc|symbol->string|string->symbol|str|substring|trim|scope->list|string->fs-path|string->cmd-path|string->dir|subpath|path-name|path-stem|with-image|with-dir|with-args|with-cmd|with-stdin|with-env|with-insecure|with-label|with-port|with-tls|with-mount|thunk-cmd|thunk-args|resolve|start|addr|wait|read|cache-dir|binds\\?|recall-memo|store-memo|mask|list|list\\*|first|rest|length|second|third|map|map-pairs|foldr|foldl|append|filter|conj|list->scope|merge|apply|id|always|vals|keys|memo|succeeds\\?|run|last|take|take-all|insecure!|from|cd|wrap-cmd|mkfile|path-base|not)$"))
+(cons . (symbol) @function.builtin (#match? @function.builtin "^(dump|mkfs|json|log|error|now|cons|wrap|unwrap|eval|make-scope|bind|meta|with-meta|null\\?|ignore\\?|boolean\\?|number\\?|string\\?|symbol\\?|scope\\?|sink\\?|source\\?|list\\?|pair\\?|applicative\\?|operative\\?|combiner\\?|path\\?|empty\\?|thunk\\?|\\+|\\*|quot|-|max|min|=|>|>=|<|<=|list->source|across|emit|next|reduce-kv|assoc|symbol->string|string->symbol|str|substring|trim|scope->list|string->fs-path|string->cmd-path|string->dir|subpath|path-name|path-stem|with-image|with-dir|with-args|with-cmd|with-stdin|with-env|with-insecure|with-label|with-port|with-tls|with-mount|thunk-cmd|thunk-args|resolve|start|addr|wait|read|cache-dir|binds\\?|recall-memo|store-memo|mask|list|list\\*|first|rest|length|second|third|map|map-pairs|foldr|foldl|append|filter|conj|list->scope|merge|apply|id|always|vals|keys|memo|succeeds\\?|run|last|take|take-all|insecure!|from|cd|wrap-cmd|mkfile|path-base|not)$"))
+
+(list . (symbol) @function.macro (#match? @function.macro "^(op|fn|current-scope|quote|let|provide|module|or|and|->|curryfn|for|\\$|linux)$"))
+(cons . (symbol) @function.macro (#match? @function.macro "^(op|fn|current-scope|quote|let|provide|module|or|and|->|curryfn|for|\\$|linux)$"))
+
+(list . (symbol) @keyword.builtin (#match? @keyword.builtin "^(do|doc)$"))
+(cons . (symbol) @keyword.builtin (#match? @keyword.builtin "^(do|doc)$"))
+
+(list . (symbol) @keyword.control.import (#match? @keyword.control.import "^(use|import|load)$"))
+(cons . (symbol) @keyword.control.import (#match? @keyword.control.import "^(use|import|load)$"))
+
+
+;; special cases
+
+; [a & b] highlights & as operator rather than a regular symbol
+(list (symbol) @operator (#match? @operator "&"))
+(cons (symbol) @operator (#match? @operator "&"))
+
+; (-> x y z) highlights first x as var, y z as function
+(list
+  .
+  (symbol) @function.macro
+  (#eq? @function.macro "->")
+  .
+  (symbol) @variable.parameter
+  (symbol) @function)
+
+; (-> 42 x y) highlights 42 as regular number
+(list
+  .
+  (symbol) @function.macro
+  (#eq? @function.macro "->")
+  .
+  (_)
+  (symbol) @function)
+
+;;; generic highlighting for all forms
+
+; first symbol in a list form is a combiner call
+(list . (symbol) @function)
+
+; highlight symbols as vars only when they're clearly vars
+(cons (symbol) @variable)
+(scope (symbol) @variable)
+(path form: (symbol) @variable)
+(symbind form: (symbol) @variable)

From 5ea7855977aa281206c9c540aa88ce9384619b87 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Mon, 19 Sep 2022 05:03:51 +0200
Subject: [PATCH 133/884] raise msrv to 1.59 (#3896)

---
 .github/workflows/msrv-rust-toolchain.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/msrv-rust-toolchain.toml b/.github/workflows/msrv-rust-toolchain.toml
index ece2fa76..7a3ec50b 100644
--- a/.github/workflows/msrv-rust-toolchain.toml
+++ b/.github/workflows/msrv-rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.57.0"
+channel = "1.59.0"
 components = ["rustfmt", "rust-src"]

From 08b2ecc99a1ac1c461117bf6c79b77484eb433e4 Mon Sep 17 00:00:00 2001
From: Alexander Brevig <alexanderbrevig@gmail.com>
Date: Mon, 19 Sep 2022 15:38:20 +0200
Subject: [PATCH 134/884] feat: xtask themelint (#3234)

* feat: cargo xtask themelint <theme>

* fix: add docs and print json error status

* fix: refactor paths -> path

* fix: remove unused function

* fix: only report one err per scope (ui.statusline is reported if none of ui.statusline.* is recognized)

* fix: save work for later

* fix: finally decided on a design

* fix: ready for discussion

* fix: better rules

* fix: lint precision

* fix: String -> &'static str

* fix: allowlist not denylist for file type

* fix: add missing and indication of what's needed

* fix: copy pasteable errors

* fix: use Loader:read_names

* Update xtask/src/helpers.rs

Co-authored-by: Ivan Tham <pickfire@riseup.net>

* fix: remove into and clone for str

* Update book/src/themes.md

Co-authored-by: Ivan Tham <pickfire@riseup.net>

* fix: better lint output

* fix: cleaner logic for lint reporting

* style: use explicit imports

* Pascal support (#3542)

* fix: add difference check for statusline normal,insert,select

* fix: fg for whitespace and early exit if and one is ok

* chore: cleaning up, no idea how these got here or how this will look

* chore: revert from older commit?

* refactor: use static fn to equalize api between difference and existance

* refactor: querycheck and clippy

* refactor: clippy fixes

* fix: query-check behaves as before

* fix: error with x of y message, not total count

* fix: consistent reporting and less mutable state

* fix: selection difference ref #3942 ref #1833

Co-authored-by: Ivan Tham <pickfire@riseup.net>
Co-authored-by: ath3 <45574139+ath3@users.noreply.github.com>
---
 Cargo.lock              |   1 +
 book/src/themes.md      |   6 +
 xtask/Cargo.toml        |   1 +
 xtask/src/docgen.rs     | 117 ++++++++++++++++++
 xtask/src/helpers.rs    |  44 +++++++
 xtask/src/main.rs       | 258 ++++------------------------------------
 xtask/src/path.rs       |  24 ++++
 xtask/src/querycheck.rs |  39 ++++++
 xtask/src/themelint.rs  | 199 +++++++++++++++++++++++++++++++
 9 files changed, 451 insertions(+), 238 deletions(-)
 create mode 100644 xtask/src/docgen.rs
 create mode 100644 xtask/src/helpers.rs
 create mode 100644 xtask/src/path.rs
 create mode 100644 xtask/src/querycheck.rs
 create mode 100644 xtask/src/themelint.rs

diff --git a/Cargo.lock b/Cargo.lock
index d8d82d28..c8bf13bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1469,5 +1469,6 @@ dependencies = [
  "helix-core",
  "helix-loader",
  "helix-term",
+ "helix-view",
  "toml",
 ]
diff --git a/book/src/themes.md b/book/src/themes.md
index b37ee852..9908456f 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -254,4 +254,10 @@ These scopes are used for theming the editor interface.
 | `diagnostic.warning`      | Diagnostics warning (editing area)             |
 | `diagnostic.error`        | Diagnostics error (editing area)               |
 
+You can check compliance to spec with
+
+```shell
+cargo xtask themelint onedark  # replace onedark with <name>
+```
+
 [editor-section]: ./configuration.md#editor-section
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 76c38c99..127b931c 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -8,5 +8,6 @@ edition = "2021"
 [dependencies]
 helix-term = { version = "0.6", path = "../helix-term" }
 helix-core = { version = "0.6", path = "../helix-core" }
+helix-view = { version = "0.6", path = "../helix-view" }
 helix-loader = { version = "0.6", path = "../helix-loader" }
 toml = "0.5"
diff --git a/xtask/src/docgen.rs b/xtask/src/docgen.rs
new file mode 100644
index 00000000..473882f3
--- /dev/null
+++ b/xtask/src/docgen.rs
@@ -0,0 +1,117 @@
+use crate::helpers;
+use crate::path;
+use crate::DynError;
+
+use helix_term::commands::TYPABLE_COMMAND_LIST;
+use helix_term::health::TsFeature;
+use std::fs;
+
+pub const TYPABLE_COMMANDS_MD_OUTPUT: &str = "typable-cmd.md";
+pub const LANG_SUPPORT_MD_OUTPUT: &str = "lang-support.md";
+
+fn md_table_heading(cols: &[String]) -> String {
+    let mut header = String::new();
+    header += &md_table_row(cols);
+    header += &md_table_row(&vec!["---".to_string(); cols.len()]);
+    header
+}
+
+fn md_table_row(cols: &[String]) -> String {
+    format!("| {} |\n", cols.join(" | "))
+}
+
+fn md_mono(s: &str) -> String {
+    format!("`{}`", s)
+}
+
+pub fn typable_commands() -> Result<String, DynError> {
+    let mut md = String::new();
+    md.push_str(&md_table_heading(&[
+        "Name".to_owned(),
+        "Description".to_owned(),
+    ]));
+
+    let cmdify = |s: &str| format!("`:{}`", s);
+
+    for cmd in TYPABLE_COMMAND_LIST {
+        let names = std::iter::once(&cmd.name)
+            .chain(cmd.aliases.iter())
+            .map(|a| cmdify(a))
+            .collect::<Vec<_>>()
+            .join(", ");
+
+        let doc = cmd.doc.replace('\n', "<br>");
+
+        md.push_str(&md_table_row(&[names.to_owned(), doc.to_owned()]));
+    }
+
+    Ok(md)
+}
+
+pub fn lang_features() -> Result<String, DynError> {
+    let mut md = String::new();
+    let ts_features = TsFeature::all();
+
+    let mut cols = vec!["Language".to_owned()];
+    cols.append(
+        &mut ts_features
+            .iter()
+            .map(|t| t.long_title().to_string())
+            .collect::<Vec<_>>(),
+    );
+    cols.push("Default LSP".to_owned());
+
+    md.push_str(&md_table_heading(&cols));
+    let config = helpers::lang_config();
+
+    let mut langs = config
+        .language
+        .iter()
+        .map(|l| l.language_id.clone())
+        .collect::<Vec<_>>();
+    langs.sort_unstable();
+
+    let mut ts_features_to_langs = Vec::new();
+    for &feat in ts_features {
+        ts_features_to_langs.push((feat, helpers::ts_lang_support(feat)));
+    }
+
+    let mut row = Vec::new();
+    for lang in langs {
+        let lc = config
+            .language
+            .iter()
+            .find(|l| l.language_id == lang)
+            .unwrap(); // lang comes from config
+        row.push(lc.language_id.clone());
+
+        for (_feat, support_list) in &ts_features_to_langs {
+            row.push(
+                if support_list.contains(&lang) {
+                    "✓"
+                } else {
+                    ""
+                }
+                .to_owned(),
+            );
+        }
+        row.push(
+            lc.language_server
+                .as_ref()
+                .map(|s| s.command.clone())
+                .map(|c| md_mono(&c))
+                .unwrap_or_default(),
+        );
+
+        md.push_str(&md_table_row(&row));
+        row.clear();
+    }
+
+    Ok(md)
+}
+
+pub fn write(filename: &str, data: &str) {
+    let error = format!("Could not write to {}", filename);
+    let path = path::book_gen().join(filename);
+    fs::write(path, data).expect(&error);
+}
diff --git a/xtask/src/helpers.rs b/xtask/src/helpers.rs
new file mode 100644
index 00000000..4f759e74
--- /dev/null
+++ b/xtask/src/helpers.rs
@@ -0,0 +1,44 @@
+use std::path::{Path, PathBuf};
+
+use crate::path;
+use helix_core::syntax::Configuration as LangConfig;
+use helix_term::health::TsFeature;
+
+/// Get the list of languages that support a particular tree-sitter
+/// based feature.
+pub fn ts_lang_support(feat: TsFeature) -> Vec<String> {
+    let queries_dir = path::ts_queries();
+
+    find_files(&queries_dir, feat.runtime_filename())
+        .iter()
+        .map(|f| {
+            // .../helix/runtime/queries/python/highlights.scm
+            let tail = f.strip_prefix(&queries_dir).unwrap(); // python/highlights.scm
+            let lang = tail.components().next().unwrap(); // python
+            lang.as_os_str().to_string_lossy().to_string()
+        })
+        .collect()
+}
+
+// naive implementation, but suffices for our needs
+pub fn find_files(dir: &Path, filename: &str) -> Vec<PathBuf> {
+    std::fs::read_dir(dir)
+        .unwrap()
+        .filter_map(|entry| {
+            let path = entry.ok()?.path();
+            if path.is_dir() {
+                Some(find_files(&path, filename))
+            } else if path.file_name()?.to_string_lossy() == filename {
+                Some(vec![path])
+            } else {
+                None
+            }
+        })
+        .flatten()
+        .collect()
+}
+
+pub fn lang_config() -> LangConfig {
+    let bytes = std::fs::read(path::lang_config()).unwrap();
+    toml::from_slice(&bytes).unwrap()
+}
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index c7640cd1..1421fd1a 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -1,255 +1,35 @@
+mod docgen;
+mod helpers;
+mod path;
+mod querycheck;
+mod themelint;
+
 use std::{env, error::Error};
 
 type DynError = Box<dyn Error>;
 
-pub mod helpers {
-    use std::path::{Path, PathBuf};
-
-    use crate::path;
-    use helix_core::syntax::Configuration as LangConfig;
-    use helix_term::health::TsFeature;
-
-    /// Get the list of languages that support a particular tree-sitter
-    /// based feature.
-    pub fn ts_lang_support(feat: TsFeature) -> Vec<String> {
-        let queries_dir = path::ts_queries();
-
-        find_files(&queries_dir, feat.runtime_filename())
-            .iter()
-            .map(|f| {
-                // .../helix/runtime/queries/python/highlights.scm
-                let tail = f.strip_prefix(&queries_dir).unwrap(); // python/highlights.scm
-                let lang = tail.components().next().unwrap(); // python
-                lang.as_os_str().to_string_lossy().to_string()
-            })
-            .collect()
-    }
-
-    /// Get the list of languages that have any form of tree-sitter
-    /// queries defined in the runtime directory.
-    pub fn langs_with_ts_queries() -> Vec<String> {
-        std::fs::read_dir(path::ts_queries())
-            .unwrap()
-            .filter_map(|entry| {
-                let entry = entry.ok()?;
-                entry
-                    .file_type()
-                    .ok()?
-                    .is_dir()
-                    .then(|| entry.file_name().to_string_lossy().to_string())
-            })
-            .collect()
-    }
-
-    // naive implementation, but suffices for our needs
-    pub fn find_files(dir: &Path, filename: &str) -> Vec<PathBuf> {
-        std::fs::read_dir(dir)
-            .unwrap()
-            .filter_map(|entry| {
-                let path = entry.ok()?.path();
-                if path.is_dir() {
-                    Some(find_files(&path, filename))
-                } else {
-                    (path.file_name()?.to_string_lossy() == filename).then(|| vec![path])
-                }
-            })
-            .flatten()
-            .collect()
-    }
-
-    pub fn lang_config() -> LangConfig {
-        let bytes = std::fs::read(path::lang_config()).unwrap();
-        toml::from_slice(&bytes).unwrap()
-    }
-}
-
-pub mod md_gen {
-    use crate::DynError;
-
-    use crate::helpers;
-    use crate::path;
-    use helix_term::commands::TYPABLE_COMMAND_LIST;
-    use helix_term::health::TsFeature;
-    use std::fs;
-
-    pub const TYPABLE_COMMANDS_MD_OUTPUT: &str = "typable-cmd.md";
-    pub const LANG_SUPPORT_MD_OUTPUT: &str = "lang-support.md";
-
-    fn md_table_heading(cols: &[String]) -> String {
-        let mut header = String::new();
-        header += &md_table_row(cols);
-        header += &md_table_row(&vec!["---".to_string(); cols.len()]);
-        header
-    }
-
-    fn md_table_row(cols: &[String]) -> String {
-        format!("| {} |\n", cols.join(" | "))
-    }
-
-    fn md_mono(s: &str) -> String {
-        format!("`{}`", s)
-    }
-
-    pub fn typable_commands() -> Result<String, DynError> {
-        let mut md = String::new();
-        md.push_str(&md_table_heading(&[
-            "Name".to_owned(),
-            "Description".to_owned(),
-        ]));
-
-        let cmdify = |s: &str| format!("`:{}`", s);
-
-        for cmd in TYPABLE_COMMAND_LIST {
-            let names = std::iter::once(&cmd.name)
-                .chain(cmd.aliases.iter())
-                .map(|a| cmdify(a))
-                .collect::<Vec<_>>()
-                .join(", ");
-
-            let doc = cmd.doc.replace('\n', "<br>");
-
-            md.push_str(&md_table_row(&[names.to_owned(), doc.to_owned()]));
-        }
-
-        Ok(md)
-    }
-
-    pub fn lang_features() -> Result<String, DynError> {
-        let mut md = String::new();
-        let ts_features = TsFeature::all();
-
-        let mut cols = vec!["Language".to_owned()];
-        cols.append(
-            &mut ts_features
-                .iter()
-                .map(|t| t.long_title().to_string())
-                .collect::<Vec<_>>(),
-        );
-        cols.push("Default LSP".to_owned());
-
-        md.push_str(&md_table_heading(&cols));
-        let config = helpers::lang_config();
-
-        let mut langs = config
-            .language
-            .iter()
-            .map(|l| l.language_id.clone())
-            .collect::<Vec<_>>();
-        langs.sort_unstable();
-
-        let mut ts_features_to_langs = Vec::new();
-        for &feat in ts_features {
-            ts_features_to_langs.push((feat, helpers::ts_lang_support(feat)));
-        }
-
-        let mut row = Vec::new();
-        for lang in langs {
-            let lc = config
-                .language
-                .iter()
-                .find(|l| l.language_id == lang)
-                .unwrap(); // lang comes from config
-            row.push(lc.language_id.clone());
-
-            for (_feat, support_list) in &ts_features_to_langs {
-                row.push(
-                    if support_list.contains(&lang) {
-                        "✓"
-                    } else {
-                        ""
-                    }
-                    .to_owned(),
-                );
-            }
-            row.push(
-                lc.language_server
-                    .as_ref()
-                    .map(|s| s.command.clone())
-                    .map(|c| md_mono(&c))
-                    .unwrap_or_default(),
-            );
-
-            md.push_str(&md_table_row(&row));
-            row.clear();
-        }
-
-        Ok(md)
-    }
-
-    pub fn write(filename: &str, data: &str) {
-        let error = format!("Could not write to {}", filename);
-        let path = path::book_gen().join(filename);
-        fs::write(path, data).expect(&error);
-    }
-}
-
-pub mod path {
-    use std::path::{Path, PathBuf};
-
-    pub fn project_root() -> PathBuf {
-        Path::new(env!("CARGO_MANIFEST_DIR"))
-            .parent()
-            .unwrap()
-            .to_path_buf()
-    }
-
-    pub fn book_gen() -> PathBuf {
-        project_root().join("book/src/generated/")
-    }
-
-    pub fn ts_queries() -> PathBuf {
-        project_root().join("runtime/queries")
-    }
-
-    pub fn lang_config() -> PathBuf {
-        project_root().join("languages.toml")
-    }
-}
-
 pub mod tasks {
-    use crate::md_gen;
+    use crate::docgen::{lang_features, typable_commands, write};
+    use crate::docgen::{LANG_SUPPORT_MD_OUTPUT, TYPABLE_COMMANDS_MD_OUTPUT};
+    use crate::querycheck::query_check;
+    use crate::themelint::{lint, lint_all};
     use crate::DynError;
 
     pub fn docgen() -> Result<(), DynError> {
-        use md_gen::*;
         write(TYPABLE_COMMANDS_MD_OUTPUT, &typable_commands()?);
         write(LANG_SUPPORT_MD_OUTPUT, &lang_features()?);
         Ok(())
     }
 
-    pub fn query_check() -> Result<(), String> {
-        use crate::helpers::lang_config;
-        use helix_core::{syntax::read_query, tree_sitter::Query};
-        use helix_loader::grammar::get_language;
-
-        let query_files = [
-            "highlights.scm",
-            "locals.scm",
-            "injections.scm",
-            "textobjects.scm",
-            "indents.scm",
-        ];
-
-        for language in lang_config().language {
-            let language_name = language.language_id.to_ascii_lowercase();
-            let grammar_name = language.grammar.unwrap_or(language.language_id);
-            for query_file in query_files {
-                let language = get_language(&grammar_name);
-                let query_text = read_query(&language_name, query_file);
-                if !query_text.is_empty() && language.is_ok() {
-                    if let Err(reason) = Query::new(language.unwrap(), &query_text) {
-                        return Err(format!(
-                            "Failed to parse {} queries for {}: {}",
-                            query_file, language_name, reason
-                        ));
-                    }
-                }
-            }
+    pub fn themelint(file: Option<String>) -> Result<(), DynError> {
+        match file {
+            Some(file) => lint(file),
+            None => lint_all(),
         }
+    }
 
-        println!("Query check succeeded");
-
-        Ok(())
+    pub fn querycheck() -> Result<(), DynError> {
+        query_check()
     }
 
     pub fn print_help() {
@@ -259,6 +39,7 @@ Usage: Run with `cargo xtask <task>`, eg. `cargo xtask docgen`.
 
     Tasks:
         docgen: Generate files to be included in the mdbook output.
+        themelint <theme>: Report errors for <theme>, or all themes if no theme is specified.
         query-check: Check that tree-sitter queries are valid.
 "
         );
@@ -271,7 +52,8 @@ fn main() -> Result<(), DynError> {
         None => tasks::print_help(),
         Some(t) => match t.as_str() {
             "docgen" => tasks::docgen()?,
-            "query-check" => tasks::query_check()?,
+            "themelint" => tasks::themelint(env::args().nth(2))?,
+            "query-check" => tasks::querycheck()?,
             invalid => return Err(format!("Invalid task name: {}", invalid).into()),
         },
     };
diff --git a/xtask/src/path.rs b/xtask/src/path.rs
new file mode 100644
index 00000000..6f4545c2
--- /dev/null
+++ b/xtask/src/path.rs
@@ -0,0 +1,24 @@
+use std::path::{Path, PathBuf};
+
+pub fn project_root() -> PathBuf {
+    Path::new(env!("CARGO_MANIFEST_DIR"))
+        .parent()
+        .unwrap()
+        .to_path_buf()
+}
+
+pub fn book_gen() -> PathBuf {
+    project_root().join("book/src/generated/")
+}
+
+pub fn ts_queries() -> PathBuf {
+    project_root().join("runtime/queries")
+}
+
+pub fn lang_config() -> PathBuf {
+    project_root().join("languages.toml")
+}
+
+pub fn themes() -> PathBuf {
+    project_root().join("runtime/themes")
+}
diff --git a/xtask/src/querycheck.rs b/xtask/src/querycheck.rs
new file mode 100644
index 00000000..5595b8ec
--- /dev/null
+++ b/xtask/src/querycheck.rs
@@ -0,0 +1,39 @@
+use crate::DynError;
+
+pub fn query_check() -> Result<(), DynError> {
+    use crate::helpers::lang_config;
+    use helix_core::{syntax::read_query, tree_sitter::Query};
+    use helix_loader::grammar::get_language;
+
+    let query_files = [
+        "highlights.scm",
+        "locals.scm",
+        "injections.scm",
+        "textobjects.scm",
+        "indents.scm",
+    ];
+
+    for language in lang_config().language {
+        let language_name = language.language_id.to_ascii_lowercase();
+        let grammar_name = language.grammar.unwrap_or(language.language_id);
+        for query_file in query_files {
+            let language = get_language(&grammar_name);
+            let query_text = read_query(&language_name, query_file);
+            if let Ok(lang) = language {
+                if !query_text.is_empty() {
+                    if let Err(reason) = Query::new(lang, &query_text) {
+                        return Err(format!(
+                            "Failed to parse {} queries for {}: {}",
+                            query_file, language_name, reason
+                        )
+                        .into());
+                    }
+                }
+            }
+        }
+    }
+
+    println!("Query check succeeded");
+
+    Ok(())
+}
diff --git a/xtask/src/themelint.rs b/xtask/src/themelint.rs
new file mode 100644
index 00000000..26d1cb04
--- /dev/null
+++ b/xtask/src/themelint.rs
@@ -0,0 +1,199 @@
+use crate::path;
+use crate::DynError;
+use helix_view::theme::Loader;
+use helix_view::theme::Modifier;
+use helix_view::Theme;
+
+struct Rule {
+    fg: Option<&'static str>,
+    bg: Option<&'static str>,
+    check_both: bool,
+}
+
+enum Require {
+    Existence(Rule),
+    Difference(&'static str, &'static str),
+}
+
+// Placed in an fn here, so it's the first thing you see
+fn get_rules() -> Vec<Require> {
+    vec![
+        // Check for ui.selection, which is required
+        Require::Existence(Rule::has_either("ui.selection")),
+        Require::Existence(Rule::has_either("ui.selection.primary")),
+        Require::Difference("ui.selection", "ui.selection.primary"),
+        // Check for planned readable text
+        Require::Existence(Rule::has_fg("ui.text")),
+        Require::Existence(Rule::has_bg("ui.background")),
+        // Check for complete editor.statusline bare minimum
+        Require::Existence(Rule::has_both("ui.statusline")),
+        Require::Existence(Rule::has_both("ui.statusline.inactive")),
+        // Check for editor.color-modes
+        Require::Existence(Rule::has_either("ui.statusline.normal")),
+        Require::Existence(Rule::has_either("ui.statusline.insert")),
+        Require::Existence(Rule::has_either("ui.statusline.select")),
+        Require::Difference("ui.statusline.normal", "ui.statusline.insert"),
+        Require::Difference("ui.statusline.normal", "ui.statusline.select"),
+        // Check for editor.cursorline
+        Require::Existence(Rule::has_bg("ui.cursorline.primary")),
+        // Check for editor.whitespace
+        Require::Existence(Rule::has_fg("ui.virtual.whitespace")),
+        // Check fir rulers
+        Require::Existence(Rule::has_either("ui.virtual.indent-guide")),
+        // Check for editor.rulers
+        Require::Existence(Rule::has_either("ui.virtual.ruler")),
+        // Check for menus and prompts
+        Require::Existence(Rule::has_both("ui.menu")),
+        Require::Existence(Rule::has_both("ui.help")),
+        Require::Existence(Rule::has_bg("ui.popup")),
+        Require::Existence(Rule::has_either("ui.window")),
+        // Check for visible cursor
+        Require::Existence(Rule::has_bg("ui.cursor.primary")),
+        Require::Existence(Rule::has_either("ui.cursor.match")),
+    ]
+}
+
+impl Rule {
+    fn has_bg(bg: &'static str) -> Rule {
+        Rule {
+            fg: None,
+            bg: Some(bg),
+            check_both: true,
+        }
+    }
+    fn has_fg(fg: &'static str) -> Rule {
+        Rule {
+            fg: Some(fg),
+            bg: None,
+            check_both: true,
+        }
+    }
+    fn has_either(item: &'static str) -> Rule {
+        Rule {
+            fg: Some(item),
+            bg: Some(item),
+            check_both: false,
+        }
+    }
+    fn has_both(item: &'static str) -> Rule {
+        Rule {
+            fg: Some(item),
+            bg: Some(item),
+            check_both: true,
+        }
+    }
+    fn found_fg(&self, theme: &Theme) -> bool {
+        if let Some(fg) = &self.fg {
+            if theme.get(fg).fg.is_none() && theme.get(fg).add_modifier == Modifier::empty() {
+                return false;
+            }
+        }
+        true
+    }
+    fn found_bg(&self, theme: &Theme) -> bool {
+        if let Some(bg) = &self.bg {
+            if theme.get(bg).bg.is_none() && theme.get(bg).add_modifier == Modifier::empty() {
+                return false;
+            }
+        }
+        true
+    }
+    fn rule_name(&self) -> &'static str {
+        if self.fg.is_some() {
+            self.fg.unwrap()
+        } else if self.bg.is_some() {
+            self.bg.unwrap()
+        } else {
+            "LINTER_ERROR_NO_RULE"
+        }
+    }
+
+    fn check_difference(
+        theme: &Theme,
+        a: &'static str,
+        b: &'static str,
+        messages: &mut Vec<String>,
+    ) {
+        let theme_a = theme.get(a);
+        let theme_b = theme.get(b);
+        if theme_a == theme_b {
+            messages.push(format!("$THEME: `{}` and `{}` cannot be equal", a, b));
+        }
+    }
+
+    fn check_existence(rule: &Rule, theme: &Theme, messages: &mut Vec<String>) {
+        let found_fg = rule.found_fg(theme);
+        let found_bg = rule.found_bg(theme);
+
+        if !rule.check_both && (found_fg || found_bg) {
+            return;
+        }
+        if !found_fg || !found_bg {
+            let mut missing = vec![];
+            if !found_fg {
+                missing.push("`fg`");
+            }
+            if !found_bg {
+                missing.push("`bg`");
+            }
+            let entry = if !rule.check_both && !found_fg && !found_bg {
+                missing.join(" or ")
+            } else {
+                missing.join(" and ")
+            };
+            messages.push(format!(
+                "$THEME: missing {} for `{}`",
+                entry,
+                rule.rule_name()
+            ))
+        }
+    }
+}
+
+pub fn lint(file: String) -> Result<(), DynError> {
+    if file.contains("base16") {
+        println!("Skipping base16: {}", file);
+        return Ok(());
+    }
+    let path = path::themes().join(file.clone() + ".toml");
+    let theme = std::fs::read(&path).unwrap();
+    let theme: Theme = toml::from_slice(&theme).expect("Failed to parse theme");
+
+    let mut messages: Vec<String> = vec![];
+    get_rules().iter().for_each(|lint| match lint {
+        Require::Existence(rule) => Rule::check_existence(rule, &theme, &mut messages),
+        Require::Difference(a, b) => Rule::check_difference(&theme, a, b, &mut messages),
+    });
+
+    if !messages.is_empty() {
+        messages.iter().for_each(|m| {
+            let theme = file.clone();
+            let message = m.replace("$THEME", theme.as_str());
+            println!("{}", message);
+        });
+        Err(format!("{} has issues", file.clone().as_str()).into())
+    } else {
+        Ok(())
+    }
+}
+
+pub fn lint_all() -> Result<(), DynError> {
+    let files = Loader::read_names(path::themes().as_path());
+    let files_count = files.len();
+    let ok_files_count = files
+        .into_iter()
+        .filter_map(|path| lint(path.replace(".toml", "")).ok())
+        .collect::<Vec<()>>()
+        .len();
+
+    if files_count != ok_files_count {
+        Err(format!(
+            "{} of {} themes had issues",
+            files_count - ok_files_count,
+            files_count
+        )
+        .into())
+    } else {
+        Ok(())
+    }
+}

From e85d6c37d43be645e4dcf926a23b7b5c551145fc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Sep 2022 18:25:22 -0500
Subject: [PATCH 135/884] build(deps): bump anyhow from 1.0.64 to 1.0.65
 (#3907)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c8bf13bf..45ae315d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -22,9 +22,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.64"
+version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9a8f622bcf6ff3df478e9deba3e03e4e04b300f8e6a139e192c05fa3490afc7"
+checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"
 
 [[package]]
 name = "arc-swap"

From 3acdf9fdf910f1bc67262bb587596139272a9458 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Sep 2022 18:26:18 -0500
Subject: [PATCH 136/884] build(deps): bump thiserror from 1.0.34 to 1.0.35
 (#3905)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 45ae315d..fdfc492a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1118,18 +1118,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.34"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c1b05ca9d106ba7d2e31a9dab4a64e7be2cce415321966ea3132c49a656e252"
+checksum = "c53f98874615aea268107765aa1ed8f6116782501d18e53d08b471733bea6c85"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.34"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8f2591983642de85c921015f3f070c665a197ed69e417af436115e3a1407487"
+checksum = "f8b463991b4eab2d801e724172285ec4195c650e8ec79b149e6c2a8e6dd3f783"
 dependencies = [
  "proc-macro2",
  "quote",

From 24501669272b537302ea253c95abf487b0f21ead Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Sep 2022 18:27:04 -0500
Subject: [PATCH 137/884] build(deps): bump tokio from 1.21.0 to 1.21.1 (#3904)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fdfc492a..144d63a6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1171,9 +1171,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.21.0"
+version = "1.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89797afd69d206ccd11fb0ea560a44bbb87731d020670e79416d442919257d42"
+checksum = "0020c875007ad96677dcc890298f4b942882c5d4eb7cc8f439fc3bf813dc9c95"
 dependencies = [
  "autocfg",
  "bytes",

From 674bfec9845c9ea3406b19639151e7882f5310bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Sep 2022 18:28:12 -0500
Subject: [PATCH 138/884] build(deps): bump unicode-width from 0.1.9 to 0.1.10
 (#3902)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 144d63a6..c232f080 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1284,9 +1284,9 @@ checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
 
 [[package]]
 name = "url"

From 26c3c993302f6acd2cc0ed47bc2807d3b7e5e028 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Sep 2022 18:28:38 -0500
Subject: [PATCH 139/884] build(deps): bump unicode-segmentation from 1.9.0 to
 1.10.0 (#3903)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 4 ++--
 helix-core/Cargo.toml | 2 +-
 helix-tui/Cargo.toml  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c232f080..760efaff 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1278,9 +1278,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
+checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
 
 [[package]]
 name = "unicode-width"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 3ea7235d..c63059a2 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -20,7 +20,7 @@ helix-loader = { version = "0.6", path = "../helix-loader" }
 ropey = { version = "1.5", default-features = false, features = ["simd"] }
 smallvec = "1.9"
 smartstring = "1.0.1"
-unicode-segmentation = "1.9"
+unicode-segmentation = "1.10"
 unicode-width = "0.1"
 unicode-general-category = "0.5"
 # slab = "0.4.2"
diff --git a/helix-tui/Cargo.toml b/helix-tui/Cargo.toml
index effad198..b220c64f 100644
--- a/helix-tui/Cargo.toml
+++ b/helix-tui/Cargo.toml
@@ -18,7 +18,7 @@ default = ["crossterm"]
 [dependencies]
 bitflags = "1.3"
 cassowary = "0.3"
-unicode-segmentation = "1.9"
+unicode-segmentation = "1.10"
 crossterm = { version = "0.25", optional = true }
 serde = { version = "1", "optional" = true, features = ["derive"]}
 helix-view = { version = "0.6", path = "../helix-view", features = ["term"] }

From 947ff63e6d31d7926aff83ebb328e03a10deceb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Sep 2022 18:29:00 -0500
Subject: [PATCH 140/884] build(deps): bump textwrap from 0.15.0 to 0.15.1
 (#3906)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 4 ++--
 helix-core/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 760efaff..a26c92e4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1107,9 +1107,9 @@ dependencies = [
 
 [[package]]
 name = "textwrap"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
+checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
 dependencies = [
  "smawk",
  "unicode-linebreak",
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index c63059a2..0ec58af9 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -42,7 +42,7 @@ encoding_rs = "0.8"
 chrono = { version = "0.4", default-features = false, features = ["alloc", "std"] }
 
 etcetera = "0.4"
-textwrap = "0.15.0"
+textwrap = "0.15.1"
 
 [dev-dependencies]
 quickcheck = { version = "1", default-features = false }

From 8988c1ecc757bb4d1c2372d8b8a78bae6a1fd85e Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 20 Sep 2022 02:08:58 -0500
Subject: [PATCH 141/884] Re-sort diagnostics after transaction transform
 (#3895)

Applying document-change transactions to diagnostic ranges is not stable
with respect to the ordering of diagnostics. This can cause diagnostics
to become temporarily unordered with some edits to a document, which can
eventually break some invariants/assumptions in syntax::merge.

With this change, Document::diagnostics are always sorted.
---
 helix-view/src/document.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 8ebc9002..2ef99c6a 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -788,6 +788,8 @@ impl Document {
                 diagnostic.range.end = changes.map_pos(diagnostic.range.end, Assoc::After);
                 diagnostic.line = self.text.char_to_line(diagnostic.range.start);
             }
+            self.diagnostics
+                .sort_unstable_by_key(|diagnostic| diagnostic.range);
 
             // emit lsp notification
             if let Some(language_server) = self.language_server() {

From 130793dfd06306d1f9d25c150c2dc456cda3f9ed Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@gmail.com>
Date: Tue, 20 Sep 2022 09:11:30 +0200
Subject: [PATCH 142/884] Add command line parameter to specify log file
 (#3807)

* Add command line parameter to specify log file

I had the logs of my debug helix mixed in with the logs from the
production helix.

Add a `--log` command line argument to redirect any logs to other
files, making my debugging easier :-)

* Update completion files with `--log` argument
---
 contrib/completion/hx.bash | 2 +-
 contrib/completion/hx.elv  | 8 +++++++-
 contrib/completion/hx.fish | 1 +
 contrib/completion/hx.zsh  | 1 +
 helix-term/src/args.rs     | 5 +++++
 helix-term/src/main.rs     | 2 ++
 6 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/contrib/completion/hx.bash b/contrib/completion/hx.bash
index 8a2d9777..89f3283c 100644
--- a/contrib/completion/hx.bash
+++ b/contrib/completion/hx.bash
@@ -16,7 +16,7 @@ _hx() {
 		COMPREPLY=($(compgen -W "$languages" -- $2))
 		;;
 	*)
-		COMPREPLY=($(compgen -fd -W "-h --help --tutor -V --version -v -vv -vvv --health -g --grammar --vsplit --hsplit -c --config" -- $2))
+		COMPREPLY=($(compgen -fd -W "-h --help --tutor -V --version -v -vv -vvv --health -g --grammar --vsplit --hsplit -c --config --log" -- $2))
 		;;
 	esac
 } && complete -F _hx hx
diff --git a/contrib/completion/hx.elv b/contrib/completion/hx.elv
index d3d227bc..42c88585 100644
--- a/contrib/completion/hx.elv
+++ b/contrib/completion/hx.elv
@@ -36,6 +36,11 @@ set edit:completion:arg-completer[hx] = {|@args|
       edit:complete-filename $args[-1] | each { |v| put $v[stem] }
       return
     } 
+    # When we have --log, we need a file
+    if (has-values "log" $args[-2]) {
+      edit:complete-filename $args[-1] | each { |v| put $v[stem] }
+      return
+    } 
   } 
   edit:complete-filename $args[-1] | each { |v| put $v[stem]}
   $candidate "--help" "(Prints help information)"
@@ -46,4 +51,5 @@ set edit:completion:arg-completer[hx] = {|@args|
   $candidate "--vsplit" "(Splits all given files vertically)"
   $candidate "--hsplit" "(Splits all given files horizontally)"
   $candidate "--config" "(Specifies a file to use for configuration)"
-}
\ No newline at end of file
+  $candidate "--log" "(Specifies a file to write log data into)"
+}
diff --git a/contrib/completion/hx.fish b/contrib/completion/hx.fish
index 65f248d4..71c74ab0 100644
--- a/contrib/completion/hx.fish
+++ b/contrib/completion/hx.fish
@@ -12,3 +12,4 @@ complete -c hx -s V -l version -d "Prints version information"
 complete -c hx -l vsplit -d "Splits all given files vertically into different windows"
 complete -c hx -l hsplit -d "Splits all given files horizontally into different windows"
 complete -c hx -s c -l config -d "Specifies a file to use for completion"
+complete -c hx -s c -l log -d "Specifies a file to write log data into"
diff --git a/contrib/completion/hx.zsh b/contrib/completion/hx.zsh
index e3375656..aaad6f84 100644
--- a/contrib/completion/hx.zsh
+++ b/contrib/completion/hx.zsh
@@ -18,6 +18,7 @@ _hx() {
 		"--hsplit[Splits all given files horizontally into different windows]" \
 		"-c[Specifies a file to use for configuration]" \
 		"--config[Specifies a file to use for configuration]" \
+		"--log[Specifies a file to write log data into]" \
 		"*:file:_files"
 
 	case "$state" in
diff --git a/helix-term/src/args.rs b/helix-term/src/args.rs
index d16d7dfd..48c86633 100644
--- a/helix-term/src/args.rs
+++ b/helix-term/src/args.rs
@@ -14,6 +14,7 @@ pub struct Args {
     pub build_grammars: bool,
     pub split: Option<Layout>,
     pub verbosity: u64,
+    pub log_file: Option<PathBuf>,
     pub config_file: Option<PathBuf>,
     pub files: Vec<(PathBuf, Position)>,
 }
@@ -48,6 +49,10 @@ impl Args {
                     Some(path) => args.config_file = Some(path.into()),
                     None => anyhow::bail!("--config must specify a path to read"),
                 },
+                "--log" => match argv.next().as_deref() {
+                    Some(path) => args.log_file = Some(path.into()),
+                    None => anyhow::bail!("--log must specify a path to write"),
+                },
                 arg if arg.starts_with("--") => {
                     anyhow::bail!("unexpected double dash argument: {}", arg)
                 }
diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs
index d21d3e77..726bf9e3 100644
--- a/helix-term/src/main.rs
+++ b/helix-term/src/main.rs
@@ -67,6 +67,7 @@ FLAGS:
     -g, --grammar {{fetch|build}}    Fetches or builds tree-sitter grammars listed in languages.toml
     -c, --config <file>            Specifies a file to use for configuration
     -v                             Increases logging verbosity each use for up to 3 times
+    --log                          Specifies a file to use for logging
                                    (default file: {})
     -V, --version                  Prints version information
     --vsplit                       Splits all given files vertically into different windows
@@ -114,6 +115,7 @@ FLAGS:
         return Ok(0);
     }
 
+    let logpath = args.log_file.as_ref().cloned().unwrap_or(logpath);
     setup_logging(logpath, args.verbosity).context("failed to initialize logging")?;
 
     let config_dir = helix_loader::config_dir();

From 64b074541363c72534dc86d00053ecbd5511a9ca Mon Sep 17 00:00:00 2001
From: Luke Cycon <luke@lukecycon.com>
Date: Tue, 20 Sep 2022 00:21:15 -0700
Subject: [PATCH 143/884] Track source and tags in diagnostics (#3898)

---
 helix-core/src/diagnostic.rs  |  8 ++++++++
 helix-lsp/src/lib.rs          | 22 ++++++++++++++++++++--
 helix-term/src/application.rs | 19 +++++++++++++++++--
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/helix-core/src/diagnostic.rs b/helix-core/src/diagnostic.rs
index 48a68dc0..da199ac9 100644
--- a/helix-core/src/diagnostic.rs
+++ b/helix-core/src/diagnostic.rs
@@ -29,6 +29,12 @@ pub enum NumberOrString {
     String(String),
 }
 
+#[derive(Debug, Clone)]
+pub enum DiagnosticTag {
+    Unnecessary,
+    Deprecated,
+}
+
 /// Corresponds to [`lsp_types::Diagnostic`](https://docs.rs/lsp-types/0.91.0/lsp_types/struct.Diagnostic.html)
 #[derive(Debug, Clone)]
 pub struct Diagnostic {
@@ -37,4 +43,6 @@ pub struct Diagnostic {
     pub message: String,
     pub severity: Option<Severity>,
     pub code: Option<NumberOrString>,
+    pub tags: Option<Vec<DiagnosticTag>>,
+    pub source: Option<String>,
 }
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index a39325fa..8c76c4a8 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -84,15 +84,33 @@ pub mod util {
             None => None,
         };
 
+        let tags = if let Some(ref tags) = diag.tags {
+            let new_tags = tags
+                .iter()
+                .map(|tag| match tag {
+                    helix_core::diagnostic::DiagnosticTag::Unnecessary => {
+                        lsp::DiagnosticTag::UNNECESSARY
+                    }
+                    helix_core::diagnostic::DiagnosticTag::Deprecated => {
+                        lsp::DiagnosticTag::DEPRECATED
+                    }
+                })
+                .collect();
+
+            Some(new_tags)
+        } else {
+            None
+        };
+
         // TODO: add support for Diagnostic.data
         lsp::Diagnostic::new(
             range_to_lsp_range(doc, range, offset_encoding),
             severity,
             code,
-            None,
+            diag.source.clone(),
             diag.message.to_owned(),
             None,
-            None,
+            tags,
         )
     }
 
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 7ee5b7f1..496464f0 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -2,7 +2,7 @@ use arc_swap::{access::Map, ArcSwap};
 use futures_util::Stream;
 use helix_core::{
     config::{default_syntax_loader, user_syntax_loader},
-    diagnostic::NumberOrString,
+    diagnostic::{DiagnosticTag, NumberOrString},
     pos_at_coords, syntax, Selection,
 };
 use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap};
@@ -605,13 +605,28 @@ impl Application {
                                         None => None,
                                     };
 
+                                    let tags = if let Some(ref tags) = diagnostic.tags {
+                                        let new_tags = tags.iter().filter_map(|tag| {
+                                            match *tag {
+                                                lsp::DiagnosticTag::DEPRECATED => Some(DiagnosticTag::Deprecated),
+                                                lsp::DiagnosticTag::UNNECESSARY => Some(DiagnosticTag::Unnecessary),
+                                                _ => None
+                                            }
+                                        }).collect();
+
+                                        Some(new_tags)
+                                    } else {
+                                        None
+                                    };
+
                                     Some(Diagnostic {
                                         range: Range { start, end },
                                         line: diagnostic.range.start.line as usize,
                                         message: diagnostic.message.clone(),
                                         severity,
                                         code,
-                                        // source
+                                        tags,
+                                        source: diagnostic.source.clone()
                                     })
                                 })
                                 .collect();

From 1df32c917c8a386947063403577098d1277380c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 20 Sep 2022 16:28:00 +0900
Subject: [PATCH 144/884] diagnostics: Use Vec<Tag> instead of Option<Vec<Tag>>

---
 helix-core/src/diagnostic.rs  |  2 +-
 helix-lsp/src/lib.rs          | 23 +++++++++++------------
 helix-term/src/application.rs |  4 ++--
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/helix-core/src/diagnostic.rs b/helix-core/src/diagnostic.rs
index da199ac9..db1f2da9 100644
--- a/helix-core/src/diagnostic.rs
+++ b/helix-core/src/diagnostic.rs
@@ -43,6 +43,6 @@ pub struct Diagnostic {
     pub message: String,
     pub severity: Option<Severity>,
     pub code: Option<NumberOrString>,
-    pub tags: Option<Vec<DiagnosticTag>>,
+    pub tags: Vec<DiagnosticTag>,
     pub source: Option<String>,
 }
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index 8c76c4a8..8d43410a 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -84,19 +84,18 @@ pub mod util {
             None => None,
         };
 
-        let tags = if let Some(ref tags) = diag.tags {
-            let new_tags = tags
-                .iter()
-                .map(|tag| match tag {
-                    helix_core::diagnostic::DiagnosticTag::Unnecessary => {
-                        lsp::DiagnosticTag::UNNECESSARY
-                    }
-                    helix_core::diagnostic::DiagnosticTag::Deprecated => {
-                        lsp::DiagnosticTag::DEPRECATED
-                    }
-                })
-                .collect();
+        let new_tags: Vec<_> = diag
+            .tags
+            .iter()
+            .map(|tag| match tag {
+                helix_core::diagnostic::DiagnosticTag::Unnecessary => {
+                    lsp::DiagnosticTag::UNNECESSARY
+                }
+                helix_core::diagnostic::DiagnosticTag::Deprecated => lsp::DiagnosticTag::DEPRECATED,
+            })
+            .collect();
 
+        let tags = if !new_tags.is_empty() {
             Some(new_tags)
         } else {
             None
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 496464f0..cd499f1c 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -614,9 +614,9 @@ impl Application {
                                             }
                                         }).collect();
 
-                                        Some(new_tags)
+                                        new_tags
                                     } else {
-                                        None
+                                        Vec::new()
                                     };
 
                                     Some(Diagnostic {

From aa00a470f31514b792e219513ffb3806a5e5b53e Mon Sep 17 00:00:00 2001
From: Joe <Josephharrisonlim@gmail.com>
Date: Tue, 20 Sep 2022 03:40:48 -0400
Subject: [PATCH 145/884] Fix preview bug (#3644)

* Fix preview bug

* Add comment to empty case
---
 helix-term/src/commands/typed.rs | 5 ++++-
 helix-term/src/ui/prompt.rs      | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index c22f8712..f49fff30 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -715,7 +715,10 @@ fn theme(
             cx.editor.unset_theme_preview();
         }
         PromptEvent::Update => {
-            if let Some(theme_name) = args.first() {
+            if args.is_empty() {
+                // Ensures that a preview theme gets cleaned up if the user backspaces until the prompt is empty.
+                cx.editor.unset_theme_preview();
+            } else if let Some(theme_name) = args.first() {
                 if let Ok(theme) = cx.editor.theme_loader.load(theme_name) {
                     if !(true_color || theme.is_16_color()) {
                         bail!("Unsupported theme: theme requires true color support");
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index d66e32be..db3bd62d 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -293,6 +293,7 @@ impl Prompt {
         register: char,
         direction: CompletionDirection,
     ) {
+        (self.callback_fn)(cx, &self.line, PromptEvent::Abort);
         let register = cx.editor.registers.get_mut(register).read();
 
         if register.is_empty() {
@@ -314,6 +315,7 @@ impl Prompt {
         self.history_pos = Some(index);
 
         self.move_end();
+        (self.callback_fn)(cx, &self.line, PromptEvent::Update);
         self.recalculate_completion(cx.editor);
     }
 
@@ -564,13 +566,11 @@ impl Component for Prompt {
             ctrl!('p') | key!(Up) => {
                 if let Some(register) = self.history_register {
                     self.change_history(cx, register, CompletionDirection::Backward);
-                    (self.callback_fn)(cx, &self.line, PromptEvent::Update);
                 }
             }
             ctrl!('n') | key!(Down) => {
                 if let Some(register) = self.history_register {
                     self.change_history(cx, register, CompletionDirection::Forward);
-                    (self.callback_fn)(cx, &self.line, PromptEvent::Update);
                 }
             }
             key!(Tab) => {

From 385ccdfc9c4f04cbe33c7cfdd668a1f694b6d870 Mon Sep 17 00:00:00 2001
From: Filipe Azevedo <filipe@azevedo.io>
Date: Tue, 20 Sep 2022 08:44:36 +0100
Subject: [PATCH 146/884] add :lsp-restart command (#3435)

---
 book/src/generated/typable-cmd.md |   1 +
 helix-lsp/src/lib.rs              | 118 ++++++++++++++++++++----------
 helix-term/src/commands/typed.rs  |  41 +++++++++++
 3 files changed, 123 insertions(+), 37 deletions(-)

diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index 653acf60..4cbff306 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -44,6 +44,7 @@
 | `:show-directory`, `:pwd` | Show the current working directory. |
 | `:encoding` | Set encoding. Based on `https://encoding.spec.whatwg.org`. |
 | `:reload` | Discard changes and reload from the source file. |
+| `:lsp-restart` | Restarts the Language Server that is in use by the current doc |
 | `:tree-sitter-scopes` | Display tree sitter scopes, primarily for theming and development. |
 | `:debug-start`, `:dbg` | Start a debug session from a given template with given parameters. |
 | `:debug-remote`, `:dbg-tcp` | Connect to a debug adapter by TCP address and start a debugging session from a given template with given parameters. |
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index 8d43410a..cb234357 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -9,7 +9,8 @@ pub use lsp::{Position, Url};
 pub use lsp_types as lsp;
 
 use futures_util::stream::select_all::SelectAll;
-use helix_core::syntax::LanguageConfiguration;
+use helix_core::syntax::{LanguageConfiguration, LanguageServerConfiguration};
+use tokio::sync::mpsc::UnboundedReceiver;
 
 use std::{
     collections::{hash_map::Entry, HashMap},
@@ -335,6 +336,33 @@ impl Registry {
             .map(|(_, client)| client.as_ref())
     }
 
+    pub fn restart(
+        &mut self,
+        language_config: &LanguageConfiguration,
+    ) -> Result<Option<Arc<Client>>> {
+        let config = match &language_config.language_server {
+            Some(config) => config,
+            None => return Ok(None),
+        };
+
+        let scope = language_config.scope.clone();
+
+        match self.inner.entry(scope) {
+            Entry::Vacant(_) => Ok(None),
+            Entry::Occupied(mut entry) => {
+                // initialize a new client
+                let id = self.counter.fetch_add(1, Ordering::Relaxed);
+
+                let NewClientResult(client, incoming) = start_client(id, language_config, config)?;
+                self.incoming.push(UnboundedReceiverStream::new(incoming));
+
+                entry.insert((id, client.clone()));
+
+                Ok(Some(client))
+            }
+        }
+    }
+
     pub fn get(&mut self, language_config: &LanguageConfiguration) -> Result<Option<Arc<Client>>> {
         let config = match &language_config.language_server {
             Some(config) => config,
@@ -346,43 +374,9 @@ impl Registry {
             Entry::Vacant(entry) => {
                 // initialize a new client
                 let id = self.counter.fetch_add(1, Ordering::Relaxed);
-                let (client, incoming, initialize_notify) = Client::start(
-                    &config.command,
-                    &config.args,
-                    language_config.config.clone(),
-                    &language_config.roots,
-                    id,
-                    config.timeout,
-                )?;
+
+                let NewClientResult(client, incoming) = start_client(id, language_config, config)?;
                 self.incoming.push(UnboundedReceiverStream::new(incoming));
-                let client = Arc::new(client);
-
-                // Initialize the client asynchronously
-                let _client = client.clone();
-                tokio::spawn(async move {
-                    use futures_util::TryFutureExt;
-                    let value = _client
-                        .capabilities
-                        .get_or_try_init(|| {
-                            _client
-                                .initialize()
-                                .map_ok(|response| response.capabilities)
-                        })
-                        .await;
-
-                    if let Err(e) = value {
-                        log::error!("failed to initialize language server: {}", e);
-                        return;
-                    }
-
-                    // next up, notify<initialized>
-                    _client
-                        .notify::<lsp::notification::Initialized>(lsp::InitializedParams {})
-                        .await
-                        .unwrap();
-
-                    initialize_notify.notify_one();
-                });
 
                 entry.insert((id, client.clone()));
                 Ok(Some(client))
@@ -473,6 +467,56 @@ impl LspProgressMap {
     }
 }
 
+struct NewClientResult(Arc<Client>, UnboundedReceiver<(usize, Call)>);
+
+/// start_client takes both a LanguageConfiguration and a LanguageServerConfiguration to ensure that
+/// it is only called when it makes sense.
+fn start_client(
+    id: usize,
+    config: &LanguageConfiguration,
+    ls_config: &LanguageServerConfiguration,
+) -> Result<NewClientResult> {
+    let (client, incoming, initialize_notify) = Client::start(
+        &ls_config.command,
+        &ls_config.args,
+        config.config.clone(),
+        &config.roots,
+        id,
+        ls_config.timeout,
+    )?;
+
+    let client = Arc::new(client);
+
+    // Initialize the client asynchronously
+    let _client = client.clone();
+    tokio::spawn(async move {
+        use futures_util::TryFutureExt;
+        let value = _client
+            .capabilities
+            .get_or_try_init(|| {
+                _client
+                    .initialize()
+                    .map_ok(|response| response.capabilities)
+            })
+            .await;
+
+        if let Err(e) = value {
+            log::error!("failed to initialize language server: {}", e);
+            return;
+        }
+
+        // next up, notify<initialized>
+        _client
+            .notify::<lsp::notification::Initialized>(lsp::InitializedParams {})
+            .await
+            .unwrap();
+
+        initialize_notify.notify_one();
+    });
+
+    Ok(NewClientResult(client, incoming))
+}
+
 #[cfg(test)]
 mod tests {
     use super::{lsp, util::*, OffsetEncoding};
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index f49fff30..6d0ced65 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -985,6 +985,40 @@ fn reload(
     })
 }
 
+fn lsp_restart(
+    cx: &mut compositor::Context,
+    _args: &[Cow<str>],
+    event: PromptEvent,
+) -> anyhow::Result<()> {
+    if event != PromptEvent::Validate {
+        return Ok(());
+    }
+
+    let (_view, doc) = current!(cx.editor);
+    let config = doc
+        .language_config()
+        .context("LSP not defined for the current document")?;
+
+    let scope = config.scope.clone();
+    cx.editor.language_servers.restart(config)?;
+
+    // This collect is needed because refresh_language_server would need to re-borrow editor.
+    let document_ids_to_refresh: Vec<DocumentId> = cx
+        .editor
+        .documents()
+        .filter_map(|doc| match doc.language_config() {
+            Some(config) if config.scope.eq(&scope) => Some(doc.id()),
+            _ => None,
+        })
+        .collect();
+
+    for document_id in document_ids_to_refresh {
+        cx.editor.refresh_language_server(document_id);
+    }
+
+    Ok(())
+}
+
 fn tree_sitter_scopes(
     cx: &mut compositor::Context,
     _args: &[Cow<str>],
@@ -1837,6 +1871,13 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
             fun: reload,
             completer: None,
         },
+        TypableCommand {
+            name: "lsp-restart",
+            aliases: &[],
+            doc: "Restarts the Language Server that is in use by the current doc",
+            fun: lsp_restart,
+            completer: None,
+        },
         TypableCommand {
             name: "tree-sitter-scopes",
             aliases: &[],

From 5467c65f8224049405498d65f54c3e3f8e4ec6c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benedikt=20M=C3=BCller?= <d12bb@posteo.de>
Date: Tue, 20 Sep 2022 14:35:00 +0200
Subject: [PATCH 147/884] fix fish completions for --config & --log (#3912)

---
 contrib/completion/hx.fish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/completion/hx.fish b/contrib/completion/hx.fish
index 71c74ab0..11977605 100644
--- a/contrib/completion/hx.fish
+++ b/contrib/completion/hx.fish
@@ -11,5 +11,5 @@ complete -c hx -s v -o vv -o vvv -d "Increases logging verbosity"
 complete -c hx -s V -l version -d "Prints version information"
 complete -c hx -l vsplit -d "Splits all given files vertically into different windows"
 complete -c hx -l hsplit -d "Splits all given files horizontally into different windows"
-complete -c hx -s c -l config -d "Specifies a file to use for completion"
-complete -c hx -s c -l log -d "Specifies a file to write log data into"
+complete -c hx -s c -l config -r -d "Specifies a file to use for completion"
+complete -c hx -l log -r -d "Specifies a file to write log data into"

From 75362dce8315c3fe20b9702d1ecdc0315112558e Mon Sep 17 00:00:00 2001
From: taupiqueur <93834534+taupiqueur@users.noreply.github.com>
Date: Wed, 21 Sep 2022 20:51:48 +0200
Subject: [PATCH 148/884] =?UTF-8?q?Fix=20the=20picker=E2=80=99s=20keymap?=
 =?UTF-8?q?=20documentation=20(#3925)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 book/src/keymap.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 99b0f0ba..6d90d802 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -381,9 +381,9 @@ Keys to use within picker. Remapping currently not supported.
 
 | Key                          | Description       |
 | -----                        | -------------     |
-| `Tab`, `Up`, `Ctrl-p`        | Previous entry    |
+| `Shift-Tab`, `Up`, `Ctrl-p`  | Previous entry    |
+| `Tab`, `Down`, `Ctrl-n`      | Next entry        |
 | `PageUp`, `Ctrl-u`           | Page up           |
-| `Shift-tab`, `Down`, `Ctrl-n`| Next entry        |
 | `PageDown`, `Ctrl-d`         | Page down         |
 | `Home`                       | Go to first entry |
 | `End`                        | Go to last entry  |

From 1dd1476a9eea7f6cb7d66239782e032b3c8672aa Mon Sep 17 00:00:00 2001
From: gavincrawford <94875769+gavincrawford@users.noreply.github.com>
Date: Wed, 21 Sep 2022 16:55:28 -0600
Subject: [PATCH 149/884] Fix highlighting on single-character Rust consts
 (#3927)

Co-authored-by: Kirawi <67773714+kirawi@users.noreply.github.com>
Co-authored-by: Gavin Crawford <gavincrawford@users.noreply.github.com>
---
 runtime/queries/rust/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm
index 78a7abf0..7d0afcde 100644
--- a/runtime/queries/rust/highlights.scm
+++ b/runtime/queries/rust/highlights.scm
@@ -183,7 +183,7 @@
 ; -------
 
 ((identifier) @constant
- (#match? @constant "^[A-Z][A-Z\\d_]+$"))
+ (#match? @constant "^[A-Z][A-Z\\d_]*$"))
 
 ; ---
 ; PascalCase identifiers in call_expressions (e.g. `Ok()`)

From 6e168b5099c31d0681e3486d177a14d04dde4c20 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 21 Sep 2022 20:30:42 -0500
Subject: [PATCH 150/884] Improve keymap errors from command typos (#3931)

* Improve keymap errors from command typos

Currently, opening helix with a config containing a bad command mapping
fails with a cryptic error. For example, say we have a config (bad.toml)
with a command name that doesn't exist:

    [keys.normal]
    b = "buffer_close" # should be ":buffer-close"

When we `hx -c bad.toml`, we get...

> Bad config: data did not match any variant of untagged enum KeyTrie for key `keys.normal` at line 1 column 1
> Press <ENTER> to continue with default config

This is because of the way that Serde tries to deserialize untagged
enums such as `helix_term::keymap::KeyTrie`. From the Serde docs[^1]:

> Serde will try to match the data against each variant in order and the
> first one that deserializes successfully is the one returned.

`MappableCommand::deserialize` fails (returns an Err variant) when a
command does not exist. Serde interprets this as the `KeyTrie::Leaf`
variant failing to match and declares that the input data doesn't
"match any variant of untagged enum KeyTrie."

Luckily the variants of KeyTrie are orthogonal in structure: we can tell
them apart by the type hints from a `serde::de::Visitor`. This change
uses a custom Deserialize implementation along with a Visitor that
discerns which variant of the KeyTrie applies. With this change, the
above failure becomes:

> Bad config: No command named 'buffer_close' for key `keys.normal.b` at line 2 column 5
> Press <ENTER> to continue with default config

We also provide more explicit information about the expectations on
the field. A config with an unexpected type produces a message with
that information and the expectation:

    [keys.normal]
    b = 1

> Bad config: invalid type: integer `1`, expected a command, list of commands, or sub-keymap for key `keys.normal.b` at line 2 column 5
> Press <ENTER> to continue with default config

[^1]: https://serde.rs/enum-representations.html#untagged

* Update helix-term/src/keymap.rs

Co-authored-by: Ivan Tham <pickfire@riseup.net>

Co-authored-by: Ivan Tham <pickfire@riseup.net>
---
 helix-term/src/keymap.rs | 60 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index 59204889..088b3b6d 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -144,14 +144,70 @@ impl DerefMut for KeyTrieNode {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Deserialize)]
-#[serde(untagged)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum KeyTrie {
     Leaf(MappableCommand),
     Sequence(Vec<MappableCommand>),
     Node(KeyTrieNode),
 }
 
+impl<'de> Deserialize<'de> for KeyTrie {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        deserializer.deserialize_any(KeyTrieVisitor)
+    }
+}
+
+struct KeyTrieVisitor;
+
+impl<'de> serde::de::Visitor<'de> for KeyTrieVisitor {
+    type Value = KeyTrie;
+
+    fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+        write!(formatter, "a command, list of commands, or sub-keymap")
+    }
+
+    fn visit_str<E>(self, command: &str) -> Result<Self::Value, E>
+    where
+        E: serde::de::Error,
+    {
+        command
+            .parse::<MappableCommand>()
+            .map(KeyTrie::Leaf)
+            .map_err(E::custom)
+    }
+
+    fn visit_seq<S>(self, mut seq: S) -> Result<Self::Value, S::Error>
+    where
+        S: serde::de::SeqAccess<'de>,
+    {
+        let mut commands = Vec::new();
+        while let Some(command) = seq.next_element::<&str>()? {
+            commands.push(
+                command
+                    .parse::<MappableCommand>()
+                    .map_err(serde::de::Error::custom)?,
+            )
+        }
+        Ok(KeyTrie::Sequence(commands))
+    }
+
+    fn visit_map<M>(self, mut map: M) -> Result<Self::Value, M::Error>
+    where
+        M: serde::de::MapAccess<'de>,
+    {
+        let mut mapping = HashMap::new();
+        let mut order = Vec::new();
+        while let Some((key, value)) = map.next_entry::<KeyEvent, KeyTrie>()? {
+            mapping.insert(key, value);
+            order.push(key);
+        }
+        Ok(KeyTrie::Node(KeyTrieNode::new("", mapping, order)))
+    }
+}
+
 impl KeyTrie {
     pub fn node(&self) -> Option<&KeyTrieNode> {
         match *self {

From e621848d075c1751ab2be6f3a82ac67490ec7909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Thu, 22 Sep 2022 14:28:05 +0200
Subject: [PATCH 151/884] Theme: Papercolor: Tune inactive statusline (#3938)

---
 runtime/themes/papercolor-dark.toml  | 2 +-
 runtime/themes/papercolor-light.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/themes/papercolor-dark.toml b/runtime/themes/papercolor-dark.toml
index 20950469..18a47292 100644
--- a/runtime/themes/papercolor-dark.toml
+++ b/runtime/themes/papercolor-dark.toml
@@ -10,7 +10,7 @@
 "ui.statusline" = {bg="paper_bar_bg", fg="regular0"}
 "ui.statusline.select" = {bg="background", fg="bright7"}
 "ui.statusline.normal" = {bg="background", fg="bright3"}
-"ui.statusline.inactive" = {bg="background", fg="bright0"}
+"ui.statusline.inactive" = {bg="selection_foreground", fg="foreground"}
 "ui.virtual.whitespace" = { fg = "regular5" }
 "ui.virtual.ruler" = {bg="cursorline_background"}
 "ui.cursor.match" = {bg = "regular5", fg = "regular0"}
diff --git a/runtime/themes/papercolor-light.toml b/runtime/themes/papercolor-light.toml
index dc4d7df5..70b973d3 100644
--- a/runtime/themes/papercolor-light.toml
+++ b/runtime/themes/papercolor-light.toml
@@ -10,7 +10,7 @@
 "ui.statusline" = {bg="paper_bar_bg", fg="regular0"}
 "ui.statusline.select" = {bg="background", fg="bright7"}
 "ui.statusline.normal" = {bg="background", fg="bright3"}
-"ui.statusline.inactive" = {bg="background", fg="bright0"}
+"ui.statusline.inactive" = {bg="bright0", fg="foreground"}
 "ui.virtual" = "indent"
 "ui.virtual.whitespace" = { fg = "regular5" }
 "ui.virtual.ruler" = {bg="cursorline_background"}

From eb6fd283dcf041ecf822fd8f2d4520abb2a26df9 Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Thu, 22 Sep 2022 18:33:30 +0300
Subject: [PATCH 152/884] Deduplicate regexes in search_selection command
 (#3941)

---
 helix-term/src/commands.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index e869446e..a5203352 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1760,6 +1760,8 @@ fn search_selection(cx: &mut Context) {
         .selection(view.id)
         .iter()
         .map(|selection| regex::escape(&selection.fragment(contents)))
+        .collect::<HashSet<_>>() // Collect into hashset to deduplicate identical regexes
+        .into_iter()
         .collect::<Vec<_>>()
         .join("|");
 

From 4133f1f424c6a9da71cab65dc9541e6d941ec603 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <dspom@protonmail.com>
Date: Fri, 23 Sep 2022 08:58:00 +0200
Subject: [PATCH 153/884] Document MSRV policy (#3913)

---
 .github/workflows/msrv-rust-toolchain.toml | 2 +-
 Cargo.lock                                 | 7 -------
 docs/CONTRIBUTING.md                       | 6 ++++++
 helix-term/Cargo.toml                      | 3 ---
 helix-term/src/ui/picker.rs                | 4 ----
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/msrv-rust-toolchain.toml b/.github/workflows/msrv-rust-toolchain.toml
index 7a3ec50b..b169d31e 100644
--- a/.github/workflows/msrv-rust-toolchain.toml
+++ b/.github/workflows/msrv-rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.59.0"
+channel = "1.61.0"
 components = ["rustfmt", "rust-src"]
diff --git a/Cargo.lock b/Cargo.lock
index a26c92e4..cc9e69b4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -485,7 +485,6 @@ dependencies = [
  "log",
  "once_cell",
  "pulldown-cmark",
- "retain_mut",
  "serde",
  "serde_json",
  "signal-hook",
@@ -884,12 +883,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "retain_mut"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0"
-
 [[package]]
 name = "ropey"
 version = "1.5.0"
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index e7b39b06..353cb4fd 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -37,6 +37,12 @@ contributors are strongly encouraged to write integration tests for their code.
 Existing tests can be used as examples. Helpers can be found in
 [helpers.rs][helpers.rs]
 
+## Minimum Stable Rust Version (MSRV) Policy
+
+Helix follows the MSRV of Firefox.
+The current MSRV and future changes to the MSRV are listed in the [Firefox documentation].
+
+[Firefox documentation]: https://firefox-source-docs.mozilla.org/writing-rust-code/update-policy.html
 [good-first-issue]: https://github.com/helix-editor/helix/labels/E-easy
 [log-file]: https://github.com/helix-editor/helix/wiki/FAQ#access-the-log-file
 [architecture.md]: ./architecture.md
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 0ebcb24f..b36063e4 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -67,9 +67,6 @@ serde = { version = "1.0", features = ["derive"] }
 grep-regex = "0.1.10"
 grep-searcher = "0.1.10"
 
-# Remove once retain_mut lands in stable rust
-retain_mut = "0.1.7"
-
 [target.'cfg(not(windows))'.dependencies]  # https://github.com/vorner/signal-hook/issues/100
 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
 
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 24d3b288..d125a6aa 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -365,10 +365,6 @@ impl<T: Item> Picker<T> {
                     .map(|(index, _option)| (index, 0)),
             );
         } else if pattern.starts_with(&self.previous_pattern) {
-            // TODO: remove when retain_mut is in stable rust
-            #[allow(unused_imports, deprecated)]
-            use retain_mut::RetainMut;
-
             // optimization: if the pattern is a more specific version of the previous one
             // then we can score the filtered set.
             #[allow(unstable_name_collisions)]

From 888f4fef6f975412c8215c4b76871ffba6e1b41d Mon Sep 17 00:00:00 2001
From: Riccardo Binetti <rbino@gmx.com>
Date: Fri, 23 Sep 2022 10:04:07 +0200
Subject: [PATCH 154/884] Split helix_core::find_root and
 helix_loader::find_local_config_dirs (#3929)

* Split helix_core::find_root and helix_loader::find_local_config_dirs

The documentation of find_root described the following priority for
detecting a project root:
- Top-most folder containing a root marker in current git repository
- Git repository root if no marker detected
- Top-most folder containing a root marker if not git repository detected
- Current working directory as fallback

The commit contained in https://github.com/helix-editor/helix/pull/1249
extracted and changed the implementation of find_root in find_root_impl,
actually reversing its result order (since that is the order that made
sense for the local configuration merge, from innermost to outermost
ancestors).

Since the two uses of find_root_impl have different requirements (and
it's not a matter of reversing the order of results since, e.g., the top
repository dir should be used by find_root only if there's not marker in
other dirs), this PR splits the two implementations in two different
specialized functions.

In doing so, find_root_impl is removed and the implementation is moved
back in find_root, moving it closer to the documented behaviour thus
making it easier to verify it's actually correct

* helix-core: remove Option from find_root return type

It always returns some result, so Option is not needed
---
 helix-core/src/lib.rs      | 40 ++++++++++++++++++++++++++++++++++----
 helix-loader/src/lib.rs    | 26 +++++--------------------
 helix-lsp/src/client.rs    | 11 +++--------
 helix-term/src/commands.rs |  5 +++--
 4 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index 735a62c1..8f869e35 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -46,10 +46,42 @@ pub fn find_first_non_whitespace_char(line: RopeSlice) -> Option<usize> {
 /// * Git repository root if no marker detected
 /// * Top-most folder containing a root marker if not git repository detected
 /// * Current working directory as fallback
-pub fn find_root(root: Option<&str>, root_markers: &[String]) -> Option<std::path::PathBuf> {
-    helix_loader::find_root_impl(root, root_markers)
-        .first()
-        .cloned()
+pub fn find_root(root: Option<&str>, root_markers: &[String]) -> std::path::PathBuf {
+    let current_dir = std::env::current_dir().expect("unable to determine current directory");
+
+    let root = match root {
+        Some(root) => {
+            let root = std::path::Path::new(root);
+            if root.is_absolute() {
+                root.to_path_buf()
+            } else {
+                current_dir.join(root)
+            }
+        }
+        None => current_dir.clone(),
+    };
+
+    let mut top_marker = None;
+    for ancestor in root.ancestors() {
+        if root_markers
+            .iter()
+            .any(|marker| ancestor.join(marker).exists())
+        {
+            top_marker = Some(ancestor);
+        }
+
+        if ancestor.join(".git").is_dir() {
+            // Top marker is repo root if not root marker was detected yet
+            if top_marker.is_none() {
+                top_marker = Some(ancestor);
+            }
+            // Don't go higher than repo if we're in one
+            break;
+        }
+    }
+
+    // Return the found top marker or the current_dir as fallback
+    top_marker.map_or(current_dir, |a| a.to_path_buf())
 }
 
 pub use ropey::{str_utils, Rope, RopeBuilder, RopeSlice};
diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs
index 3c9905f5..a02a59af 100644
--- a/helix-loader/src/lib.rs
+++ b/helix-loader/src/lib.rs
@@ -59,7 +59,7 @@ pub fn config_dir() -> PathBuf {
 }
 
 pub fn local_config_dirs() -> Vec<PathBuf> {
-    let directories = find_root_impl(None, &[".helix".to_string()])
+    let directories = find_local_config_dirs()
         .into_iter()
         .map(|path| path.join(".helix"))
         .collect();
@@ -90,32 +90,16 @@ pub fn log_file() -> PathBuf {
     cache_dir().join("helix.log")
 }
 
-pub fn find_root_impl(root: Option<&str>, root_markers: &[String]) -> Vec<PathBuf> {
+pub fn find_local_config_dirs() -> Vec<PathBuf> {
     let current_dir = std::env::current_dir().expect("unable to determine current directory");
     let mut directories = Vec::new();
 
-    let root = match root {
-        Some(root) => {
-            let root = std::path::Path::new(root);
-            if root.is_absolute() {
-                root.to_path_buf()
-            } else {
-                current_dir.join(root)
-            }
-        }
-        None => current_dir,
-    };
-
-    for ancestor in root.ancestors() {
-        // don't go higher than repo
+    for ancestor in current_dir.ancestors() {
         if ancestor.join(".git").is_dir() {
-            // Use workspace if detected from marker
             directories.push(ancestor.to_path_buf());
+            // Don't go higher than repo if we're in one
             break;
-        } else if root_markers
-            .iter()
-            .any(|marker| ancestor.join(marker).exists())
-        {
+        } else if ancestor.join(".helix").is_dir() {
             directories.push(ancestor.to_path_buf());
         }
     }
diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 9ae8f20e..497ce80c 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -34,7 +34,7 @@ pub struct Client {
     pub(crate) capabilities: OnceCell<lsp::ServerCapabilities>,
     offset_encoding: OffsetEncoding,
     config: Option<Value>,
-    root_path: Option<std::path::PathBuf>,
+    root_path: std::path::PathBuf,
     root_uri: Option<lsp::Url>,
     workspace_folders: Vec<lsp::WorkspaceFolder>,
     req_timeout: u64,
@@ -74,9 +74,7 @@ impl Client {
 
         let root_path = find_root(None, root_markers);
 
-        let root_uri = root_path
-            .clone()
-            .and_then(|root| lsp::Url::from_file_path(root).ok());
+        let root_uri = lsp::Url::from_file_path(root_path.clone()).ok();
 
         // TODO: support multiple workspace folders
         let workspace_folders = root_uri
@@ -281,10 +279,7 @@ impl Client {
             workspace_folders: Some(self.workspace_folders.clone()),
             // root_path is obsolete, but some clients like pyright still use it so we specify both.
             // clients will prefer _uri if possible
-            root_path: self
-                .root_path
-                .clone()
-                .and_then(|path| path.to_str().map(|path| path.to_owned())),
+            root_path: self.root_path.to_str().map(|path| path.to_owned()),
             root_uri: self.root_uri.clone(),
             initialization_options: self.config.clone(),
             capabilities: lsp::ClientCapabilities {
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index a5203352..c87ad0ca 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2225,8 +2225,9 @@ fn append_mode(cx: &mut Context) {
 }
 
 fn file_picker(cx: &mut Context) {
-    // We don't specify language markers, root will be the root of the current git repo
-    let root = find_root(None, &[]).unwrap_or_else(|| PathBuf::from("./"));
+    // We don't specify language markers, root will be the root of the current
+    // git repo or the current dir if we're not in a repo
+    let root = find_root(None, &[]);
     let picker = ui::file_picker(root, &cx.editor.config());
     cx.push_layer(Box::new(overlayed(picker)));
 }

From 3a245fe7928befaf9636604ef72d058e63ab35fc Mon Sep 17 00:00:00 2001
From: Riccardo Binetti <rbino@gmx.com>
Date: Fri, 23 Sep 2022 18:40:16 +0200
Subject: [PATCH 155/884] Add mix.exs and mix.lock as Elixir root markers
 (#3917)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 949dd372..133b87ae 100644
--- a/languages.toml
+++ b/languages.toml
@@ -99,7 +99,7 @@ scope = "source.elixir"
 injection-regex = "(elixir|ex)"
 file-types = ["ex", "exs", "mix.lock"]
 shebangs = ["elixir"]
-roots = []
+roots = ["mix.exs", "mix.lock"]
 comment-token = "#"
 language-server = { command = "elixir-ls" }
 config = { elixirLS.dialyzerEnabled = false }

From 0d8d8a4ed60aac72e0d294717f71bec17a2a2f07 Mon Sep 17 00:00:00 2001
From: adrian5 <adrian5@users.noreply.github.com>
Date: Fri, 23 Sep 2022 19:01:41 +0200
Subject: [PATCH 156/884] docs: Punctuation on tutor (#3888)

---
 runtime/tutor | 58 +++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/runtime/tutor b/runtime/tutor
index dc0a345a..313a14a1 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -70,7 +70,7 @@ _________________________________________________________________
 
  Type the d key to delete the character under the cursor.
 
- 1. Move the cursor to the line below marked -->.
+ 1. Move the cursor to the line marked '-->' below.
  2. Move the cursor to each extra character, and type d to
     delete it.
 
@@ -92,7 +92,7 @@ _________________________________________________________________
 
  Type the i key to enter Insert mode.
 
- 1. Move the cursor to the line below marked -->.
+ 1. Move the cursor to the line marked '-->' below.
  2. Move to a place in the line which is missing text and type
     i to enter Insert mode. Keys you type will now type text.
  3. Enter the missing text.
@@ -166,7 +166,7 @@ _________________________________________________________________
    I - Insert at the start of the line.
    A - Insert at the end of the line.
 
- 1. Move to anywhere in the line below marked -->.
+ 1. Move to anywhere in the line marked '-->' below.
  2. Type A (<SHIFT> + a), your cursor will move to the end of
     the line and you will be able to type.
  3. Type the text necessary to match the line below.
@@ -181,7 +181,7 @@ _________________________________________________________________
  Type o to add a newline and insert below the cursor.
  Type O to add a newline and insert above the cursor.
 
- 1. Move the cursor to the line below marked -->.
+ 1. Move the cursor to the line marked '-->' below.
  2. Type o to open a line below and type your answer.
 
  --> What is the best editor?
@@ -228,7 +228,7 @@ _________________________________________________________________
  it deletes all selected text. Your cursor is like a
  single-character selection.
 
- 1. Move the cursor to the line below marked -->.
+ 1. Move the cursor to the line marked '-->' below.
  2. Move to the beginning of a word that needs to be deleted.
  3. Type w to select until the beginning of the next word.
  4. Type d to delete the selection.
@@ -271,7 +271,7 @@ _________________________________________________________________
  The change command deletes the current selection and enters
  Insert mode, so it is a very common shorthand for di.
 
- 1. Move the cursor to the line below marked -->.
+ 1. Move the cursor to the line marked '-->' below.
  2. Move to the start of an incorrect word and type w to
     select it.
  3. Type c to delete the word and enter Insert mode.
@@ -290,7 +290,7 @@ _________________________________________________________________
 
  Type a number before a motion to repeat it that many times.
 
- 1. Move the cursor to the line below marked -->.
+ 1. Move the cursor to the line marked '-->' below.
  2. Type 2w to move 2 words forward.
  3. Type 3e to move to the end of the third word forward.
  4. Type 2b to move 2 words backwards
@@ -315,7 +315,7 @@ _________________________________________________________________
  In Select mode every movement will extend the selection, as
  opposed to replacing it.
 
- 1. Move the cursor to the line below marked -->.
+ 1. Move the cursor to the line marked '-->' below.
  2. Move to the F of FOO and type v2w to select the two words.
  3. Type d to remove the two words. Notice d returns you to
     Normal mode.
@@ -334,7 +334,7 @@ _________________________________________________________________
 
  Type x to select a whole line. Type x again to select the next.
 
- 1. Move the cursor to the second line below marked -->.
+ 1. Move the cursor to the second line marked '-->' below.
  2. Type x to select the line, and d to delete it.
  3. Move to the fourth line.
  4. Type x twice or type 2x to select 2 lines, and d to delete.
@@ -359,7 +359,7 @@ _________________________________________________________________
  Sometimes, you want to deselect without having to move the
  cursor(s). This can be done using the ; key.
 
- 1. Move the cursor to the line below marked -->.
+ 1. Move the cursor to the line marked '-->' below.
  2. Use the motions you have learned to move around the line,
     and try using ; to deselect the text after it is selected
     by the motions.
@@ -400,7 +400,7 @@ _________________________________________________________________
 
  Type u to undo. Type U to redo.
 
- 1. Move the cursor to the line below marked -->.
+ 1. Move the cursor to the line marked '-->' below.
  2. Move to the first error, and type d to delete it.
  3. Type u to undo your deletion.
  4. Fix all the errors on the line.
@@ -424,7 +424,7 @@ _________________________________________________________________
  Type p to paste the yanked selection after the cursor.
  Type P to paste the yanked text before the cursor.
 
- 1. Move the cursor to the line below marked -->.
+ 1. Move the cursor to the line marked '-->' below.
     Make sure your cursor is on the "b" of banana.
  2. Type w to select "banana" and y to yank it.
  3. Move to the space between "2" and "3" and type p to paste.
@@ -488,7 +488,7 @@ _________________________________________________________________
 
  Type C to duplicate the cursor to the next suitable line.
 
- 1. Move the cursor to the first line below marked -->.
+ 1. Move the cursor to the first line marked '-->' below.
  2. Type C to duplicate the cursor to the next suitable line.
     Notice how it skips the line in the middle. Keys you type
     will now affect both cursors.
@@ -510,7 +510,7 @@ _________________________________________________________________
 
  Type s to select matches in the selection.
 
- 1. Move the cursor to the line below marked -->.
+ 1. Move the cursor to the line marked '-->' below.
  2. Type x to select the line.
  3. Type s. A prompt will appear.
  4. Type 'apples' and type <ENTER>. Both occurrences of
@@ -533,7 +533,7 @@ _________________________________________________________________
  The select command selects regular expressions, not just exact
  matches, allowing you to target more complex patterns.
 
- 1. Move the cursor to the line below marked -->.
+ 1. Move the cursor to the line marked '-->' below.
  2. Select the line with x and then type s.
  3. Enter '  +' to select any amount of consecutive spaces >1.
  4. Type c and change the matches to single spaces.
@@ -554,7 +554,7 @@ _________________________________________________________________
 
  Type & to align the contents of the selections.
 
- 1. Move the cursor to the first line below marked -->. Place
+ 1. Move the cursor to the first line marked '-->' below. Place
     the cursor on the whitespace just after the arrow.
  2. Type C four times or 4C.
  3. Type W to select the numbers and brackets.
@@ -622,7 +622,7 @@ _________________________________________________________________
  Type t<ch> to do the same, but not including (till) a character.
  Type uppercase F / T to do the same backwards.
 
- 1. Move the cursor to the line below marked -->. Place the
+ 1. Move the cursor to the line marked '-->' below. Place the
     cursor on the first dash.
  2. Type f[ to select to the square bracket.
  3. Type d to delete your selection.
@@ -633,7 +633,7 @@ _________________________________________________________________
  --> -----[Free this sentence of its brackets!]-----
  --> ------Free this sentence of its dashes!------
 
- Note: Unlike Vim, Helix doesn't limit these commands to the 
+ Note: Unlike Vim, Helix doesn't limit these commands to the
        current line. It searches for the character in the file.
 
 =================================================================
@@ -665,7 +665,7 @@ _________________________________________________________________
  Type . to repeat the last insert command.
  Type A-. to repeat the last f / t selection.
 
- 1. Move the cursor to the line below marked -->.
+ 1. Move the cursor to the line marked '-->' below.
  2. Make a change, insertion or appendage and repeat it with . .
  3. Try using A-. with f and t, to select multiple sentences for
     instance.
@@ -708,7 +708,7 @@ _________________________________________________________________
 
  Type R to replace the selection with previously yanked text.
 
- 1. Move the cursor to the line below marked -->.
+ 1. Move the cursor to the line marked '-->' below.
  2. Type w to select "watermelons" and then y to yank it.
  3. Select "oranges" with w.
  4. Type R to replace "oranges" with "watermelons"
@@ -730,7 +730,7 @@ _________________________________________________________________
 
  Type J to join together lines in selection.
 
- 1. Move the cursor to the line below marked -->.
+ 1. Move the cursor to the line marked '-->' below.
  2. Type x four times or 4x to select all four lines.
  3. Type J to join the lines together.
 
@@ -752,7 +752,7 @@ lines.
 
  Type > to indent a line and < to outdent it.
 
- 1. Move the cursor to the line below marked -->.
+ 1. Move the cursor to the line marked '-->' below.
  2. Move down to the second line and type > to indent it.
  3. Move to the third line and type < to outdent it.
 
@@ -775,7 +775,7 @@ lines.
  Type C-a to increment the number under selection.
  Type C-x to decrement the number under selection.
 
- 1. Move the cursor to the third line below marked -->.
+ 1. Move the cursor to the third line marked '-->' below.
  2. Type C-a to increment the second point marked 2.
  3. Repeat for the point marked 3.
  4. Move to the last point and type C-x to decrement the 6.
@@ -823,7 +823,7 @@ lines.
 
  Type "<ch> to select register <ch>.
 
- 1. Move the cursor to the line below marked -->.
+ 1. Move the cursor to the line marked '-->' below.
  2. Type w to select "watermelons" and yank with y.
  3. Type w to select "bananas".
  4. Change to register b with "b and yank with y.
@@ -844,7 +844,7 @@ lines.
  the bottom of your screen. Type Q again to stop recording.
  Type q to repeat the macro from register @ (the default).
 
- 1. Move the cursor to the first line below marked -->.
+ 1. Move the cursor to the first line marked '-->' below.
     Ensure your cursor is on the > of the arrow.
  2. Type Q to start recording.
  3. Edit the line to look like the bottom one.
@@ -889,7 +889,7 @@ lines.
  Type * to copy the primary selection into register /, setting
  the search term to the selection.
 
- 1. Move the cursor to the line below marked -->.
+ 1. Move the cursor to the line marked '-->' below.
  2. Select "horse" with e and type *.
  3. Use n and N to jump between the instances of "horse".
 
@@ -908,7 +908,7 @@ lines.
  of moving the selection to the next match, it adds a new
  selection on each match.
 
- 1. Move the cursor to the line below marked -->.
+ 1. Move the cursor to the line marked '-->' below.
  2. Select the first "bat" and type * to set it to search.
  3. Type v to enter select mode.
  4. Type n to select the other "bat".
@@ -975,7 +975,7 @@ lines.
 
  Type A-, to remove the primary selection.
 
- 1. Move the cursor to the line below marked -->.
+ 1. Move the cursor to the line marked '-->' below.
  2. Select both lines with xx or 2x.
  3. Type s to select, type "would" and enter.
  4. Use ( and ) to cycle the primary selection and remove the
@@ -996,7 +996,7 @@ lines.
  Type ` to set all selected letters to lowercase.
  Type Alt-` to set all selected letters to uppercase.
 
- 1. Move the cursor to the first line below marked -->.
+ 1. Move the cursor to the first line marked '-->' below.
  2. Select each wrongly capitalised or lowercase letter
     and type ~ over them.
  3. Move to the second line marked -->.

From 42e30e7afaead4fc10a155802e168d2acc0afe81 Mon Sep 17 00:00:00 2001
From: Invader Zim <85027668+zim0369@users.noreply.github.com>
Date: Sat, 24 Sep 2022 01:02:37 +0530
Subject: [PATCH 157/884] Add bufferline colors to 15 themes (#3881)

Themes:

* acme
* ayu_dark
* ayu_light
* ayu_mirage
* base16_default_dark
* base16_default_light
* bogster
* catppuccin_frappe
* catppuccin_latte
* catppuccin_macchiato
* catppuccin_mocha
* darcula
* dark_plus
* doom_acario_dark
* emacs
---
 runtime/themes/acme.toml                 | 2 ++
 runtime/themes/ayu_dark.toml             | 2 ++
 runtime/themes/ayu_light.toml            | 3 +++
 runtime/themes/ayu_mirage.toml           | 2 ++
 runtime/themes/base16_default_dark.toml  | 3 +++
 runtime/themes/base16_default_light.toml | 3 +++
 runtime/themes/bogster.toml              | 2 ++
 runtime/themes/catppuccin_frappe.toml    | 5 ++++-
 runtime/themes/catppuccin_latte.toml     | 6 +++++-
 runtime/themes/catppuccin_macchiato.toml | 5 ++++-
 runtime/themes/catppuccin_mocha.toml     | 5 ++++-
 runtime/themes/darcula.toml              | 2 ++
 runtime/themes/dark_plus.toml            | 4 ++++
 runtime/themes/doom_acario_dark.toml     | 3 +++
 runtime/themes/emacs.toml                | 3 +++
 15 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/runtime/themes/acme.toml b/runtime/themes/acme.toml
index 3bd5987a..d3be695c 100644
--- a/runtime/themes/acme.toml
+++ b/runtime/themes/acme.toml
@@ -20,6 +20,8 @@
 "diagnostic.error" = {bg="white", modifiers=["bold"]}
 "diagnostic.warning" = {bg="white", modifiers=["bold"]}
 "diagnostic.hint" = {bg="white", modifiers=["bold"]}
+"ui.bufferline" = { fg = "indent", bg = "acme_bar_bg" }
+"ui.bufferline.active" = { fg = "black", bg = "acme_bg" }
 
 [palette]
 white = "#ffffff"
diff --git a/runtime/themes/ayu_dark.toml b/runtime/themes/ayu_dark.toml
index f6dc1c81..43fffee8 100644
--- a/runtime/themes/ayu_dark.toml
+++ b/runtime/themes/ayu_dark.toml
@@ -59,6 +59,8 @@
 "diagnostic.info"= { fg = "blue", modifiers = ["underlined"] }
 "diagnostic.warning"= { fg = "yellow", modifiers = ["underlined"] }
 "diagnostic.error"= { fg = "red", modifiers = ["underlined"] }
+"ui.bufferline" = { fg = "gray", bg = "background" }
+"ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
 
 "special" = { fg = "orange" }
 
diff --git a/runtime/themes/ayu_light.toml b/runtime/themes/ayu_light.toml
index 3a543f5f..7ea4ef58 100644
--- a/runtime/themes/ayu_light.toml
+++ b/runtime/themes/ayu_light.toml
@@ -59,6 +59,8 @@
 "diagnostic.info"= { fg = "blue", modifiers = ["underlined"] }
 "diagnostic.warning"= { fg = "yellow", modifiers = ["underlined"] }
 "diagnostic.error"= { fg = "red", modifiers = ["underlined"] }
+"ui.bufferline" = { fg = "gray", bg = "dark_gray" }
+"ui.bufferline.active" = { fg = "dark", bg = "background" }
 
 "special" = { fg = "orange" }
 
@@ -76,3 +78,4 @@ magenta = "#a37acc"
 orange = "#fa8d3e"
 red = "#f07171"
 yellow = "#ffaa33"
+dark = "#131721"
diff --git a/runtime/themes/ayu_mirage.toml b/runtime/themes/ayu_mirage.toml
index d6c9410d..f3b49d87 100644
--- a/runtime/themes/ayu_mirage.toml
+++ b/runtime/themes/ayu_mirage.toml
@@ -59,6 +59,8 @@
 "diagnostic.info"= { fg = "blue", modifiers = ["underlined"] }
 "diagnostic.warning"= { fg = "yellow", modifiers = ["underlined"] }
 "diagnostic.error"= { fg = "red", modifiers = ["underlined"] }
+"ui.bufferline" = { fg = "gray", bg = "black" }
+"ui.bufferline.active" = { fg = "foreground", bg = "background" }
 
 "special" = { fg = "orange" }
 
diff --git a/runtime/themes/base16_default_dark.toml b/runtime/themes/base16_default_dark.toml
index 460e7363..74bbcd2e 100644
--- a/runtime/themes/base16_default_dark.toml
+++ b/runtime/themes/base16_default_dark.toml
@@ -54,6 +54,9 @@
 "warning" = "base09"
 "error" = "base08"
 
+"ui.bufferline" = { fg = "base04", bg = "base00" }
+"ui.bufferline.active" = { fg = "base06", bg = "base01" }
+
 [palette]
 base00 = "#181818" # Default Background
 base01 = "#282828" # Lighter Background (Used for status bars, line number and folding marks)
diff --git a/runtime/themes/base16_default_light.toml b/runtime/themes/base16_default_light.toml
index 6874c39e..3784670f 100644
--- a/runtime/themes/base16_default_light.toml
+++ b/runtime/themes/base16_default_light.toml
@@ -54,6 +54,9 @@
 "warning" = "base09"
 "error" = "base08"
 
+"ui.bufferline" = { fg = "base04", bg = "base01" }
+"ui.bufferline.active" = { fg = "base07", bg = "base00" }
+
 [palette]
 base00 = "#f8f8f8" # Default Background
 base01 = "#e8e8e8" # Lighter Background (Used for status bars, line number and folding marks)
diff --git a/runtime/themes/bogster.toml b/runtime/themes/bogster.toml
index 44bbaf92..c1902b9b 100644
--- a/runtime/themes/bogster.toml
+++ b/runtime/themes/bogster.toml
@@ -48,6 +48,8 @@
 "ui.cursorline" = { bg = "#131920" }
 "ui.statusline" = { fg = "#e5ded6", bg = "#232d38" }
 "ui.statusline.inactive" = { fg = "#c6b8ad", bg = "#232d38" }
+"ui.bufferline" = { fg = "#627d9d", bg = "#131920" }
+"ui.bufferline.active" = { fg = "#e5ded6", bg = "#232d38" }
 "ui.popup" = { bg = "#232d38" }
 "ui.window" = { bg = "#232d38" }
 "ui.help" = { bg = "#232d38", fg = "#e5ded6" }
diff --git a/runtime/themes/catppuccin_frappe.toml b/runtime/themes/catppuccin_frappe.toml
index e7db8b16..89ae77c8 100644
--- a/runtime/themes/catppuccin_frappe.toml
+++ b/runtime/themes/catppuccin_frappe.toml
@@ -70,6 +70,9 @@
 "ui.statusline.insert" = { fg = "surface0", bg = "green", modifiers = ["bold"]  }
 "ui.statusline.select" = { fg = "surface0", bg = "flamingo", modifiers = ["bold"]  }
 
+"ui.bufferline" = { fg = "subtext1", bg = "mantle" }
+"ui.bufferline.active" = { fg = "text", bg = "surface0", modifiers = ["bold"] }
+
 "ui.popup" = { fg = "text", bg = "surface0" }
 "ui.window" = { fg = "crust" }
 "ui.help" = { fg = "overlay2", bg = "surface0" }
@@ -134,4 +137,4 @@ crust = "#232634"
 
 # derived colors by blending existing palette colors
 cursorline = "#3b3f52"
-secondary_cursor = "#b8a5a6"
\ No newline at end of file
+secondary_cursor = "#b8a5a6"
diff --git a/runtime/themes/catppuccin_latte.toml b/runtime/themes/catppuccin_latte.toml
index 4cd8b3c1..8e8780f9 100644
--- a/runtime/themes/catppuccin_latte.toml
+++ b/runtime/themes/catppuccin_latte.toml
@@ -70,6 +70,10 @@
 "ui.statusline.insert" = { fg = "surface0", bg = "green", modifiers = ["bold"]  }
 "ui.statusline.select" = { fg = "surface0", bg = "flamingo", modifiers = ["bold"]  }
 
+"ui.bufferline" = { fg = "overlay2", bg = "surface1", modifiers = ["italic"] }
+"ui.bufferline.active" = { fg = "text", bg = "surface0", modifiers = ["bold"] }
+"ui.bufferline.background" = { bg = "surface1" }
+
 "ui.popup" = { fg = "text", bg = "surface0" }
 "ui.window" = { fg = "crust" }
 "ui.help" = { fg = "overlay2", bg = "surface0" }
@@ -134,4 +138,4 @@ crust = "#dce0e8"
 
 # derived colors by blending existing palette colors
 cursorline = "#e9ebf1"
-secondary_cursor = "#e2a99e"
\ No newline at end of file
+secondary_cursor = "#e2a99e"
diff --git a/runtime/themes/catppuccin_macchiato.toml b/runtime/themes/catppuccin_macchiato.toml
index da589101..c2fe3184 100644
--- a/runtime/themes/catppuccin_macchiato.toml
+++ b/runtime/themes/catppuccin_macchiato.toml
@@ -70,6 +70,9 @@
 "ui.statusline.insert" = { fg = "surface0", bg = "green", modifiers = ["bold"]  }
 "ui.statusline.select" = { fg = "surface0", bg = "flamingo", modifiers = ["bold"]  }
 
+"ui.bufferline.active" = { fg = "text", bg = "base", modifiers = ["bold"] }
+"ui.bufferline" = { fg = "overlay1", bg = "mantle" }
+
 "ui.popup" = { fg = "text", bg = "surface0" }
 "ui.window" = { fg = "crust" }
 "ui.help" = { fg = "overlay2", bg = "surface0" }
@@ -134,4 +137,4 @@ crust = "#181926"
 
 # derived colors by blending existing palette colors
 cursorline = "#303347"
-secondary_cursor = "#b6a5a7"
\ No newline at end of file
+secondary_cursor = "#b6a5a7"
diff --git a/runtime/themes/catppuccin_mocha.toml b/runtime/themes/catppuccin_mocha.toml
index 279859b2..c4750b28 100644
--- a/runtime/themes/catppuccin_mocha.toml
+++ b/runtime/themes/catppuccin_mocha.toml
@@ -70,6 +70,9 @@
 "ui.statusline.insert" = { fg = "surface0", bg = "green", modifiers = ["bold"]  }
 "ui.statusline.select" = { fg = "surface0", bg = "flamingo", modifiers = ["bold"]  }
 
+"ui.bufferline.active" = { fg = "text", bg = "base", modifiers = ["bold"] }
+"ui.bufferline" = { fg = "overlay1", bg = "mantle" }
+
 "ui.popup" = { fg = "text", bg = "surface0" }
 "ui.window" = { fg = "crust" }
 "ui.help" = { fg = "overlay2", bg = "surface0" }
@@ -134,4 +137,4 @@ crust = "#11111b"
 
 # derived colors by blending existing palette colors
 cursorline = "#2a2b3c"
-secondary_cursor = "#b5a6a8"
\ No newline at end of file
+secondary_cursor = "#b5a6a8"
diff --git a/runtime/themes/darcula.toml b/runtime/themes/darcula.toml
index 00176ff2..5e88438e 100644
--- a/runtime/themes/darcula.toml
+++ b/runtime/themes/darcula.toml
@@ -23,6 +23,8 @@
 "ui.virtual.ruler" = { bg = "grey02" }
 "ui.virtual.indent-guide" = "grey02"
 "ui.virtual.whitespace" = "grey03"
+"ui.bufferline" = { fg = "grey04", bg = "grey00" }
+"ui.bufferline.active" = { fg = "grey07", bg = "grey02" }
 
 "operator" = "grey05"
 "variable" = "white"
diff --git a/runtime/themes/dark_plus.toml b/runtime/themes/dark_plus.toml
index 29a55281..f99da4fb 100644
--- a/runtime/themes/dark_plus.toml
+++ b/runtime/themes/dark_plus.toml
@@ -76,6 +76,10 @@
 "ui.statusline" = { fg = "white", bg = "blue" }
 "ui.statusline.inactive" = { fg = "white", bg = "blue" }
 
+"ui.bufferline" = { fg = "text", bg = "widget" }
+"ui.bufferline.active" = { fg = "white", bg = "blue" }
+"ui.bufferline.background" = { bg = "background" }
+
 "ui.text" = { fg = "text" }
 "ui.text.focus" = { fg = "white" }
 
diff --git a/runtime/themes/doom_acario_dark.toml b/runtime/themes/doom_acario_dark.toml
index 4ff90476..c38c93ee 100644
--- a/runtime/themes/doom_acario_dark.toml
+++ b/runtime/themes/doom_acario_dark.toml
@@ -53,6 +53,9 @@
 'ui.statusline.normal' = { bg = 'base3' }
 'ui.statusline.insert' = { bg = 'base3' }
 'ui.statusline.select' = { bg = 'base3' }
+'ui.bufferline' = { fg = 'gray', bg = 'base2' }
+'ui.bufferline.active' = { fg = 'white', bg = 'base4' }
+'ui.bufferline.background' = { bg = 'bg' }
 'ui.popup' = { bg = 'bg-alt' }
 'ui.window' = { fg = 'gray' }
 'ui.help' = { fg = 'fg', bg = 'base2' }
diff --git a/runtime/themes/emacs.toml b/runtime/themes/emacs.toml
index 598020bd..cc725df8 100644
--- a/runtime/themes/emacs.toml
+++ b/runtime/themes/emacs.toml
@@ -54,6 +54,9 @@
 "ui.linenr.selected" = { fg = "gray80" }
 "ui.statusline" = { fg = "black", bg = "gray75" }
 "ui.statusline.inactive" = { fg = "gray20", bg = "gray90" }
+"ui.bufferline" = { fg = "gray36", bg = "gray90", modifiers = ["underlined"] }
+"ui.bufferline.active" = { fg = "gray0", bg = "gray99" }
+"ui.bufferline.background" = { bg = "gray75" }
 "ui.popup" = { fg = "black", bg = "gray97" }
 "ui.popup.info" = { fg = "black", bg = "gray97" }
 "ui.window" = { fg = "black" }

From 1a4a9b86d74eade2a8df4ae68d97433323f22fac Mon Sep 17 00:00:00 2001
From: Clay <connorlay@users.noreply.github.com>
Date: Sat, 24 Sep 2022 23:51:25 -0700
Subject: [PATCH 158/884] heex: upgrade grammar, add roots matching elixir
 (#3959)

---
 languages.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/languages.toml b/languages.toml
index 133b87ae..a7b8f93d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1287,7 +1287,7 @@ name = "eex"
 scope = "source.eex"
 injection-regex = "eex"
 file-types = ["eex"]
-roots = []
+roots = ["mix.exs", "mix.lock"]
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
@@ -1299,12 +1299,12 @@ name = "heex"
 scope = "source.heex"
 injection-regex = "heex"
 file-types = ["heex"]
-roots = []
+roots = ["mix.exs", "mix.lock"]
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "heex"
-source = { git = "https://github.com/phoenixframework/tree-sitter-heex", rev = "961bc4d2937cfd24ceb0a5a6b2da607809f8822e" }
+source = { git = "https://github.com/phoenixframework/tree-sitter-heex", rev = "881f1c805f51485a26ecd7865d15c9ef8d606a78" }
 
 [[language]]
 name = "sql"

From e8f0886b21d279fedce53d85f53bb537c1ad808e Mon Sep 17 00:00:00 2001
From: Poliorcetics <poliorcetics@users.noreply.github.com>
Date: Sun, 25 Sep 2022 15:12:33 +0200
Subject: [PATCH 159/884] chore: remove unneeded attribute after MSRV bump to
 1.61 (#3961)

---
 helix-term/src/ui/picker.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index d125a6aa..a56455d7 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -367,7 +367,6 @@ impl<T: Item> Picker<T> {
         } else if pattern.starts_with(&self.previous_pattern) {
             // optimization: if the pattern is a more specific version of the previous one
             // then we can score the filtered set.
-            #[allow(unstable_name_collisions)]
             self.matches.retain_mut(|(index, score)| {
                 let option = &self.options[*index];
                 let text = option.sort_text(&self.editor_data);

From c196a90684d8b798aa90c60c3777f316966757b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20K=C3=B6=C3=B6k?= <oskar@maatriks.ee>
Date: Mon, 26 Sep 2022 15:56:07 +0300
Subject: [PATCH 160/884] Add documentation for `max-line-length` (#3974)

---
 book/src/languages.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/book/src/languages.md b/book/src/languages.md
index 841b1377..73c81213 100644
--- a/book/src/languages.md
+++ b/book/src/languages.md
@@ -61,6 +61,7 @@ These configuration keys are available:
 | `config`              | Language Server configuration                                 |
 | `grammar`             | The tree-sitter grammar to use (defaults to the value of `name`) |
 | `formatter`           | The formatter for the language, it will take precedence over the lsp when defined. The formatter must be able to take the original file as input from stdin and write the formatted file to stdout |
+| `max-line-length`     | Maximum line length. Used for the `:reflow` command           |
 
 ### Language Server configuration
 

From 98dd9c4f2bf71e9afb72f61af9d45100fda0526e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20K=C3=B6=C3=B6k?= <oskar@maatriks.ee>
Date: Mon, 26 Sep 2022 20:04:32 +0300
Subject: [PATCH 161/884] Remove `do_block` from Ruby indents (#3976)

`do_block` and `block` seem to conflict, causing double-indentation in some cases. Removing `do_block` does not seem to have any negative effect, while fixing the double-indentation issue.
---
 runtime/queries/ruby/indents.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/runtime/queries/ruby/indents.scm b/runtime/queries/ruby/indents.scm
index f5a6d19b..7fcf59f5 100644
--- a/runtime/queries/ruby/indents.scm
+++ b/runtime/queries/ruby/indents.scm
@@ -6,7 +6,6 @@
   (call)
   (class)
   (case)
-  (do_block)
   (elsif)
   (if)
   (hash)

From fd4cdf0b1f32c5ef6d8725aac971a94bdfd41a30 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 18:19:50 -0500
Subject: [PATCH 162/884] build(deps): bump once_cell from 1.14.0 to 1.15.0
 (#3987)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock              | 4 ++--
 helix-core/Cargo.toml   | 2 +-
 helix-loader/Cargo.toml | 2 +-
 helix-term/Cargo.toml   | 2 +-
 helix-view/Cargo.toml   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cc9e69b4..7715fabc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -730,9 +730,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
+checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
 
 [[package]]
 name = "parking_lot"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 0ec58af9..0a4790a3 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -26,7 +26,7 @@ unicode-general-category = "0.5"
 # slab = "0.4.2"
 slotmap = "1.0"
 tree-sitter = "0.20"
-once_cell = "1.14"
+once_cell = "1.15"
 arc-swap = "1"
 regex = "1"
 
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index e23e0290..b4541de5 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -19,7 +19,7 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.5"
 etcetera = "0.4"
 tree-sitter = "0.20"
-once_cell = "1.14"
+once_cell = "1.15"
 log = "0.4"
 
 # TODO: these two should be on !wasm32 only
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index b36063e4..ac50b610 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -32,7 +32,7 @@ helix-dap = { version = "0.6", path = "../helix-dap" }
 helix-loader = { version = "0.6", path = "../helix-loader" }
 
 anyhow = "1"
-once_cell = "1.14"
+once_cell = "1.15"
 
 which = "4.2"
 
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 9182ce23..266a5732 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -22,7 +22,7 @@ helix-dap = { version = "0.6", path = "../helix-dap" }
 crossterm = { version = "0.25", optional = true }
 
 # Conversion traits
-once_cell = "1.14"
+once_cell = "1.15"
 url = "2"
 
 arc-swap = { version = "1.5.1" }

From d2bb7f5a09c8f46fbf963772e8a6d713d86229fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 18:22:48 -0500
Subject: [PATCH 163/884] build(deps): bump tokio-stream from 0.1.9 to 0.1.10
 (#3988)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock           | 4 ++--
 helix-lsp/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7715fabc..279577bb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1196,9 +1196,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9"
+checksum = "f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af"
 dependencies = [
  "futures-core",
  "pin-project-lite",
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 2e5b8139..536a6ba6 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -23,5 +23,5 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
 tokio = { version = "1.21", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
-tokio-stream = "0.1.9"
+tokio-stream = "0.1.10"
 which = "4.2"

From 90468ad6c592c9a93e30b0809b42552e3b24f1e7 Mon Sep 17 00:00:00 2001
From: Jacob Chandler <jchand1999@protonmail.com>
Date: Mon, 26 Sep 2022 19:27:54 -0400
Subject: [PATCH 164/884] fix: Improve JSX and TSX tag highlighting (#3973)

---
 runtime/queries/jsx/highlights.scm | 16 +++++++++++++---
 runtime/queries/tsx/highlights.scm |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/runtime/queries/jsx/highlights.scm b/runtime/queries/jsx/highlights.scm
index d7054336..a1eb2d0e 100644
--- a/runtime/queries/jsx/highlights.scm
+++ b/runtime/queries/jsx/highlights.scm
@@ -1,5 +1,3 @@
-; inherits: ecma
-
 ; Highlight component names differently
 (jsx_opening_element ((identifier) @constructor
  (#match? @constructor "^[A-Z]")))
@@ -7,21 +5,33 @@
 ; Handle the dot operator effectively - <My.Component>
 (jsx_opening_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
 
+; Highlight brackets differently
+(jsx_opening_element ["<" ">"] @punctuation.bracket)
+
 (jsx_closing_element ((identifier) @constructor
  (#match? @constructor "^[A-Z]")))
 
 ; Handle the dot operator effectively - </My.Component>
 (jsx_closing_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
 
+; Highlight brackets differently
+(jsx_closing_element ["<" "/" ">"] @punctuation.bracket)
+
 (jsx_self_closing_element ((identifier) @constructor
  (#match? @constructor "^[A-Z]")))
 
 ; Handle the dot operator effectively - <My.Component />
 (jsx_self_closing_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
 
-; TODO: also tag @punctuation.delimiter?
+; Highlight brackets differently
+(jsx_self_closing_element ["<" "/" ">"] @punctuation.bracket)
+
+; Handle attribute delimiter
+(jsx_attribute "=" @punctuation.delimiter)
 
 (jsx_opening_element (identifier) @tag)
 (jsx_closing_element (identifier) @tag)
 (jsx_self_closing_element (identifier) @tag)
 (jsx_attribute (property_identifier) @variable.other.member)
+
+; inherits: ecma
diff --git a/runtime/queries/tsx/highlights.scm b/runtime/queries/tsx/highlights.scm
index 1b61e36d..100c7cc7 100644
--- a/runtime/queries/tsx/highlights.scm
+++ b/runtime/queries/tsx/highlights.scm
@@ -1 +1 @@
-; inherits: typescript
+; inherits: jsx,typescript

From e3fbeeb7893b73508d2cb2fee5271403b1e227c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 18:36:40 -0500
Subject: [PATCH 165/884] build(deps): bump unicode-general-category from 0.5.1
 to 0.6.0 (#3990)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 4 ++--
 helix-core/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 279577bb..b829efd2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1241,9 +1241,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
 
 [[package]]
 name = "unicode-general-category"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1218098468b8085b19a2824104c70d976491d247ce194bbd9dc77181150cdfd6"
+checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7"
 
 [[package]]
 name = "unicode-ident"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 0a4790a3..ba6901ba 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -22,7 +22,7 @@ smallvec = "1.9"
 smartstring = "1.0.1"
 unicode-segmentation = "1.10"
 unicode-width = "0.1"
-unicode-general-category = "0.5"
+unicode-general-category = "0.6"
 # slab = "0.4.2"
 slotmap = "1.0"
 tree-sitter = "0.20"

From cc0018a7d307e67fe2151930ab395f8532639d18 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 18:43:14 -0500
Subject: [PATCH 166/884] build(deps): bump thiserror from 1.0.35 to 1.0.36
 (#3991)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b829efd2..3a2dbc51 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1111,18 +1111,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c53f98874615aea268107765aa1ed8f6116782501d18e53d08b471733bea6c85"
+checksum = "0a99cb8c4b9a8ef0e7907cd3b617cc8dc04d571c4e73c8ae403d80ac160bb122"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8b463991b4eab2d801e724172285ec4195c650e8ec79b149e6c2a8e6dd3f783"
+checksum = "3a891860d3c8d66fec8e73ddb3765f90082374dbaaa833407b904a94f1a7eb43"
 dependencies = [
  "proc-macro2",
  "quote",

From 8fc493137d159c4b1fbf964ed52dc6d53f6fcaf8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 18:43:30 -0500
Subject: [PATCH 167/884] build(deps): bump serde from 1.0.144 to 1.0.145
 (#3989)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3a2dbc51..e5edcaac 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -916,18 +916,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "serde"
-version = "1.0.144"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
+checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.144"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
+checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
 dependencies = [
  "proc-macro2",
  "quote",

From bdc7b35214ec12a013941f7f6753331d47952bb2 Mon Sep 17 00:00:00 2001
From: Erin Kim <79354991+oati@users.noreply.github.com>
Date: Tue, 27 Sep 2022 13:01:58 +0000
Subject: [PATCH 168/884] nix: replace `runCommandNoCC` with `runCommand`
 (#3992)

---
 grammars.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grammars.nix b/grammars.nix
index 066fa69d..9ca0cf3d 100644
--- a/grammars.nix
+++ b/grammars.nix
@@ -2,7 +2,7 @@
   stdenv,
   lib,
   runCommandLocal,
-  runCommandNoCC,
+  runCommand,
   yj,
   includeGrammarIf ? _: true,
   ...
@@ -115,7 +115,7 @@
     builtins.map (grammar: "ln -s ${grammar.artifact}/${grammar.name}.so $out/${grammar.name}.so")
     builtGrammars;
 in
-  runCommandNoCC "consolidated-helix-grammars" {} ''
+  runCommand "consolidated-helix-grammars" {} ''
     mkdir -p $out
     ${builtins.concatStringsSep "\n" grammarLinks}
   ''

From 5dbca0fc089b3bfdd58162eabc4ee1c3fd2a52bd Mon Sep 17 00:00:00 2001
From: Sven-Hendrik Haase <svenstaro@gmail.com>
Date: Wed, 28 Sep 2022 16:50:53 +0200
Subject: [PATCH 169/884] Add gruvbox dark (#3948)

* Add gruvbox dark

* fixup! Add gruvbox dark
---
 runtime/themes/gruvbox_dark_hard.toml | 102 ++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 runtime/themes/gruvbox_dark_hard.toml

diff --git a/runtime/themes/gruvbox_dark_hard.toml b/runtime/themes/gruvbox_dark_hard.toml
new file mode 100644
index 00000000..708ca2b2
--- /dev/null
+++ b/runtime/themes/gruvbox_dark_hard.toml
@@ -0,0 +1,102 @@
+# Author : Sven-Hendrik Haase <svenstaro@gmail.com>
+# Author : Jakub Bartodziej <kubabartodziej@gmail.com>
+# The theme uses the gruvbox dark palette with hard contrast: github.com/morhetz/gruvbox
+
+"attribute" = "aqua1"
+"keyword" = { fg = "red1" }
+"keyword.directive" = "red0"
+"namespace" = "aqua1"
+"punctuation" = "orange1"
+"punctuation.delimiter" = "orange1"
+"operator" = "purple1"
+"special" = "purple0"
+"variable.other.member" = "blue1"
+"variable" = "fg1"
+"variable.builtin" = "orange1"
+"variable.parameter" = "fg2"
+"type" = "yellow1"
+"type.builtin" = "yellow1"
+"constructor" = { fg = "purple1", modifiers = ["bold"] }
+"function" = { fg = "green1", modifiers = ["bold"] }
+"function.macro" = "aqua1"
+"function.builtin" = "yellow1"
+"tag" = "red1"
+"comment" = { fg = "gray1", modifiers = ["italic"]  }
+"constant" = { fg = "purple1" }
+"constant.builtin" = { fg = "purple1", modifiers = ["bold"] }
+"string" = "green1"
+"constant.numeric" = "purple1"
+"constant.character.escape" = { fg = "fg2", modifiers = ["bold"] }
+"label" = "aqua1"
+"module" = "aqua1"
+
+"diff.plus" = "green1"
+"diff.delta" = "orange1"
+"diff.minus" = "red1"
+
+"warning" = { fg = "orange1", bg = "bg1" }
+"error" = { fg = "red1", bg = "bg1" }
+"info" = { fg = "aqua1", bg = "bg1" }
+"hint" = { fg = "blue1", bg = "bg1" }
+
+"ui.background" = { bg = "bg0" }
+"ui.linenr" = { fg = "bg4" }
+"ui.linenr.selected" = { fg = "yellow1" }
+"ui.cursorline" = { bg = "bg1" }
+"ui.statusline" = { fg = "fg1", bg = "bg2" }
+"ui.statusline.normal" = { fg = "fg1", bg = "bg2" }
+"ui.statusline.insert" = { fg = "fg1", bg = "blue0" }
+"ui.statusline.select" = { fg = "fg1", bg = "orange0" }
+"ui.statusline.inactive" = { fg = "fg4", bg = "bg1" }
+"ui.popup" = { bg = "bg1" }
+"ui.window" = { bg = "bg1" }
+"ui.help" = { bg = "bg1", fg = "fg1" }
+"ui.text" = { fg = "fg1" }
+"ui.text.focus" = { fg = "fg1" }
+"ui.selection" = { bg = "bg3", modifiers = ["reversed"] }
+"ui.cursor.primary" = { modifiers = ["reversed"] }
+"ui.cursor.match" = { bg = "bg2" }
+"ui.menu" = { fg = "fg1", bg = "bg2" }
+"ui.menu.selected" = { fg = "bg2", bg = "blue1", modifiers = ["bold"] }
+"ui.virtual.whitespace" = "bg2"
+"ui.virtual.ruler" = { bg = "bg1" }
+
+"diagnostic" = { modifiers = ["underlined"] }
+
+"markup.heading" = "aqua1"
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.link.url" = { fg = "green1", modifiers = ["underlined"] }
+"markup.link.text" = "red1"
+"markup.raw" = "red1"
+
+[palette]
+bg0 = "#1d2021" # main background
+bg1 = "#3c3836"
+bg2 = "#504945"
+bg3 = "#665c54"
+bg4 = "#7c6f64"
+
+fg0 = "#fbf1c7"
+fg1 = "#ebdbb2" # main foreground
+fg2 = "#d5c4a1"
+fg3 = "#bdae93"
+fg4 = "#a89984" # gray0
+
+gray0 = "#a89984"
+gray1 = "#928374"
+
+red0 = "#cc241d" # neutral
+red1 = "#fb4934" # bright
+green0 = "#98971a"
+green1 = "#b8bb26"
+yellow0 = "#d79921"
+yellow1 = "#fabd2f"
+blue0 = "#458588"
+blue1 = "#83a598"
+purple0 = "#b16286"
+purple1 = "#d3869b"
+aqua0 = "#689d6a"
+aqua1 = "#8ec07c"
+orange0 = "#d65d0e"
+orange1 = "#fe8019"

From 038ad6289f7d5e84d17da2dfb5723116641c62e1 Mon Sep 17 00:00:00 2001
From: Sora <dream@neoncity.dev>
Date: Thu, 29 Sep 2022 01:50:24 +0200
Subject: [PATCH 170/884] Fix tutor typo `favourite` to `favorite` (#4007)

---
 runtime/tutor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/tutor b/runtime/tutor
index 313a14a1..04ea8fcd 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -520,7 +520,7 @@ _________________________________________________________________
  6. Type , to remove the second cursor.
 
  --> I like to eat apples since my favorite fruit is apples.
-     I like to eat oranges since my favourite fruit is oranges.
+     I like to eat oranges since my favorite fruit is oranges.
 
 
 

From c4aec0a5c573bca755a49e3031c483422031874f Mon Sep 17 00:00:00 2001
From: joleaf <71190322+joleaf@users.noreply.github.com>
Date: Thu, 29 Sep 2022 17:02:55 +0200
Subject: [PATCH 171/884] tutor: missing <ESC> before removing the second
 cursor (#4027)

This step was missing in section 5.2 of tutor.
---
 runtime/tutor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/tutor b/runtime/tutor
index 04ea8fcd..8eef33af 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -517,7 +517,8 @@ _________________________________________________________________
     'apples' in the line will be selected.
  5. You can now type c and change 'apples' to something else,
     like 'oranges'.
- 6. Type , to remove the second cursor.
+ 6. Type <ESC> to exit Insert mode.
+ 7. Type , to remove the second cursor.
 
  --> I like to eat apples since my favorite fruit is apples.
      I like to eat oranges since my favorite fruit is oranges.
@@ -525,7 +526,6 @@ _________________________________________________________________
 
 
 
-
 =================================================================
 =                    5.3 SELECTING VIA REGEX                    =
 =================================================================

From 8a7a6e4cff1db3ef65a2c20e0e90c60b44516e27 Mon Sep 17 00:00:00 2001
From: Maximilian Muecke <muecke.maximilian@gmail.com>
Date: Thu, 29 Sep 2022 20:11:45 +0200
Subject: [PATCH 172/884] Add comment injection for R (#4031)

---
 runtime/queries/r/injections.scm | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 runtime/queries/r/injections.scm

diff --git a/runtime/queries/r/injections.scm b/runtime/queries/r/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/r/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))

From 60aa7d360777331753ae4735f8fd4ea96012d4fd Mon Sep 17 00:00:00 2001
From: Chickenkeeper <chrism.chickenkeeper24@gmail.com>
Date: Fri, 30 Sep 2022 23:43:07 +0100
Subject: [PATCH 173/884] WGSL syntax highlighting fix (#3996)

---
 languages.toml                      |  2 +-
 runtime/queries/wgsl/highlights.scm | 62 +++++++++++++++++------------
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/languages.toml b/languages.toml
index a7b8f93d..ab204fcc 100644
--- a/languages.toml
+++ b/languages.toml
@@ -848,7 +848,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[grammar]]
 name = "wgsl"
-source = { git = "https://github.com/szebniok/tree-sitter-wgsl", rev = "f00ff52251edbd58f4d39c9c3204383253032c11" }
+source = { git = "https://github.com/szebniok/tree-sitter-wgsl", rev = "272e89ef2aeac74178edb9db4a83c1ffef80a463" }
 
 [[language]]
 name = "llvm"
diff --git a/runtime/queries/wgsl/highlights.scm b/runtime/queries/wgsl/highlights.scm
index 7fbc87d8..baf9dd8f 100644
--- a/runtime/queries/wgsl/highlights.scm
+++ b/runtime/queries/wgsl/highlights.scm
@@ -1,23 +1,41 @@
-(const_literal) @constant.numeric
+(int_literal) @constant.numeric.integer
+(float_literal) @constant.numeric.float
+(bool_literal) @constant.builtin.boolean
 
-(type_declaration) @type
+(global_constant_declaration) @variable
+(global_variable_declaration) @variable
+(compound_statement) @variable
+(const_expression) @function
+
+(variable_identifier_declaration
+    (identifier) @variable
+    (type_declaration) @type)
 
 (function_declaration
-    (identifier) @function)
+    (identifier) @function
+    (function_return_type_declaration
+        (type_declaration) @type))
+
+(parameter
+    (variable_identifier_declaration
+        (identifier) @variable.parameter
+        (type_declaration) @type))
 
 (struct_declaration
     (identifier) @type)
+        
+(struct_declaration
+    (struct_member
+        (variable_identifier_declaration
+            (identifier) @variable.other.member
+            (type_declaration) @type)))
 
 (type_constructor_or_function_call_expression
     (type_declaration) @function)
 
-(parameter
-    (variable_identifier_declaration (identifier) @variable.parameter))
-
 [
     "struct"
     "bitcast"
-    ; "block"
     "discard"
     "enable"
     "fallthrough"
@@ -26,36 +44,28 @@
     "private"
     "read"
     "read_write"
-    "return"
     "storage"
     "type"
     "uniform"
     "var"
     "workgroup"
     "write"
+    "override"
     (texel_format)
-] @keyword ; TODO reserved keywords
+] @keyword
 
-[
-    (true)
-    (false)
-] @constant.builtin.boolean
+"fn" @keyword.function
 
-[ "," "." ":" ";" ] @punctuation.delimiter
+"return" @keyword.control.return
 
-;; brackets
-[
-    "("
-    ")"
-    "["
-    "]"
-    "{"
-    "}"
-] @punctuation.bracket
+["," "." ":" ";"] @punctuation.delimiter
+
+["(" ")" "[" "]" "{" "}"] @punctuation.bracket
 
 [
     "loop"
     "for"
+    "while"
     "break"
     "continue"
     "continuing"
@@ -64,7 +74,6 @@
 [
     "if"
     "else"
-    "elseif"
     "switch"
     "case"
     "default"
@@ -92,10 +101,13 @@
     "*"
     "~"
     "^"
+    "@"
+    "++"
+    "--"
 ] @operator
 
 (attribute
-    (identifier) @variable.other.member)
+    (identifier) @attribute)
 
 (comment) @comment
 

From 2113b1bb2fe4d69eada555d562cbcf723201998a Mon Sep 17 00:00:00 2001
From: nuid32 <91177333+nuid32@users.noreply.github.com>
Date: Sat, 1 Oct 2022 19:11:15 +0500
Subject: [PATCH 174/884] themes: Add onedarker (#3980)

---
 runtime/themes/onedarker.toml | 97 +++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 runtime/themes/onedarker.toml

diff --git a/runtime/themes/onedarker.toml b/runtime/themes/onedarker.toml
new file mode 100644
index 00000000..1ad6f7c3
--- /dev/null
+++ b/runtime/themes/onedarker.toml
@@ -0,0 +1,97 @@
+# Author : nuid32 <lvkuzvesov@proton.me>
+
+"attribute" = { fg = "yellow" }
+"comment" = { fg = "light-gray", modifiers = ["italic"] }
+"constant" = { fg = "green" }
+"constant.numeric" = { fg = "gold" }
+"constant.builtin" = { fg = "gold" }
+"constant.character.escape" = { fg = "gold" }
+"constructor" = { fg = "blue" }
+"function" = { fg = "white" }
+"function.builtin" = { fg = "blue" }
+"function.macro" = { fg = "purple" }
+"keyword" = { fg = "purple" }
+"keyword.control" = { fg = "purple" }
+"keyword.control.import" = { fg = "purple" }
+"keyword.directive" = { fg = "purple" }
+"label" = { fg = "purple" }
+"namespace" = { fg = "purple" }
+"operator" = { fg = "white" }
+"keyword.operator" = { fg = "white" }
+"special" = { fg = "blue" }
+"string" = { fg = "green" }
+"type" = { fg = "yellow" }
+"variable" = { fg = "white" }
+"variable.builtin" = { fg = "red" }
+"variable.parameter" = { fg = "red" }
+"variable.other.member" = { fg = "blue" }
+
+"markup.heading" = { fg = "red" }
+"markup.raw.inline" = { fg = "green" }
+"markup.raw.block" = { fg = "white" }
+"markup.bold" = { fg = "gold", modifiers = ["bold"] }
+"markup.italic" = { fg = "purple", modifiers = ["italic"] }
+"markup.list" = { fg = "red" }
+"markup.quote" = { fg = "yellow" }
+"markup.link.url" = { fg = "blue", modifiers = ["underlined"]}
+"markup.link.text" = { fg = "white" }
+"markup.link.label" = { fg = "white" }
+
+"diff.plus" = "green"
+"diff.delta" = "gold"
+"diff.minus" = "red"
+
+diagnostic = { modifiers = ["underlined"] }
+"info" = { fg = "blue", modifiers = ["bold"] }
+"hint" = { fg = "green", modifiers = ["bold"] }
+"warning" = { fg = "yellow", modifiers = ["bold"] }
+"error" = { fg = "red", modifiers = ["bold"] }
+
+"ui.background" = { bg = "black" }
+"ui.virtual" = { fg = "faint-gray" }
+"ui.virtual.indent-guide" = { fg = "faint-gray" }
+"ui.virtual.whitespace" = { fg = "light-gray" }
+"ui.virtual.ruler" = { bg = "gray" }
+
+"ui.cursor" = { fg = "white", modifiers = ["reversed"] }
+"ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] }
+"ui.cursor.match" = { fg = "blue", modifiers = ["underlined"]}
+
+"ui.selection" = { bg = "light-gray" }
+"ui.selection.primary" = { bg = "gray" }
+"ui.cursorline.primary" = { bg = "light-black" }
+
+"ui.linenr" = { fg = "linenr" }
+"ui.linenr.selected" = { fg = "white" }
+
+"ui.statusline" = { fg = "white", bg = "light-black" }
+"ui.statusline.inactive" = { fg = "light-gray", bg = "light-black" }
+"ui.statusline.normal" = { fg = "light-black", bg = "purple" }
+"ui.statusline.insert" = { fg = "light-black", bg = "green" }
+"ui.statusline.select" = { fg = "light-black", bg = "cyan" }
+"ui.text" = { fg = "purple" }
+"ui.text.focus" = { fg = "white", bg = "light-black", modifiers = ["bold"] }
+
+"ui.help" = { fg = "white", bg = "gray" }
+"ui.popup" = { bg = "gray" }
+"ui.window" = { fg = "gray" }
+"ui.menu" = { fg = "white", bg = "gray" }
+"ui.menu.selected" = { fg = "black", bg = "blue" }
+"ui.menu.scroll" = { fg = "white", bg = "light-gray" }
+
+[palette]
+
+yellow = "#D5B06B"
+blue = "#519FDF"
+red = "#D05C65"
+purple = "#B668CD"
+green = "#7DA869"
+gold = "#D19A66"
+cyan = "#46A6B2"
+white = "#ABB2BF"
+black = "#16181A"
+light-black = "#2C323C"
+gray = "#454D50"
+faint-gray = "#ABB2BF"
+light-gray = "#C8CCD4"
+linenr = "#282C34"

From cc257e9bf9a7eee7e68e04d04523a8fae10807cd Mon Sep 17 00:00:00 2001
From: Roberto Vidal <vidal.roberto.j@gmail.com>
Date: Sat, 1 Oct 2022 16:13:52 +0200
Subject: [PATCH 175/884] Add support for webassembly text format (#4040)

---
 book/src/generated/lang-support.md  |  2 ++
 languages.toml                      | 22 ++++++++++++++++++++++
 runtime/queries/wast/highlights.scm | 21 +++++++++++++++++++++
 runtime/queries/wat/highlights.scm  | 17 +++++++++++++++++
 4 files changed, 62 insertions(+)
 create mode 100644 runtime/queries/wast/highlights.scm
 create mode 100644 runtime/queries/wat/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 86c26042..5c64d097 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -119,6 +119,8 @@
 | vala | ✓ |  |  | `vala-language-server` |
 | verilog | ✓ | ✓ |  | `svlangserver` |
 | vue | ✓ |  |  | `vls` |
+| wast | ✓ |  |  |  |
+| wat | ✓ |  |  |  |
 | wgsl | ✓ |  |  | `wgsl_analyzer` |
 | xit | ✓ |  |  |  |
 | yaml | ✓ |  | ✓ | `yaml-language-server` |
diff --git a/languages.toml b/languages.toml
index ab204fcc..d7909b6d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1781,3 +1781,25 @@ language-server = { command = "bass", args = ["--lsp"] }
 [[grammar]]
 name = "bass"
 source = { git = "https://github.com/vito/tree-sitter-bass", rev = "501133e260d768ed4e1fd7374912ed5c86d6fd90" }
+
+[[language]]
+name = "wat"
+scope = "source.wat"
+comment-token = ";;"
+file-types = ["wat"]
+roots = []
+
+[[grammar]]
+name = "wat"
+source = { git = "https://github.com/wasm-lsp/tree-sitter-wasm", rev = "2ca28a9f9d709847bf7a3de0942a84e912f59088", subpath = "wat" }
+
+[[language]]
+name = "wast"
+scope = "source.wast"
+comment-token = ";;"
+file-types = ["wast"]
+roots = []
+
+[[grammar]]
+name = "wast"
+source = { git = "https://github.com/wasm-lsp/tree-sitter-wasm", rev = "2ca28a9f9d709847bf7a3de0942a84e912f59088", subpath = "wast" }
diff --git a/runtime/queries/wast/highlights.scm b/runtime/queries/wast/highlights.scm
new file mode 100644
index 00000000..ef5b547e
--- /dev/null
+++ b/runtime/queries/wast/highlights.scm
@@ -0,0 +1,21 @@
+; inherits: wat
+
+[
+  "assert_return"
+  "assert_trap"
+  "assert_exhaustion"
+  "assert_malformed"
+  "assert_invalid"
+  "assert_unlinkable"
+  "assert_trap"
+
+  "invoke"
+  "get"
+
+  "script"
+  "input"
+  "output"
+
+  "binary"
+  "quote"
+] @keyword
diff --git a/runtime/queries/wat/highlights.scm b/runtime/queries/wat/highlights.scm
new file mode 100644
index 00000000..007e3bbf
--- /dev/null
+++ b/runtime/queries/wat/highlights.scm
@@ -0,0 +1,17 @@
+["module" "func" "param" "result" "type" "memory" "elem" "data" "table" "global"] @keyword
+
+["import" "export"] @keyword.control.import
+
+["local"] @keyword.storage.type
+
+[(name) (string)] @string
+
+(identifier) @function
+
+[(comment_block) (comment_line)] @comment
+
+[(nat) (float) (align_offset_value)] @constant.numeric.integer
+
+(value_type) @type
+
+["(" ")"] @punctuation.bracket

From c9584251f321a8540cf530561896b2f48f0b76a2 Mon Sep 17 00:00:00 2001
From: zensayyy <99101223+zensayyy@users.noreply.github.com>
Date: Sat, 1 Oct 2022 16:32:09 +0200
Subject: [PATCH 176/884] Ensure cursor in view after format (#4047)

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 helix-term/src/commands.rs | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index c87ad0ca..fb1a4b38 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2504,18 +2504,23 @@ async fn make_format_callback(
 ) -> anyhow::Result<job::Callback> {
     let format = format.await?;
     let call: job::Callback = Box::new(move |editor, _compositor| {
-        let view_id = view!(editor).id;
-        if let Some(doc) = editor.document_mut(doc_id) {
-            if doc.version() == doc_version {
-                doc.apply(&format, view_id);
-                doc.append_changes_to_history(view_id);
-                doc.detect_indent_and_line_ending();
-                if let Modified::SetUnmodified = modified {
-                    doc.reset_modified();
-                }
-            } else {
-                log::info!("discarded formatting changes because the document changed");
+        if !editor.documents.contains_key(&doc_id) {
+            return;
+        }
+
+        let scrolloff = editor.config().scrolloff;
+        let doc = doc_mut!(editor, &doc_id);
+        let view = view_mut!(editor);
+        if doc.version() == doc_version {
+            doc.apply(&format, view.id);
+            doc.append_changes_to_history(view.id);
+            doc.detect_indent_and_line_ending();
+            view.ensure_cursor_in_view(doc, scrolloff);
+            if let Modified::SetUnmodified = modified {
+                doc.reset_modified();
             }
+        } else {
+            log::info!("discarded formatting changes because the document changed");
         }
     });
     Ok(call)

From 999b45b28c157418c20a9a8cd9219db6ce0beac7 Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Sat, 9 Jul 2022 03:35:06 +0530
Subject: [PATCH 177/884] Support different kinds of underline rendering

Adds four new  modifiers that can be used in themes:

- undercurled
- underdashed
- underdotted
- double-underline
---
 helix-tui/src/backend/crossterm.rs | 14 +++++++++++-
 helix-view/src/graphics.rs         | 34 +++++++++++++++++++++---------
 runtime/themes/onedark.toml        |  2 +-
 3 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/helix-tui/src/backend/crossterm.rs b/helix-tui/src/backend/crossterm.rs
index eff098b3..252036f3 100644
--- a/helix-tui/src/backend/crossterm.rs
+++ b/helix-tui/src/backend/crossterm.rs
@@ -153,7 +153,7 @@ impl ModifierDiff {
         if removed.contains(Modifier::ITALIC) {
             map_error(queue!(w, SetAttribute(CAttribute::NoItalic)))?;
         }
-        if removed.contains(Modifier::UNDERLINED) {
+        if removed.intersects(Modifier::ANY_UNDERLINE) {
             map_error(queue!(w, SetAttribute(CAttribute::NoUnderline)))?;
         }
         if removed.contains(Modifier::DIM) {
@@ -179,6 +179,18 @@ impl ModifierDiff {
         if added.contains(Modifier::UNDERLINED) {
             map_error(queue!(w, SetAttribute(CAttribute::Underlined)))?;
         }
+        if added.contains(Modifier::UNDERCURLED) {
+            map_error(queue!(w, SetAttribute(CAttribute::Undercurled)))?;
+        }
+        if added.contains(Modifier::UNDERDOTTED) {
+            map_error(queue!(w, SetAttribute(CAttribute::Underdotted)))?;
+        }
+        if added.contains(Modifier::UNDERDASHED) {
+            map_error(queue!(w, SetAttribute(CAttribute::Underdashed)))?;
+        }
+        if added.contains(Modifier::DOUBLE_UNDERLINED) {
+            map_error(queue!(w, SetAttribute(CAttribute::DoubleUnderlined)))?;
+        }
         if added.contains(Modifier::DIM) {
             map_error(queue!(w, SetAttribute(CAttribute::Dim)))?;
         }
diff --git a/helix-view/src/graphics.rs b/helix-view/src/graphics.rs
index fb3c8b3f..15492119 100644
--- a/helix-view/src/graphics.rs
+++ b/helix-view/src/graphics.rs
@@ -327,17 +327,27 @@ bitflags! {
     ///
     /// let m = Modifier::BOLD | Modifier::ITALIC;
     /// ```
-    #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+    #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize), serde(rename_all = "kebab-case"))]
     pub struct Modifier: u16 {
-        const BOLD              = 0b0000_0000_0001;
-        const DIM               = 0b0000_0000_0010;
-        const ITALIC            = 0b0000_0000_0100;
-        const UNDERLINED        = 0b0000_0000_1000;
-        const SLOW_BLINK        = 0b0000_0001_0000;
-        const RAPID_BLINK       = 0b0000_0010_0000;
-        const REVERSED          = 0b0000_0100_0000;
-        const HIDDEN            = 0b0000_1000_0000;
-        const CROSSED_OUT       = 0b0001_0000_0000;
+        const BOLD              = 0b0000_0000_0000_0001;
+        const DIM               = 0b0000_0000_0000_0010;
+        const ITALIC            = 0b0000_0000_0000_0100;
+        const UNDERLINED        = 0b0000_0000_0000_1000;
+        const SLOW_BLINK        = 0b0000_0000_0001_0000;
+        const RAPID_BLINK       = 0b0000_0000_0010_0000;
+        const REVERSED          = 0b0000_0000_0100_0000;
+        const HIDDEN            = 0b0000_0000_1000_0000;
+        const CROSSED_OUT       = 0b0000_0001_0000_0000;
+        const UNDERCURLED       = 0b0000_0010_0000_0000;
+        const UNDERDOTTED       = 0b0000_0100_0000_0000;
+        const UNDERDASHED       = 0b0000_1000_0000_0000;
+        const DOUBLE_UNDERLINED = 0b0001_0000_0000_0000;
+
+        const ANY_UNDERLINE     = Self::UNDERLINED.bits
+                                    | Self::UNDERCURLED.bits
+                                    | Self::UNDERDOTTED.bits
+                                    | Self::UNDERDASHED.bits
+                                    | Self::DOUBLE_UNDERLINED.bits;
     }
 }
 
@@ -355,6 +365,10 @@ impl FromStr for Modifier {
             "reversed" => Ok(Self::REVERSED),
             "hidden" => Ok(Self::HIDDEN),
             "crossed_out" => Ok(Self::CROSSED_OUT),
+            "undercurled" => Ok(Self::UNDERCURLED),
+            "underdotted" => Ok(Self::UNDERDOTTED),
+            "underdashed" => Ok(Self::UNDERDASHED),
+            "double_underlined" => Ok(Self::DOUBLE_UNDERLINED),
             _ => Err("Invalid modifier"),
         }
     }
diff --git a/runtime/themes/onedark.toml b/runtime/themes/onedark.toml
index 1e7d9af1..a4cc12eb 100644
--- a/runtime/themes/onedark.toml
+++ b/runtime/themes/onedark.toml
@@ -39,7 +39,7 @@
 "diff.delta" = "gold"
 "diff.minus" = "red"
 
-diagnostic = { modifiers = ["underlined"] }
+diagnostic = { modifiers = ["undercurled"] }
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "green", modifiers = ["bold"] }
 "warning" = { fg = "yellow", modifiers = ["bold"] }

From 3ad7d543ca17963f0839b1a6cd8abacdb5c60cf7 Mon Sep 17 00:00:00 2001
From: A-Walrus <ofek.r.guy@gmail.com>
Date: Thu, 11 Aug 2022 14:10:29 +0300
Subject: [PATCH 178/884] Add separate color for underlines

---
 helix-tui/src/backend/crossterm.rs |  8 +++++++-
 helix-tui/src/buffer.rs            |  7 +++++++
 helix-view/src/graphics.rs         | 19 +++++++++++++++++++
 helix-view/src/theme.rs            |  1 +
 runtime/themes/dark_plus.toml      |  3 ++-
 5 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/helix-tui/src/backend/crossterm.rs b/helix-tui/src/backend/crossterm.rs
index 252036f3..fe9da919 100644
--- a/helix-tui/src/backend/crossterm.rs
+++ b/helix-tui/src/backend/crossterm.rs
@@ -4,7 +4,7 @@ use crossterm::{
     execute, queue,
     style::{
         Attribute as CAttribute, Color as CColor, Print, SetAttribute, SetBackgroundColor,
-        SetForegroundColor,
+        SetForegroundColor, SetUnderlineColor,
     },
     terminal::{self, Clear, ClearType},
 };
@@ -47,6 +47,7 @@ where
     {
         let mut fg = Color::Reset;
         let mut bg = Color::Reset;
+        let mut underline = Color::Reset;
         let mut modifier = Modifier::empty();
         let mut last_pos: Option<(u16, u16)> = None;
         for (x, y, cell) in content {
@@ -73,6 +74,11 @@ where
                 map_error(queue!(self.buffer, SetBackgroundColor(color)))?;
                 bg = cell.bg;
             }
+            if cell.underline != underline {
+                let color = CColor::from(cell.underline);
+                map_error(queue!(self.buffer, SetUnderlineColor(color)))?;
+                underline = cell.underline;
+            }
 
             map_error(queue!(self.buffer, Print(&cell.symbol)))?;
         }
diff --git a/helix-tui/src/buffer.rs b/helix-tui/src/buffer.rs
index 21c53aad..14f3ecaf 100644
--- a/helix-tui/src/buffer.rs
+++ b/helix-tui/src/buffer.rs
@@ -11,6 +11,7 @@ pub struct Cell {
     pub symbol: String,
     pub fg: Color,
     pub bg: Color,
+    pub underline: Color,
     pub modifier: Modifier,
 }
 
@@ -44,6 +45,9 @@ impl Cell {
         if let Some(c) = style.bg {
             self.bg = c;
         }
+        if let Some(c) = style.underline {
+            self.underline = c;
+        }
         self.modifier.insert(style.add_modifier);
         self.modifier.remove(style.sub_modifier);
         self
@@ -53,6 +57,7 @@ impl Cell {
         Style::default()
             .fg(self.fg)
             .bg(self.bg)
+            .underline(self.bg)
             .add_modifier(self.modifier)
     }
 
@@ -61,6 +66,7 @@ impl Cell {
         self.symbol.push(' ');
         self.fg = Color::Reset;
         self.bg = Color::Reset;
+        self.underline = Color::Reset;
         self.modifier = Modifier::empty();
     }
 }
@@ -71,6 +77,7 @@ impl Default for Cell {
             symbol: " ".into(),
             fg: Color::Reset,
             bg: Color::Reset,
+            underline: Color::Reset,
             modifier: Modifier::empty(),
         }
     }
diff --git a/helix-view/src/graphics.rs b/helix-view/src/graphics.rs
index 15492119..c995f60c 100644
--- a/helix-view/src/graphics.rs
+++ b/helix-view/src/graphics.rs
@@ -440,6 +440,7 @@ impl FromStr for Modifier {
 pub struct Style {
     pub fg: Option<Color>,
     pub bg: Option<Color>,
+    pub underline: Option<Color>,
     pub add_modifier: Modifier,
     pub sub_modifier: Modifier,
 }
@@ -449,6 +450,7 @@ impl Default for Style {
         Style {
             fg: None,
             bg: None,
+            underline: None,
             add_modifier: Modifier::empty(),
             sub_modifier: Modifier::empty(),
         }
@@ -461,6 +463,7 @@ impl Style {
         Style {
             fg: Some(Color::Reset),
             bg: Some(Color::Reset),
+            underline: Some(Color::Reset),
             add_modifier: Modifier::empty(),
             sub_modifier: Modifier::all(),
         }
@@ -496,6 +499,21 @@ impl Style {
         self
     }
 
+    /// Changes the underline color.
+    ///
+    /// ## Examples
+    ///
+    /// ```rust
+    /// # use helix_view::graphics::{Color, Style};
+    /// let style = Style::default().underline(Color::Blue);
+    /// let diff = Style::default().underline(Color::Red);
+    /// assert_eq!(style.patch(diff), Style::default().underline(Color::Red));
+    /// ```
+    pub fn underline(mut self, color: Color) -> Style {
+        self.underline = Some(color);
+        self
+    }
+
     /// Changes the text emphasis.
     ///
     /// When applied, it adds the given modifier to the `Style` modifiers.
@@ -552,6 +570,7 @@ impl Style {
     pub fn patch(mut self, other: Style) -> Style {
         self.fg = other.fg.or(self.fg);
         self.bg = other.bg.or(self.bg);
+        self.underline = other.underline.or(self.underline);
 
         self.add_modifier.remove(other.sub_modifier);
         self.add_modifier.insert(other.add_modifier);
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index fa5fa702..5ce1b2c5 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -269,6 +269,7 @@ impl ThemePalette {
                 match name.as_str() {
                     "fg" => *style = style.fg(self.parse_color(value)?),
                     "bg" => *style = style.bg(self.parse_color(value)?),
+                    "underline" => *style = style.underline(self.parse_color(value)?),
                     "modifiers" => {
                         let modifiers = value
                             .as_array()
diff --git a/runtime/themes/dark_plus.toml b/runtime/themes/dark_plus.toml
index f99da4fb..d1a5756e 100644
--- a/runtime/themes/dark_plus.toml
+++ b/runtime/themes/dark_plus.toml
@@ -92,7 +92,8 @@
 "info" = { fg = "light_blue" }
 "hint" = { fg = "light_gray3" }
 
-diagnostic = { modifiers = ["underlined"] }
+"diagnostic.error" = {underline = "red", modifiers = ["undercurled"] }
+"diagnostic" = {underline = "gold", modifiers = ["undercurled"] }
 
 [palette]
 white = "#ffffff"

From 79a39c1063eca995bf75694743dc5eb3c905fa9c Mon Sep 17 00:00:00 2001
From: A-Walrus <ofek.r.guy@gmail.com>
Date: Sun, 4 Sep 2022 11:28:55 +0300
Subject: [PATCH 179/884] Fix failing tests

Add underline field to doctests, and fix bugs
---
 helix-tui/src/buffer.rs    | 5 +++--
 helix-tui/src/text.rs      | 4 ++++
 helix-view/src/graphics.rs | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/helix-tui/src/buffer.rs b/helix-tui/src/buffer.rs
index 14f3ecaf..3036608d 100644
--- a/helix-tui/src/buffer.rs
+++ b/helix-tui/src/buffer.rs
@@ -57,7 +57,7 @@ impl Cell {
         Style::default()
             .fg(self.fg)
             .bg(self.bg)
-            .underline(self.bg)
+            .underline(self.underline)
             .add_modifier(self.modifier)
     }
 
@@ -104,7 +104,8 @@ impl Default for Cell {
 ///     symbol: String::from("r"),
 ///     fg: Color::Red,
 ///     bg: Color::White,
-///     modifier: Modifier::empty()
+///     underline: Color::Reset,
+///     modifier: Modifier::empty(),
 /// });
 /// buf[(5, 0)].set_char('x');
 /// assert_eq!(buf[(5, 0)].symbol, "x");
diff --git a/helix-tui/src/text.rs b/helix-tui/src/text.rs
index 602090e5..73d58803 100644
--- a/helix-tui/src/text.rs
+++ b/helix-tui/src/text.rs
@@ -134,6 +134,7 @@ impl<'a> Span<'a> {
     ///             style: Style {
     ///                 fg: Some(Color::Yellow),
     ///                 bg: Some(Color::Black),
+    ///                 underline: None,
     ///                 add_modifier: Modifier::empty(),
     ///                 sub_modifier: Modifier::empty(),
     ///             },
@@ -143,6 +144,7 @@ impl<'a> Span<'a> {
     ///             style: Style {
     ///                 fg: Some(Color::Yellow),
     ///                 bg: Some(Color::Black),
+    ///                 underline: None,
     ///                 add_modifier: Modifier::empty(),
     ///                 sub_modifier: Modifier::empty(),
     ///             },
@@ -152,6 +154,7 @@ impl<'a> Span<'a> {
     ///             style: Style {
     ///                 fg: Some(Color::Yellow),
     ///                 bg: Some(Color::Black),
+    ///                 underline: None,
     ///                 add_modifier: Modifier::empty(),
     ///                 sub_modifier: Modifier::empty(),
     ///             },
@@ -161,6 +164,7 @@ impl<'a> Span<'a> {
     ///             style: Style {
     ///                 fg: Some(Color::Yellow),
     ///                 bg: Some(Color::Black),
+    ///                 underline: None,
     ///                 add_modifier: Modifier::empty(),
     ///                 sub_modifier: Modifier::empty(),
     ///             },
diff --git a/helix-view/src/graphics.rs b/helix-view/src/graphics.rs
index c995f60c..6c854fd0 100644
--- a/helix-view/src/graphics.rs
+++ b/helix-view/src/graphics.rs
@@ -405,6 +405,7 @@ impl FromStr for Modifier {
 ///         fg: Some(Color::Yellow),
 ///         bg: Some(Color::Red),
 ///         add_modifier: Modifier::BOLD,
+///         underline: Some(Color::Reset),
 ///         sub_modifier: Modifier::empty(),
 ///     },
 ///     buffer[(0, 0)].style(),
@@ -429,6 +430,7 @@ impl FromStr for Modifier {
 ///     Style {
 ///         fg: Some(Color::Yellow),
 ///         bg: Some(Color::Reset),
+///         underline: Some(Color::Reset),
 ///         add_modifier: Modifier::empty(),
 ///         sub_modifier: Modifier::empty(),
 ///     },

From de72b9c04caf1fe12fd6076646657c456403c229 Mon Sep 17 00:00:00 2001
From: A-Walrus <ofek.r.guy@gmail.com>
Date: Sun, 4 Sep 2022 17:57:14 +0300
Subject: [PATCH 180/884] Update theme documentation

---
 book/src/themes.md | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/book/src/themes.md b/book/src/themes.md
index 9908456f..32ff2498 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -13,10 +13,10 @@ The default theme.toml can be found [here](https://github.com/helix-editor/helix
 Each line in the theme file is specified as below:
 
 ```toml
-key = { fg = "#ffffff", bg = "#000000", modifiers = ["bold", "italic"] }
+key = { fg = "#ffffff", bg = "#000000", underline = "#ff0000", modifiers = ["bold", "italic", "undercurled"] }
 ```
 
-where `key` represents what you want to style, `fg` specifies the foreground color, `bg` the background color, and `modifiers` is a list of style modifiers. `bg` and `modifiers` can be omitted to defer to the defaults.
+where `key` represents what you want to style, `fg` specifies the foreground color, `bg` the background color, `underline` the underline color (only meaningful if an underline modifier is enabled), and `modifiers` is a list of style modifiers. `bg`, `underline` and `modifiers` can be omitted to defer to the defaults.
 
 To specify only the foreground color:
 
@@ -77,17 +77,21 @@ The following values may be used as modifiers.
 
 Less common modifiers might not be supported by your terminal emulator.
 
-| Modifier       |
-| ---            |
-| `bold`         |
-| `dim`          |
-| `italic`       |
-| `underlined`   |
-| `slow_blink`   |
-| `rapid_blink`  |
-| `reversed`     |
-| `hidden`       |
-| `crossed_out`  |
+| Modifier             |
+| ---                  |
+| `bold`               |
+| `dim`                |
+| `italic`             |
+| `underlined`         |
+| `undercurled`        |
+| `underdashed`        |
+| `underdotted`        |
+| `double-underlined`  |
+| `slow_blink`         |
+| `rapid_blink`        |
+| `reversed`           |
+| `hidden`             |
+| `crossed_out`        |
 
 ### Scopes
 

From 79d3d44c3db48365597eefd274e868bc1e15de57 Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Wed, 7 Sep 2022 17:28:58 +0530
Subject: [PATCH 181/884] Detect extended underline support using terminfo

The cxterminfo crate has been used over popular alternatives
like `term` since it supports querying for extended capabilities
and also for it's small codebase size (which will make it easy
to inline it into helix in the future if required).
---
 Cargo.lock                         |  7 ++++
 helix-tui/Cargo.toml               |  1 +
 helix-tui/src/backend/crossterm.rs | 55 ++++++++++++++++++++++++++----
 runtime/themes/onedark.toml        |  5 ++-
 4 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e5edcaac..f980c417 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -176,6 +176,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "cxterminfo"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da92c5e3aaf2cc1fea346d9b3bac0c59c6ffc1d1d46f18d991d449912a3e6f07"
+
 [[package]]
 name = "dirs-next"
 version = "2.0.0"
@@ -504,6 +510,7 @@ dependencies = [
  "bitflags",
  "cassowary",
  "crossterm",
+ "cxterminfo",
  "helix-core",
  "helix-view",
  "serde",
diff --git a/helix-tui/Cargo.toml b/helix-tui/Cargo.toml
index b220c64f..1c6a6a8d 100644
--- a/helix-tui/Cargo.toml
+++ b/helix-tui/Cargo.toml
@@ -20,6 +20,7 @@ bitflags = "1.3"
 cassowary = "0.3"
 unicode-segmentation = "1.10"
 crossterm = { version = "0.25", optional = true }
+cxterminfo = "0.2"
 serde = { version = "1", "optional" = true, features = ["derive"]}
 helix-view = { version = "0.6", path = "../helix-view", features = ["term"] }
 helix-core = { version = "0.6", path = "../helix-core" }
diff --git a/helix-tui/src/backend/crossterm.rs b/helix-tui/src/backend/crossterm.rs
index fe9da919..3a50074e 100644
--- a/helix-tui/src/backend/crossterm.rs
+++ b/helix-tui/src/backend/crossterm.rs
@@ -11,8 +11,38 @@ use crossterm::{
 use helix_view::graphics::{Color, CursorKind, Modifier, Rect};
 use std::io::{self, Write};
 
+fn vte_version() -> Option<usize> {
+    std::env::var("VTE_VERSION").ok()?.parse().ok()
+}
+
+/// Describes terminal capabilities like extended underline, truecolor, etc.
+#[derive(Copy, Clone, Debug, Default)]
+struct Capabilities {
+    /// Support for undercurled, underdashed, etc.
+    has_extended_underlines: bool,
+}
+
+impl Capabilities {
+    /// Detect capabilities from the terminfo database located based
+    /// on the $TERM environment variable. If detection fails, returns
+    /// a default value where no capability is supported.
+    pub fn from_env_or_default() -> Self {
+        match cxterminfo::terminfo::TermInfo::from_env() {
+            Err(_) => Capabilities::default(),
+            Ok(t) => Capabilities {
+                // Smulx, VTE: https://unix.stackexchange.com/a/696253/246284
+                // Su (used by kitty): https://sw.kovidgoyal.net/kitty/underlines
+                has_extended_underlines: t.get_ext_string("Smulx").is_some()
+                    || *t.get_ext_bool("Su").unwrap_or(&false)
+                    || vte_version() >= Some(5102),
+            },
+        }
+    }
+}
+
 pub struct CrosstermBackend<W: Write> {
     buffer: W,
+    capabilities: Capabilities,
 }
 
 impl<W> CrosstermBackend<W>
@@ -20,7 +50,10 @@ where
     W: Write,
 {
     pub fn new(buffer: W) -> CrosstermBackend<W> {
-        CrosstermBackend { buffer }
+        CrosstermBackend {
+            buffer,
+            capabilities: Capabilities::from_env_or_default(),
+        }
     }
 }
 
@@ -61,7 +94,7 @@ where
                     from: modifier,
                     to: cell.modifier,
                 };
-                diff.queue(&mut self.buffer)?;
+                diff.queue(&mut self.buffer, self.capabilities)?;
                 modifier = cell.modifier;
             }
             if cell.fg != fg {
@@ -141,7 +174,7 @@ struct ModifierDiff {
 }
 
 impl ModifierDiff {
-    fn queue<W>(&self, mut w: W) -> io::Result<()>
+    fn queue<W>(&self, mut w: W, caps: Capabilities) -> io::Result<()>
     where
         W: io::Write,
     {
@@ -172,6 +205,14 @@ impl ModifierDiff {
             map_error(queue!(w, SetAttribute(CAttribute::NoBlink)))?;
         }
 
+        let queue_styled_underline = |styled_underline, w: &mut W| -> io::Result<()> {
+            let underline = match caps.has_extended_underlines {
+                true => styled_underline,
+                false => CAttribute::Underlined,
+            };
+            map_error(queue!(w, SetAttribute(underline)))
+        };
+
         let added = self.to - self.from;
         if added.contains(Modifier::REVERSED) {
             map_error(queue!(w, SetAttribute(CAttribute::Reverse)))?;
@@ -186,16 +227,16 @@ impl ModifierDiff {
             map_error(queue!(w, SetAttribute(CAttribute::Underlined)))?;
         }
         if added.contains(Modifier::UNDERCURLED) {
-            map_error(queue!(w, SetAttribute(CAttribute::Undercurled)))?;
+            queue_styled_underline(CAttribute::Undercurled, &mut w)?;
         }
         if added.contains(Modifier::UNDERDOTTED) {
-            map_error(queue!(w, SetAttribute(CAttribute::Underdotted)))?;
+            queue_styled_underline(CAttribute::Underdotted, &mut w)?;
         }
         if added.contains(Modifier::UNDERDASHED) {
-            map_error(queue!(w, SetAttribute(CAttribute::Underdashed)))?;
+            queue_styled_underline(CAttribute::Underdashed, &mut w)?;
         }
         if added.contains(Modifier::DOUBLE_UNDERLINED) {
-            map_error(queue!(w, SetAttribute(CAttribute::DoubleUnderlined)))?;
+            queue_styled_underline(CAttribute::DoubleUnderlined, &mut w)?;
         }
         if added.contains(Modifier::DIM) {
             map_error(queue!(w, SetAttribute(CAttribute::Dim)))?;
diff --git a/runtime/themes/onedark.toml b/runtime/themes/onedark.toml
index a4cc12eb..e2bc2c47 100644
--- a/runtime/themes/onedark.toml
+++ b/runtime/themes/onedark.toml
@@ -39,7 +39,10 @@
 "diff.delta" = "gold"
 "diff.minus" = "red"
 
-diagnostic = { modifiers = ["undercurled"] }
+"diagnostic.info" = { underline = "blue", modifiers = ["undercurled"] }
+"diagnostic.hint" = { underline = "green", modifiers = ["undercurled"] }
+"diagnostic.warning" = { underline = "yellow", modifiers = ["undercurled"] }
+"diagnostic.error" = { underline = "red", modifiers = ["undercurled"] }
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "green", modifiers = ["bold"] }
 "warning" = { fg = "yellow", modifiers = ["bold"] }

From 5b5f1bd39ae46fdf68ba758b29bdb29200394c86 Mon Sep 17 00:00:00 2001
From: nuid32 <91177333+nuid32@users.noreply.github.com>
Date: Sat, 1 Oct 2022 20:37:18 +0500
Subject: [PATCH 182/884] Adjust light-gray in onedarker theme (#4060)

---
 runtime/themes/onedarker.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/themes/onedarker.toml b/runtime/themes/onedarker.toml
index 1ad6f7c3..1eb1a90c 100644
--- a/runtime/themes/onedarker.toml
+++ b/runtime/themes/onedarker.toml
@@ -93,5 +93,5 @@ black = "#16181A"
 light-black = "#2C323C"
 gray = "#454D50"
 faint-gray = "#ABB2BF"
-light-gray = "#C8CCD4"
+light-gray = "#636C6E"
 linenr = "#282C34"

From 71ee589bbc723e7a55585ddc2ca43c29ee93fabe Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Sat, 1 Oct 2022 02:15:25 +0200
Subject: [PATCH 183/884] make underline_style a seperate option

Underline styles are mutally exclusive and overwrite each other.
Therefore implementing as an modifier lead to incorrect behaviour
when the underline style is overwritten.

For backwards compatability the "underline" modified is retained (but
deprecated). Instead the "underline_style" and "underline_color"
optios should be used to style underlines.
---
 book/src/themes.md                 |  23 +++++--
 helix-tui/src/backend/crossterm.rs |  56 +++++++---------
 helix-tui/src/buffer.rs            |  27 +++++---
 helix-tui/src/text.rs              |  12 ++--
 helix-view/src/graphics.rs         | 101 ++++++++++++++++++++---------
 helix-view/src/gutter.rs           |   4 +-
 helix-view/src/theme.rs            |  23 ++++++-
 runtime/themes/dark_plus.toml      |   4 +-
 runtime/themes/onedark.toml        |   8 +--
 9 files changed, 167 insertions(+), 91 deletions(-)

diff --git a/book/src/themes.md b/book/src/themes.md
index 32ff2498..450b3364 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -13,10 +13,10 @@ The default theme.toml can be found [here](https://github.com/helix-editor/helix
 Each line in the theme file is specified as below:
 
 ```toml
-key = { fg = "#ffffff", bg = "#000000", underline = "#ff0000", modifiers = ["bold", "italic", "undercurled"] }
+key = { fg = "#ffffff", bg = "#000000", underline_color = "#ff0000", underline_style = "curl", modifiers = ["bold", "italic"] }
 ```
 
-where `key` represents what you want to style, `fg` specifies the foreground color, `bg` the background color, `underline` the underline color (only meaningful if an underline modifier is enabled), and `modifiers` is a list of style modifiers. `bg`, `underline` and `modifiers` can be omitted to defer to the defaults.
+where `key` represents what you want to style, `fg` specifies the foreground color, `bg` the background color, `underline_style` the underline style, `underline_color` the underline color (only meaningful if an underline style is enabled), and `modifiers` is a list of style modifiers. `bg`, `underline` and `modifiers` can be omitted to defer to the defaults.
 
 To specify only the foreground color:
 
@@ -83,16 +83,27 @@ Less common modifiers might not be supported by your terminal emulator.
 | `dim`                |
 | `italic`             |
 | `underlined`         |
-| `undercurled`        |
-| `underdashed`        |
-| `underdotted`        |
-| `double-underlined`  |
 | `slow_blink`         |
 | `rapid_blink`        |
 | `reversed`           |
 | `hidden`             |
 | `crossed_out`        |
 
+### Underline Style
+
+One of the following values may be used as an `underline_styles`. 
+
+Some styles might not be supported by your terminal emulator.
+
+| Modifier       |
+| ---            |
+| `line`         |
+| `curl`         |
+| `dashed`       |
+| `dot`          |
+| `double-line`  |
+
+
 ### Scopes
 
 The following is a list of scopes available to use for styling.
diff --git a/helix-tui/src/backend/crossterm.rs b/helix-tui/src/backend/crossterm.rs
index 3a50074e..3e6dc5f5 100644
--- a/helix-tui/src/backend/crossterm.rs
+++ b/helix-tui/src/backend/crossterm.rs
@@ -8,7 +8,7 @@ use crossterm::{
     },
     terminal::{self, Clear, ClearType},
 };
-use helix_view::graphics::{Color, CursorKind, Modifier, Rect};
+use helix_view::graphics::{Color, CursorKind, Modifier, Rect, UnderlineStyle};
 use std::io::{self, Write};
 
 fn vte_version() -> Option<usize> {
@@ -80,7 +80,8 @@ where
     {
         let mut fg = Color::Reset;
         let mut bg = Color::Reset;
-        let mut underline = Color::Reset;
+        let mut underline_color = Color::Reset;
+        let mut underline_style = UnderlineStyle::Reset;
         let mut modifier = Modifier::empty();
         let mut last_pos: Option<(u16, u16)> = None;
         for (x, y, cell) in content {
@@ -94,7 +95,7 @@ where
                     from: modifier,
                     to: cell.modifier,
                 };
-                diff.queue(&mut self.buffer, self.capabilities)?;
+                diff.queue(&mut self.buffer)?;
                 modifier = cell.modifier;
             }
             if cell.fg != fg {
@@ -107,10 +108,24 @@ where
                 map_error(queue!(self.buffer, SetBackgroundColor(color)))?;
                 bg = cell.bg;
             }
-            if cell.underline != underline {
-                let color = CColor::from(cell.underline);
+            if cell.underline_color != underline_color {
+                let color = CColor::from(cell.underline_color);
                 map_error(queue!(self.buffer, SetUnderlineColor(color)))?;
-                underline = cell.underline;
+                underline_color = cell.underline_color;
+            }
+
+            let mut new_underline_style = cell.underline_style;
+            if !self.capabilities.has_extended_underlines {
+                match new_underline_style {
+                    UnderlineStyle::Reset => (),
+                    _ => new_underline_style = UnderlineStyle::Line,
+                }
+            }
+
+            if new_underline_style != underline_style {
+                let attr = CAttribute::from(cell.underline_style);
+                map_error(queue!(self.buffer, SetAttribute(attr)))?;
+                underline_style = new_underline_style;
             }
 
             map_error(queue!(self.buffer, Print(&cell.symbol)))?;
@@ -118,6 +133,7 @@ where
 
         map_error(queue!(
             self.buffer,
+            SetUnderlineColor(CColor::Reset),
             SetForegroundColor(CColor::Reset),
             SetBackgroundColor(CColor::Reset),
             SetAttribute(CAttribute::Reset)
@@ -174,7 +190,7 @@ struct ModifierDiff {
 }
 
 impl ModifierDiff {
-    fn queue<W>(&self, mut w: W, caps: Capabilities) -> io::Result<()>
+    fn queue<W>(&self, mut w: W) -> io::Result<()>
     where
         W: io::Write,
     {
@@ -192,9 +208,6 @@ impl ModifierDiff {
         if removed.contains(Modifier::ITALIC) {
             map_error(queue!(w, SetAttribute(CAttribute::NoItalic)))?;
         }
-        if removed.intersects(Modifier::ANY_UNDERLINE) {
-            map_error(queue!(w, SetAttribute(CAttribute::NoUnderline)))?;
-        }
         if removed.contains(Modifier::DIM) {
             map_error(queue!(w, SetAttribute(CAttribute::NormalIntensity)))?;
         }
@@ -205,14 +218,6 @@ impl ModifierDiff {
             map_error(queue!(w, SetAttribute(CAttribute::NoBlink)))?;
         }
 
-        let queue_styled_underline = |styled_underline, w: &mut W| -> io::Result<()> {
-            let underline = match caps.has_extended_underlines {
-                true => styled_underline,
-                false => CAttribute::Underlined,
-            };
-            map_error(queue!(w, SetAttribute(underline)))
-        };
-
         let added = self.to - self.from;
         if added.contains(Modifier::REVERSED) {
             map_error(queue!(w, SetAttribute(CAttribute::Reverse)))?;
@@ -223,21 +228,6 @@ impl ModifierDiff {
         if added.contains(Modifier::ITALIC) {
             map_error(queue!(w, SetAttribute(CAttribute::Italic)))?;
         }
-        if added.contains(Modifier::UNDERLINED) {
-            map_error(queue!(w, SetAttribute(CAttribute::Underlined)))?;
-        }
-        if added.contains(Modifier::UNDERCURLED) {
-            queue_styled_underline(CAttribute::Undercurled, &mut w)?;
-        }
-        if added.contains(Modifier::UNDERDOTTED) {
-            queue_styled_underline(CAttribute::Underdotted, &mut w)?;
-        }
-        if added.contains(Modifier::UNDERDASHED) {
-            queue_styled_underline(CAttribute::Underdashed, &mut w)?;
-        }
-        if added.contains(Modifier::DOUBLE_UNDERLINED) {
-            queue_styled_underline(CAttribute::DoubleUnderlined, &mut w)?;
-        }
         if added.contains(Modifier::DIM) {
             map_error(queue!(w, SetAttribute(CAttribute::Dim)))?;
         }
diff --git a/helix-tui/src/buffer.rs b/helix-tui/src/buffer.rs
index 3036608d..424e6d32 100644
--- a/helix-tui/src/buffer.rs
+++ b/helix-tui/src/buffer.rs
@@ -3,7 +3,7 @@ use helix_core::unicode::width::UnicodeWidthStr;
 use std::cmp::min;
 use unicode_segmentation::UnicodeSegmentation;
 
-use helix_view::graphics::{Color, Modifier, Rect, Style};
+use helix_view::graphics::{Color, Modifier, Rect, Style, UnderlineStyle};
 
 /// A buffer cell
 #[derive(Debug, Clone, PartialEq)]
@@ -11,7 +11,8 @@ pub struct Cell {
     pub symbol: String,
     pub fg: Color,
     pub bg: Color,
-    pub underline: Color,
+    pub underline_color: Color,
+    pub underline_style: UnderlineStyle,
     pub modifier: Modifier,
 }
 
@@ -45,9 +46,13 @@ impl Cell {
         if let Some(c) = style.bg {
             self.bg = c;
         }
-        if let Some(c) = style.underline {
-            self.underline = c;
+        if let Some(c) = style.underline_color {
+            self.underline_color = c;
         }
+        if let Some(style) = style.underline_style {
+            self.underline_style = style;
+        }
+
         self.modifier.insert(style.add_modifier);
         self.modifier.remove(style.sub_modifier);
         self
@@ -57,7 +62,8 @@ impl Cell {
         Style::default()
             .fg(self.fg)
             .bg(self.bg)
-            .underline(self.underline)
+            .underline_color(self.underline_color)
+            .underline_style(self.underline_style)
             .add_modifier(self.modifier)
     }
 
@@ -66,7 +72,8 @@ impl Cell {
         self.symbol.push(' ');
         self.fg = Color::Reset;
         self.bg = Color::Reset;
-        self.underline = Color::Reset;
+        self.underline_color = Color::Reset;
+        self.underline_style = UnderlineStyle::Reset;
         self.modifier = Modifier::empty();
     }
 }
@@ -77,7 +84,8 @@ impl Default for Cell {
             symbol: " ".into(),
             fg: Color::Reset,
             bg: Color::Reset,
-            underline: Color::Reset,
+            underline_color: Color::Reset,
+            underline_style: UnderlineStyle::Reset,
             modifier: Modifier::empty(),
         }
     }
@@ -94,7 +102,7 @@ impl Default for Cell {
 ///
 /// ```
 /// use helix_tui::buffer::{Buffer, Cell};
-/// use helix_view::graphics::{Rect, Color, Style, Modifier};
+/// use helix_view::graphics::{Rect, Color, UnderlineStyle, Style, Modifier};
 ///
 /// let mut buf = Buffer::empty(Rect{x: 0, y: 0, width: 10, height: 5});
 /// buf[(0, 2)].set_symbol("x");
@@ -104,7 +112,8 @@ impl Default for Cell {
 ///     symbol: String::from("r"),
 ///     fg: Color::Red,
 ///     bg: Color::White,
-///     underline: Color::Reset,
+///     underline_color: Color::Reset,
+///     underline_style: UnderlineStyle::Reset,
 ///     modifier: Modifier::empty(),
 /// });
 /// buf[(5, 0)].set_char('x');
diff --git a/helix-tui/src/text.rs b/helix-tui/src/text.rs
index 73d58803..1bfe5ee1 100644
--- a/helix-tui/src/text.rs
+++ b/helix-tui/src/text.rs
@@ -134,7 +134,8 @@ impl<'a> Span<'a> {
     ///             style: Style {
     ///                 fg: Some(Color::Yellow),
     ///                 bg: Some(Color::Black),
-    ///                 underline: None,
+    ///                 underline_color: None,
+    ///                 underline_style: None,
     ///                 add_modifier: Modifier::empty(),
     ///                 sub_modifier: Modifier::empty(),
     ///             },
@@ -144,7 +145,8 @@ impl<'a> Span<'a> {
     ///             style: Style {
     ///                 fg: Some(Color::Yellow),
     ///                 bg: Some(Color::Black),
-    ///                 underline: None,
+    ///                 underline_color: None,
+    ///                 underline_style: None,
     ///                 add_modifier: Modifier::empty(),
     ///                 sub_modifier: Modifier::empty(),
     ///             },
@@ -154,7 +156,8 @@ impl<'a> Span<'a> {
     ///             style: Style {
     ///                 fg: Some(Color::Yellow),
     ///                 bg: Some(Color::Black),
-    ///                 underline: None,
+    ///                 underline_color: None,
+    ///                 underline_style: None,
     ///                 add_modifier: Modifier::empty(),
     ///                 sub_modifier: Modifier::empty(),
     ///             },
@@ -164,7 +167,8 @@ impl<'a> Span<'a> {
     ///             style: Style {
     ///                 fg: Some(Color::Yellow),
     ///                 bg: Some(Color::Black),
-    ///                 underline: None,
+    ///                 underline_color: None,
+    ///                 underline_style: None,
     ///                 add_modifier: Modifier::empty(),
     ///                 sub_modifier: Modifier::empty(),
     ///             },
diff --git a/helix-view/src/graphics.rs b/helix-view/src/graphics.rs
index 6c854fd0..01344748 100644
--- a/helix-view/src/graphics.rs
+++ b/helix-view/src/graphics.rs
@@ -315,6 +315,44 @@ impl From<Color> for crossterm::style::Color {
     }
 }
 
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum UnderlineStyle {
+    Reset,
+    Line,
+    Curl,
+    Dotted,
+    Dashed,
+    DoubleLine,
+}
+
+impl FromStr for UnderlineStyle {
+    type Err = &'static str;
+
+    fn from_str(modifier: &str) -> Result<Self, Self::Err> {
+        match modifier {
+            "line" => Ok(Self::Line),
+            "curl" => Ok(Self::Curl),
+            "dotted" => Ok(Self::Dotted),
+            "dashed" => Ok(Self::Dashed),
+            "double_line" => Ok(Self::DoubleLine),
+            _ => Err("Invalid underline style"),
+        }
+    }
+}
+
+impl From<UnderlineStyle> for crossterm::style::Attribute {
+    fn from(style: UnderlineStyle) -> Self {
+        match style {
+            UnderlineStyle::Line => crossterm::style::Attribute::Underlined,
+            UnderlineStyle::Curl => crossterm::style::Attribute::Undercurled,
+            UnderlineStyle::Dotted => crossterm::style::Attribute::Underdotted,
+            UnderlineStyle::Dashed => crossterm::style::Attribute::Underdashed,
+            UnderlineStyle::DoubleLine => crossterm::style::Attribute::DoubleUnderlined,
+            UnderlineStyle::Reset => crossterm::style::Attribute::NoUnderline,
+        }
+    }
+}
+
 bitflags! {
     /// Modifier changes the way a piece of text is displayed.
     ///
@@ -332,22 +370,11 @@ bitflags! {
         const BOLD              = 0b0000_0000_0000_0001;
         const DIM               = 0b0000_0000_0000_0010;
         const ITALIC            = 0b0000_0000_0000_0100;
-        const UNDERLINED        = 0b0000_0000_0000_1000;
         const SLOW_BLINK        = 0b0000_0000_0001_0000;
         const RAPID_BLINK       = 0b0000_0000_0010_0000;
         const REVERSED          = 0b0000_0000_0100_0000;
         const HIDDEN            = 0b0000_0000_1000_0000;
         const CROSSED_OUT       = 0b0000_0001_0000_0000;
-        const UNDERCURLED       = 0b0000_0010_0000_0000;
-        const UNDERDOTTED       = 0b0000_0100_0000_0000;
-        const UNDERDASHED       = 0b0000_1000_0000_0000;
-        const DOUBLE_UNDERLINED = 0b0001_0000_0000_0000;
-
-        const ANY_UNDERLINE     = Self::UNDERLINED.bits
-                                    | Self::UNDERCURLED.bits
-                                    | Self::UNDERDOTTED.bits
-                                    | Self::UNDERDASHED.bits
-                                    | Self::DOUBLE_UNDERLINED.bits;
     }
 }
 
@@ -359,16 +386,11 @@ impl FromStr for Modifier {
             "bold" => Ok(Self::BOLD),
             "dim" => Ok(Self::DIM),
             "italic" => Ok(Self::ITALIC),
-            "underlined" => Ok(Self::UNDERLINED),
             "slow_blink" => Ok(Self::SLOW_BLINK),
             "rapid_blink" => Ok(Self::RAPID_BLINK),
             "reversed" => Ok(Self::REVERSED),
             "hidden" => Ok(Self::HIDDEN),
             "crossed_out" => Ok(Self::CROSSED_OUT),
-            "undercurled" => Ok(Self::UNDERCURLED),
-            "underdotted" => Ok(Self::UNDERDOTTED),
-            "underdashed" => Ok(Self::UNDERDASHED),
-            "double_underlined" => Ok(Self::DOUBLE_UNDERLINED),
             _ => Err("Invalid modifier"),
         }
     }
@@ -389,7 +411,7 @@ impl FromStr for Modifier {
 /// just S3.
 ///
 /// ```rust
-/// # use helix_view::graphics::{Rect, Color, Modifier, Style};
+/// # use helix_view::graphics::{Rect, Color, UnderlineStyle, Modifier, Style};
 /// # use helix_tui::buffer::Buffer;
 /// let styles = [
 ///     Style::default().fg(Color::Blue).add_modifier(Modifier::BOLD | Modifier::ITALIC),
@@ -405,7 +427,8 @@ impl FromStr for Modifier {
 ///         fg: Some(Color::Yellow),
 ///         bg: Some(Color::Red),
 ///         add_modifier: Modifier::BOLD,
-///         underline: Some(Color::Reset),
+///         underline_color: Some(Color::Reset),
+///         underline_style: Some(UnderlineStyle::Reset),
 ///         sub_modifier: Modifier::empty(),
 ///     },
 ///     buffer[(0, 0)].style(),
@@ -416,7 +439,7 @@ impl FromStr for Modifier {
 /// reset all properties until that point use [`Style::reset`].
 ///
 /// ```
-/// # use helix_view::graphics::{Rect, Color, Modifier, Style};
+/// # use helix_view::graphics::{Rect, Color, UnderlineStyle, Modifier, Style};
 /// # use helix_tui::buffer::Buffer;
 /// let styles = [
 ///     Style::default().fg(Color::Blue).add_modifier(Modifier::BOLD | Modifier::ITALIC),
@@ -430,7 +453,8 @@ impl FromStr for Modifier {
 ///     Style {
 ///         fg: Some(Color::Yellow),
 ///         bg: Some(Color::Reset),
-///         underline: Some(Color::Reset),
+///         underline_color: Some(Color::Reset),
+///         underline_style: Some(UnderlineStyle::Reset),
 ///         add_modifier: Modifier::empty(),
 ///         sub_modifier: Modifier::empty(),
 ///     },
@@ -442,7 +466,8 @@ impl FromStr for Modifier {
 pub struct Style {
     pub fg: Option<Color>,
     pub bg: Option<Color>,
-    pub underline: Option<Color>,
+    pub underline_color: Option<Color>,
+    pub underline_style: Option<UnderlineStyle>,
     pub add_modifier: Modifier,
     pub sub_modifier: Modifier,
 }
@@ -452,7 +477,8 @@ impl Default for Style {
         Style {
             fg: None,
             bg: None,
-            underline: None,
+            underline_color: None,
+            underline_style: None,
             add_modifier: Modifier::empty(),
             sub_modifier: Modifier::empty(),
         }
@@ -465,7 +491,8 @@ impl Style {
         Style {
             fg: Some(Color::Reset),
             bg: Some(Color::Reset),
-            underline: Some(Color::Reset),
+            underline_color: None,
+            underline_style: None,
             add_modifier: Modifier::empty(),
             sub_modifier: Modifier::all(),
         }
@@ -507,12 +534,27 @@ impl Style {
     ///
     /// ```rust
     /// # use helix_view::graphics::{Color, Style};
-    /// let style = Style::default().underline(Color::Blue);
-    /// let diff = Style::default().underline(Color::Red);
-    /// assert_eq!(style.patch(diff), Style::default().underline(Color::Red));
+    /// let style = Style::default().underline_color(Color::Blue);
+    /// let diff = Style::default().underline_color(Color::Red);
+    /// assert_eq!(style.patch(diff), Style::default().underline_color(Color::Red));
+    /// ```
+    pub fn underline_color(mut self, color: Color) -> Style {
+        self.underline_color = Some(color);
+        self
+    }
+
+    /// Changes the underline style.
+    ///
+    /// ## Examples
+    ///
+    /// ```rust
+    /// # use helix_view::graphics::{UnderlineStyle, Style};
+    /// let style = Style::default().underline_style(UnderlineStyle::Line);
+    /// let diff = Style::default().underline_style(UnderlineStyle::Curl);
+    /// assert_eq!(style.patch(diff), Style::default().underline_style(UnderlineStyle::Curl));
     /// ```
-    pub fn underline(mut self, color: Color) -> Style {
-        self.underline = Some(color);
+    pub fn underline_style(mut self, style: UnderlineStyle) -> Style {
+        self.underline_style = Some(style);
         self
     }
 
@@ -572,7 +614,8 @@ impl Style {
     pub fn patch(mut self, other: Style) -> Style {
         self.fg = other.fg.or(self.fg);
         self.bg = other.bg.or(self.bg);
-        self.underline = other.underline.or(self.underline);
+        self.underline_color = other.underline_color.or(self.underline_color);
+        self.underline_style = other.underline_style.or(self.underline_style);
 
         self.add_modifier.remove(other.sub_modifier);
         self.add_modifier.insert(other.add_modifier);
diff --git a/helix-view/src/gutter.rs b/helix-view/src/gutter.rs
index ab0e2986..2c207d27 100644
--- a/helix-view/src/gutter.rs
+++ b/helix-view/src/gutter.rs
@@ -1,7 +1,7 @@
 use std::fmt::Write;
 
 use crate::{
-    graphics::{Color, Modifier, Style},
+    graphics::{Color, Style, UnderlineStyle},
     Document, Editor, Theme, View,
 };
 
@@ -147,7 +147,7 @@ pub fn breakpoints<'doc>(
             .find(|breakpoint| breakpoint.line == line)?;
 
         let mut style = if breakpoint.condition.is_some() && breakpoint.log_message.is_some() {
-            error.add_modifier(Modifier::UNDERLINED)
+            error.underline_style(UnderlineStyle::Line)
         } else if breakpoint.condition.is_some() {
             error
         } else if breakpoint.log_message.is_some() {
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index 5ce1b2c5..90185937 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -10,6 +10,7 @@ use once_cell::sync::Lazy;
 use serde::{Deserialize, Deserializer};
 use toml::Value;
 
+use crate::graphics::UnderlineStyle;
 pub use crate::graphics::{Color, Modifier, Style};
 
 pub static DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| {
@@ -263,20 +264,38 @@ impl ThemePalette {
             .ok_or(format!("Theme: invalid modifier: {}", value))
     }
 
+    pub fn parse_underline_style(value: &Value) -> Result<UnderlineStyle, String> {
+        value
+            .as_str()
+            .and_then(|s| s.parse().ok())
+            .ok_or(format!("Theme: invalid underline_style: {}", value))
+    }
+
     pub fn parse_style(&self, style: &mut Style, value: Value) -> Result<(), String> {
         if let Value::Table(entries) = value {
             for (name, value) in entries {
                 match name.as_str() {
                     "fg" => *style = style.fg(self.parse_color(value)?),
                     "bg" => *style = style.bg(self.parse_color(value)?),
-                    "underline" => *style = style.underline(self.parse_color(value)?),
+                    "underline_color" => *style = style.underline_color(self.parse_color(value)?),
+                    "underline_style" => {
+                        warn!("found style");
+                        *style = style.underline_style(Self::parse_underline_style(&value)?)
+                    }
                     "modifiers" => {
                         let modifiers = value
                             .as_array()
                             .ok_or("Theme: modifiers should be an array")?;
 
                         for modifier in modifiers {
-                            *style = style.add_modifier(Self::parse_modifier(modifier)?);
+                            if modifier
+                                .as_str()
+                                .map_or(false, |modifier| modifier == "underlined")
+                            {
+                                *style = style.underline_style(UnderlineStyle::Line);
+                            } else {
+                                *style = style.add_modifier(Self::parse_modifier(modifier)?);
+                            }
                         }
                     }
                     _ => return Err(format!("Theme: invalid style attribute: {}", name)),
diff --git a/runtime/themes/dark_plus.toml b/runtime/themes/dark_plus.toml
index d1a5756e..fa6b34ab 100644
--- a/runtime/themes/dark_plus.toml
+++ b/runtime/themes/dark_plus.toml
@@ -92,8 +92,8 @@
 "info" = { fg = "light_blue" }
 "hint" = { fg = "light_gray3" }
 
-"diagnostic.error" = {underline = "red", modifiers = ["undercurled"] }
-"diagnostic" = {underline = "gold", modifiers = ["undercurled"] }
+"diagnostic.error" = {underline_color = "red", underline_style = "curl"}
+"diagnostic" = {underline_color = "gold", underline_style = "curl" }
 
 [palette]
 white = "#ffffff"
diff --git a/runtime/themes/onedark.toml b/runtime/themes/onedark.toml
index e2bc2c47..5f337a8d 100644
--- a/runtime/themes/onedark.toml
+++ b/runtime/themes/onedark.toml
@@ -39,10 +39,10 @@
 "diff.delta" = "gold"
 "diff.minus" = "red"
 
-"diagnostic.info" = { underline = "blue", modifiers = ["undercurled"] }
-"diagnostic.hint" = { underline = "green", modifiers = ["undercurled"] }
-"diagnostic.warning" = { underline = "yellow", modifiers = ["undercurled"] }
-"diagnostic.error" = { underline = "red", modifiers = ["undercurled"] }
+"diagnostic.info" = { underline_color = "blue", underline_style = "curl" }
+"diagnostic.hint" = { underline_color = "green", underline_style = "curl" }
+"diagnostic.warning" = { underline_color = "yellow", underline_style = "curl" }
+"diagnostic.error" = { underline_color = "red", underline_style = "curl" }
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "green", modifiers = ["bold"] }
 "warning" = { fg = "yellow", modifiers = ["bold"] }

From 6caa7a7f566e67c50537014b3e97fa8e65a8b7b3 Mon Sep 17 00:00:00 2001
From: nuid32 <91177333+nuid32@users.noreply.github.com>
Date: Sun, 2 Oct 2022 21:19:55 +0500
Subject: [PATCH 184/884] Onedarker theme: some improvements (#4069)

---
 runtime/themes/onedarker.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/themes/onedarker.toml b/runtime/themes/onedarker.toml
index 1eb1a90c..665f10ed 100644
--- a/runtime/themes/onedarker.toml
+++ b/runtime/themes/onedarker.toml
@@ -2,7 +2,7 @@
 
 "attribute" = { fg = "yellow" }
 "comment" = { fg = "light-gray", modifiers = ["italic"] }
-"constant" = { fg = "green" }
+"constant" = { fg = "gold" }
 "constant.numeric" = { fg = "gold" }
 "constant.builtin" = { fg = "gold" }
 "constant.character.escape" = { fg = "gold" }
@@ -69,7 +69,7 @@ diagnostic = { modifiers = ["underlined"] }
 "ui.statusline.normal" = { fg = "light-black", bg = "purple" }
 "ui.statusline.insert" = { fg = "light-black", bg = "green" }
 "ui.statusline.select" = { fg = "light-black", bg = "cyan" }
-"ui.text" = { fg = "purple" }
+"ui.text" = { fg = "white" }
 "ui.text.focus" = { fg = "white", bg = "light-black", modifiers = ["bold"] }
 
 "ui.help" = { fg = "white", bg = "gray" }
@@ -91,7 +91,7 @@ cyan = "#46A6B2"
 white = "#ABB2BF"
 black = "#16181A"
 light-black = "#2C323C"
-gray = "#454D50"
+gray = "#252D30"
 faint-gray = "#ABB2BF"
 light-gray = "#636C6E"
 linenr = "#282C34"

From 8c2cc4301742d9d759a8c2964ade0719d4b15645 Mon Sep 17 00:00:00 2001
From: Kirawi <67773714+kirawi@users.noreply.github.com>
Date: Sun, 2 Oct 2022 15:23:23 -0400
Subject: [PATCH 185/884] diff full-doc LSP edits (#4041)

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 helix-lsp/src/lib.rs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index cb234357..0717fc04 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -204,6 +204,20 @@ pub mod util {
         // in reverse order.
         edits.sort_unstable_by_key(|edit| edit.range.start);
 
+        // Generate a diff if the edit is a full document replacement.
+        #[allow(clippy::collapsible_if)]
+        if edits.len() == 1 {
+            let is_document_replacement = edits.first().and_then(|edit| {
+                let start = lsp_pos_to_pos(doc, edit.range.start, offset_encoding)?;
+                let end = lsp_pos_to_pos(doc, edit.range.end, offset_encoding)?;
+                Some(start..end)
+            }) == Some(0..doc.len_chars());
+            if is_document_replacement {
+                let new_text = Rope::from(edits.pop().unwrap().new_text);
+                return helix_core::diff::compare_ropes(doc, &new_text);
+            }
+        }
+
         Transaction::change(
             doc,
             edits.into_iter().map(|edit| {

From 9d1793c45b22a6dce0a08937717887189b46c492 Mon Sep 17 00:00:00 2001
From: Matt Freitas-Stavola <mbStavola@users.noreply.github.com>
Date: Sun, 2 Oct 2022 12:32:30 -0700
Subject: [PATCH 186/884] Add pseudo_pending for t/T/f/F (#4062)

---
 helix-term/src/commands.rs | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index fb1a4b38..264ab5bb 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1086,18 +1086,27 @@ fn extend_next_long_word_end(cx: &mut Context) {
     extend_word_impl(cx, movement::move_next_long_word_end)
 }
 
-fn will_find_char<F>(cx: &mut Context, search_fn: F, inclusive: bool, extend: bool)
-where
+fn will_find_char<F>(
+    cx: &mut Context,
+    search_fn: F,
+    inclusive: bool,
+    extend: bool,
+    pseudo_pending: &str,
+) where
     F: Fn(RopeSlice, char, usize, usize, bool) -> Option<usize> + 'static,
 {
     // TODO: count is reset to 1 before next key so we move it into the closure here.
     // Would be nice to carry over.
     let count = cx.count();
 
+    cx.editor.pseudo_pending = Some(pseudo_pending.to_string());
+
     // need to wait for next key
     // TODO: should this be done by grapheme rather than char?  For example,
     // we can't properly handle the line-ending CRLF case here in terms of char.
     cx.on_next_key(move |cx, event| {
+        cx.editor.pseudo_pending = None;
+
         let ch = match event {
             KeyEvent {
                 code: KeyCode::Enter,
@@ -1200,35 +1209,35 @@ fn find_prev_char_impl(
 }
 
 fn find_till_char(cx: &mut Context) {
-    will_find_char(cx, find_next_char_impl, false, false)
+    will_find_char(cx, find_next_char_impl, false, false, "t")
 }
 
 fn find_next_char(cx: &mut Context) {
-    will_find_char(cx, find_next_char_impl, true, false)
+    will_find_char(cx, find_next_char_impl, true, false, "f")
 }
 
 fn extend_till_char(cx: &mut Context) {
-    will_find_char(cx, find_next_char_impl, false, true)
+    will_find_char(cx, find_next_char_impl, false, true, "t")
 }
 
 fn extend_next_char(cx: &mut Context) {
-    will_find_char(cx, find_next_char_impl, true, true)
+    will_find_char(cx, find_next_char_impl, true, true, "f")
 }
 
 fn till_prev_char(cx: &mut Context) {
-    will_find_char(cx, find_prev_char_impl, false, false)
+    will_find_char(cx, find_prev_char_impl, false, false, "T")
 }
 
 fn find_prev_char(cx: &mut Context) {
-    will_find_char(cx, find_prev_char_impl, true, false)
+    will_find_char(cx, find_prev_char_impl, true, false, "F")
 }
 
 fn extend_till_prev_char(cx: &mut Context) {
-    will_find_char(cx, find_prev_char_impl, false, true)
+    will_find_char(cx, find_prev_char_impl, false, true, "T")
 }
 
 fn extend_prev_char(cx: &mut Context) {
-    will_find_char(cx, find_prev_char_impl, true, true)
+    will_find_char(cx, find_prev_char_impl, true, true, "F")
 }
 
 fn repeat_last_motion(cx: &mut Context) {

From 18f6ec7a8eb9ff7d46d4ec1bba52f48364e9c9d7 Mon Sep 17 00:00:00 2001
From: David <12832280+David-Else@users.noreply.github.com>
Date: Mon, 3 Oct 2022 15:14:16 +0100
Subject: [PATCH 187/884] Update treesitter markdown (#4078)

* Update treesitter markdown

* Update inline and add table injections
---
 languages.toml                          | 4 ++--
 runtime/queries/markdown/injections.scm | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/languages.toml b/languages.toml
index d7909b6d..def55182 100644
--- a/languages.toml
+++ b/languages.toml
@@ -911,7 +911,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "markdown"
-source = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "142a5b4a1b092b64c9f5db8f11558f9dd4009a1b", subpath = "tree-sitter-markdown" }
+source = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "d5740f0fe4b8e4603f2229df107c5c9ef5eec389", subpath = "tree-sitter-markdown" }
 
 [[language]]
 name = "markdown.inline"
@@ -923,7 +923,7 @@ grammar = "markdown_inline"
 
 [[grammar]]
 name = "markdown_inline"
-source = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "142a5b4a1b092b64c9f5db8f11558f9dd4009a1b", subpath = "tree-sitter-markdown-inline" }
+source = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "d5740f0fe4b8e4603f2229df107c5c9ef5eec389", subpath = "tree-sitter-markdown-inline" }
 
 [[language]]
 name = "dart"
diff --git a/runtime/queries/markdown/injections.scm b/runtime/queries/markdown/injections.scm
index f94b9f98..e184db15 100644
--- a/runtime/queries/markdown/injections.scm
+++ b/runtime/queries/markdown/injections.scm
@@ -7,6 +7,8 @@
 
 ((html_block) @injection.content (#set! injection.language "html") (#set! injection.include-unnamed-children))
 
+((pipe_table_cell) @injection.content (#set! injection.language "markdown.inline") (#set! injection.include-unnamed-children))
+
 ((minus_metadata) @injection.content (#set! injection.language "yaml") (#set! injection.include-unnamed-children))
 ((plus_metadata) @injection.content (#set! injection.language "toml") (#set! injection.include-unnamed-children))
 

From bcba5d67f9b8650936c391f6c113945291941f51 Mon Sep 17 00:00:00 2001
From: Joe <Josephharrisonlim@gmail.com>
Date: Mon, 3 Oct 2022 10:33:20 -0400
Subject: [PATCH 188/884] Add goto preview (#2982)

---
 helix-term/src/commands/typed.rs | 39 +++++++++++++++++++++++++-------
 helix-view/src/editor.rs         |  3 ++-
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 6d0ced65..d5a368a2 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1196,18 +1196,41 @@ pub(super) fn goto_line_number(
     args: &[Cow<str>],
     event: PromptEvent,
 ) -> anyhow::Result<()> {
-    if event != PromptEvent::Validate {
-        return Ok(());
+    match event {
+        PromptEvent::Abort => {
+            if let Some(line_number) = cx.editor.last_line_number {
+                goto_line_impl(cx.editor, NonZeroUsize::new(line_number));
+                let (view, doc) = current!(cx.editor);
+                view.ensure_cursor_in_view(doc, line_number);
+                cx.editor.last_line_number = None;
+            }
+            return Ok(());
+        }
+        PromptEvent::Validate => {
+            ensure!(!args.is_empty(), "Line number required");
+            cx.editor.last_line_number = None;
+        }
+        PromptEvent::Update => {
+            if args.is_empty() {
+                if let Some(line_number) = cx.editor.last_line_number {
+                    // When a user hits backspace and there are no numbers left,
+                    // we can bring them back to their original line
+                    goto_line_impl(cx.editor, NonZeroUsize::new(line_number));
+                    let (view, doc) = current!(cx.editor);
+                    view.ensure_cursor_in_view(doc, line_number);
+                    cx.editor.last_line_number = None;
+                }
+                return Ok(());
+            }
+            let (view, doc) = current!(cx.editor);
+            let text = doc.text().slice(..);
+            let line = doc.selection(view.id).primary().cursor_line(text);
+            cx.editor.last_line_number.get_or_insert(line + 1);
+        }
     }
-
-    ensure!(!args.is_empty(), "Line number required");
-
     let line = args[0].parse::<usize>()?;
-
     goto_line_impl(cx.editor, NonZeroUsize::new(line));
-
     let (view, doc) = current!(cx.editor);
-
     view.ensure_cursor_in_view(doc, line);
     Ok(())
 }
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 5eff9983..e804a864 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -643,7 +643,7 @@ pub struct Editor {
     /// The currently applied editor theme. While previewing a theme, the previewed theme
     /// is set here.
     pub theme: Theme,
-
+    pub last_line_number: Option<usize>,
     pub status_msg: Option<(Cow<'static, str>, Severity)>,
     pub autoinfo: Option<Info>,
 
@@ -717,6 +717,7 @@ impl Editor {
             syn_loader,
             theme_loader,
             last_theme: None,
+            last_line_number: None,
             registers: Registers::default(),
             clipboard_provider: get_clipboard_provider(),
             status_msg: None,

From 57dc5fbe3aab5807e5895e37e609310b684e2c15 Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Mon, 3 Oct 2022 17:33:48 +0300
Subject: [PATCH 189/884] Show "Invalid regex" message on enter (Validate)
 (#3049)

* Show "Invalid regex" message on enter (Validate)

* Reset selection on invalid regex

* Add popup for invalid regex

* Replace set_position with position

* Make popup auto close
---
 helix-term/src/ui/mod.rs | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 60ad3b24..ba809d9b 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -12,6 +12,8 @@ mod spinner;
 mod statusline;
 mod text;
 
+use crate::compositor::{Component, Compositor};
+use crate::job;
 pub use completion::Completion;
 pub use editor::EditorView;
 pub use markdown::Markdown;
@@ -110,7 +112,37 @@ pub fn regex_prompt(
 
                             view.ensure_cursor_in_view(doc, config.scrolloff);
                         }
-                        Err(_err) => (), // TODO: mark command line as error
+                        Err(err) => {
+                            let (view, doc) = current!(cx.editor);
+                            doc.set_selection(view.id, snapshot.clone());
+                            view.offset = offset_snapshot;
+
+                            if event == PromptEvent::Validate {
+                                let callback = async move {
+                                    let call: job::Callback = Box::new(
+                                        move |_editor: &mut Editor, compositor: &mut Compositor| {
+                                            let contents = Text::new(format!("{}", err));
+                                            let size = compositor.size();
+                                            let mut popup = Popup::new("invalid-regex", contents)
+                                                .position(Some(helix_core::Position::new(
+                                                    size.height as usize - 2, // 2 = statusline + commandline
+                                                    0,
+                                                )))
+                                                .auto_close(true);
+                                            popup.required_size((size.width, size.height));
+
+                                            compositor.replace_or_push("invalid-regex", popup);
+                                        },
+                                    );
+                                    Ok(call)
+                                };
+
+                                cx.jobs.callback(callback);
+                            } else {
+                                // Update
+                                // TODO: mark command line as error
+                            }
+                        }
                     }
                 }
             }

From 2fac9e24e565e976a8af8d82a4b6f2755a82a074 Mon Sep 17 00:00:00 2001
From: Christoph Schmidler <TheSamsa@users.noreply.github.com>
Date: Mon, 3 Oct 2022 16:34:29 +0200
Subject: [PATCH 190/884] Inherit theme (#3067)

* Add RawTheme to handle inheritance with theme palette

* Add a intermediate step in theme loading

it uses RawTheme struct to load the original ThemePalette, so we can merge it with the inherited one.

* Load default themes via RawThemes, remove Theme deserialization

* Allow naming custom theme same as inherited one

* Remove RawTheme and use toml::Value directly

* Resolve all review changes resulting in a cleaner code

* Simplify return for Loader::load

* Add  implementation to avoid extra step for loading of base themes
---
 Cargo.lock              |   1 +
 helix-view/Cargo.toml   |   1 +
 helix-view/src/theme.rs | 192 +++++++++++++++++++++++++++++++---------
 3 files changed, 152 insertions(+), 42 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e5edcaac..6537543a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -523,6 +523,7 @@ dependencies = [
  "futures-util",
  "helix-core",
  "helix-dap",
+ "helix-loader",
  "helix-lsp",
  "helix-tui",
  "log",
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 266a5732..b96a537d 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -17,6 +17,7 @@ term = ["crossterm"]
 bitflags = "1.3"
 anyhow = "1"
 helix-core = { version = "0.6", path = "../helix-core" }
+helix-loader = { version = "0.6", path = "../helix-loader" }
 helix-lsp = { version = "0.6", path = "../helix-lsp" }
 helix-dap = { version = "0.6", path = "../helix-dap" }
 crossterm = { version = "0.25", optional = true }
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index fa5fa702..85f5cc13 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -3,19 +3,28 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use anyhow::Context;
+use anyhow::{anyhow, Context, Result};
 use helix_core::hashmap;
+use helix_loader::merge_toml_values;
 use log::warn;
 use once_cell::sync::Lazy;
 use serde::{Deserialize, Deserializer};
-use toml::Value;
+use toml::{map::Map, Value};
 
 pub use crate::graphics::{Color, Modifier, Style};
 
 pub static DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| {
+    //    let raw_theme: Value = toml::from_slice(include_bytes!("../../theme.toml"))
+    //        .expect("Failed to parse default theme");
+    //    Theme::from(raw_theme)
+
     toml::from_slice(include_bytes!("../../theme.toml")).expect("Failed to parse default theme")
 });
 pub static BASE16_DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| {
+    //    let raw_theme: Value = toml::from_slice(include_bytes!("../../base16_theme.toml"))
+    //        .expect("Failed to parse base 16 default theme");
+    //    Theme::from(raw_theme)
+
     toml::from_slice(include_bytes!("../../base16_theme.toml"))
         .expect("Failed to parse base 16 default theme")
 });
@@ -35,24 +44,51 @@ impl Loader {
     }
 
     /// Loads a theme first looking in the `user_dir` then in `default_dir`
-    pub fn load(&self, name: &str) -> Result<Theme, anyhow::Error> {
+    pub fn load(&self, name: &str) -> Result<Theme> {
         if name == "default" {
             return Ok(self.default());
         }
         if name == "base16_default" {
             return Ok(self.base16_default());
         }
-        let filename = format!("{}.toml", name);
 
-        let user_path = self.user_dir.join(&filename);
-        let path = if user_path.exists() {
-            user_path
+        self.load_theme(name, name, false).map(Theme::from)
+    }
+
+    // load the theme and its parent recursively and merge them
+    // `base_theme_name` is the theme from the config.toml,
+    // used to prevent some circular loading scenarios
+    fn load_theme(
+        &self,
+        name: &str,
+        base_them_name: &str,
+        only_default_dir: bool,
+    ) -> Result<Value> {
+        let path = self.path(name, only_default_dir);
+        let theme_toml = self.load_toml(path)?;
+
+        let inherits = theme_toml.get("inherits");
+
+        let theme_toml = if let Some(parent_theme_name) = inherits {
+            let parent_theme_name = parent_theme_name.as_str().ok_or_else(|| {
+                anyhow!(
+                    "Theme: expected 'inherits' to be a string: {}",
+                    parent_theme_name
+                )
+            })?;
+
+            let parent_theme_toml = self.load_theme(
+                parent_theme_name,
+                base_them_name,
+                base_them_name == parent_theme_name,
+            )?;
+
+            self.merge_themes(parent_theme_toml, theme_toml)
         } else {
-            self.default_dir.join(filename)
+            theme_toml
         };
 
-        let data = std::fs::read(&path)?;
-        toml::from_slice(data.as_slice()).context("Failed to deserialize theme")
+        Ok(theme_toml)
     }
 
     pub fn read_names(path: &Path) -> Vec<String> {
@@ -70,6 +106,53 @@ impl Loader {
             .unwrap_or_default()
     }
 
+    // merge one theme into the parent theme
+    fn merge_themes(&self, parent_theme_toml: Value, theme_toml: Value) -> Value {
+        let parent_palette = parent_theme_toml.get("palette");
+        let palette = theme_toml.get("palette");
+
+        // handle the table seperately since it needs a `merge_depth` of 2
+        // this would conflict with the rest of the theme merge strategy
+        let palette_values = match (parent_palette, palette) {
+            (Some(parent_palette), Some(palette)) => {
+                merge_toml_values(parent_palette.clone(), palette.clone(), 2)
+            }
+            (Some(parent_palette), None) => parent_palette.clone(),
+            (None, Some(palette)) => palette.clone(),
+            (None, None) => Map::new().into(),
+        };
+
+        // add the palette correctly as nested table
+        let mut palette = Map::new();
+        palette.insert(String::from("palette"), palette_values);
+
+        // merge the theme into the parent theme
+        let theme = merge_toml_values(parent_theme_toml, theme_toml, 1);
+        // merge the before specially handled palette into the theme
+        merge_toml_values(theme, palette.into(), 1)
+    }
+
+    // Loads the theme data as `toml::Value` first from the user_dir then in default_dir
+    fn load_toml(&self, path: PathBuf) -> Result<Value> {
+        let data = std::fs::read(&path)?;
+
+        toml::from_slice(data.as_slice()).context("Failed to deserialize theme")
+    }
+
+    // Returns the path to the theme with the name
+    // With `only_default_dir` as false the path will first search for the user path
+    // disabled it ignores the user path and returns only the default path
+    fn path(&self, name: &str, only_default_dir: bool) -> PathBuf {
+        let filename = format!("{}.toml", name);
+
+        let user_path = self.user_dir.join(&filename);
+        if !only_default_dir && user_path.exists() {
+            user_path
+        } else {
+            self.default_dir.join(filename)
+        }
+    }
+
     /// Lists all theme names available in default and user directory
     pub fn names(&self) -> Vec<String> {
         let mut names = Self::read_names(&self.user_dir);
@@ -105,52 +188,77 @@ pub struct Theme {
     highlights: Vec<Style>,
 }
 
+impl From<Value> for Theme {
+    fn from(value: Value) -> Self {
+        let values: Result<HashMap<String, Value>> =
+            toml::from_str(&value.to_string()).context("Failed to load theme");
+
+        let (styles, scopes, highlights) = build_theme_values(values);
+
+        Self {
+            styles,
+            scopes,
+            highlights,
+        }
+    }
+}
+
 impl<'de> Deserialize<'de> for Theme {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
         D: Deserializer<'de>,
     {
-        let mut styles = HashMap::new();
-        let mut scopes = Vec::new();
-        let mut highlights = Vec::new();
-
-        if let Ok(mut colors) = HashMap::<String, Value>::deserialize(deserializer) {
-            // TODO: alert user of parsing failures in editor
-            let palette = colors
-                .remove("palette")
-                .map(|value| {
-                    ThemePalette::try_from(value).unwrap_or_else(|err| {
-                        warn!("{}", err);
-                        ThemePalette::default()
-                    })
-                })
-                .unwrap_or_default();
-
-            styles.reserve(colors.len());
-            scopes.reserve(colors.len());
-            highlights.reserve(colors.len());
-
-            for (name, style_value) in colors {
-                let mut style = Style::default();
-                if let Err(err) = palette.parse_style(&mut style, style_value) {
-                    warn!("{}", err);
-                }
+        let values = HashMap::<String, Value>::deserialize(deserializer)?;
 
-                // these are used both as UI and as highlights
-                styles.insert(name.clone(), style);
-                scopes.push(name);
-                highlights.push(style);
-            }
-        }
+        let (styles, scopes, highlights) = build_theme_values(Ok(values));
 
         Ok(Self {
-            scopes,
             styles,
+            scopes,
             highlights,
         })
     }
 }
 
+fn build_theme_values(
+    values: Result<HashMap<String, Value>>,
+) -> (HashMap<String, Style>, Vec<String>, Vec<Style>) {
+    let mut styles = HashMap::new();
+    let mut scopes = Vec::new();
+    let mut highlights = Vec::new();
+
+    if let Ok(mut colors) = values {
+        // TODO: alert user of parsing failures in editor
+        let palette = colors
+            .remove("palette")
+            .map(|value| {
+                ThemePalette::try_from(value).unwrap_or_else(|err| {
+                    warn!("{}", err);
+                    ThemePalette::default()
+                })
+            })
+            .unwrap_or_default();
+        // remove inherits from value to prevent errors
+        let _ = colors.remove("inherits");
+        styles.reserve(colors.len());
+        scopes.reserve(colors.len());
+        highlights.reserve(colors.len());
+        for (name, style_value) in colors {
+            let mut style = Style::default();
+            if let Err(err) = palette.parse_style(&mut style, style_value) {
+                warn!("{}", err);
+            }
+
+            // these are used both as UI and as highlights
+            styles.insert(name.clone(), style);
+            scopes.push(name);
+            highlights.push(style);
+        }
+    }
+
+    (styles, scopes, highlights)
+}
+
 impl Theme {
     #[inline]
     pub fn highlight(&self, index: usize) -> Style {

From f3958aa1fd4518aad0842e3015d991aadce1fd28 Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Mon, 3 Oct 2022 17:43:26 +0300
Subject: [PATCH 191/884] Cycled to end/beginning + no more matches msgs
 (#3176)

* Show status msg when next/prev cycles around

* Add msg when there is no wraparound

* Cleanup code

* Change msg to "Wrapped around document"
---
 helix-term/src/commands.rs | 50 ++++++++++++++++++++++----------------
 helix-term/src/ui/mod.rs   |  7 +++---
 2 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 264ab5bb..0a192b4a 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1520,7 +1520,8 @@ fn select_regex(cx: &mut Context) {
         "select:".into(),
         Some(reg),
         ui::completers::none,
-        move |view, doc, regex, event| {
+        move |editor, regex, event| {
+            let (view, doc) = current!(editor);
             if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
                 return;
             }
@@ -1541,7 +1542,8 @@ fn split_selection(cx: &mut Context) {
         "split:".into(),
         Some(reg),
         ui::completers::none,
-        move |view, doc, regex, event| {
+        move |editor, regex, event| {
+            let (view, doc) = current!(editor);
             if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
                 return;
             }
@@ -1563,10 +1565,8 @@ fn split_selection_on_newline(cx: &mut Context) {
     doc.set_selection(view.id, selection);
 }
 
-#[allow(clippy::too_many_arguments)]
 fn search_impl(
-    doc: &mut Document,
-    view: &mut View,
+    editor: &mut Editor,
     contents: &str,
     regex: &Regex,
     movement: Movement,
@@ -1574,6 +1574,7 @@ fn search_impl(
     scrolloff: usize,
     wrap_around: bool,
 ) {
+    let (view, doc) = current!(editor);
     let text = doc.text().slice(..);
     let selection = doc.selection(view.id);
 
@@ -1603,17 +1604,25 @@ fn search_impl(
         Direction::Backward => regex.find_iter(&contents[..start]).last(),
     };
 
-    if wrap_around && mat.is_none() {
-        mat = match direction {
-            Direction::Forward => regex.find(contents),
-            Direction::Backward => {
-                offset = start;
-                regex.find_iter(&contents[start..]).last()
-            }
+    if mat.is_none() {
+        if wrap_around {
+            mat = match direction {
+                Direction::Forward => regex.find(contents),
+                Direction::Backward => {
+                    offset = start;
+                    regex.find_iter(&contents[start..]).last()
+                }
+            };
+            editor.set_status("Wrapped around document");
+        } else {
+            editor.set_error("No more matches");
         }
-        // TODO: message on wraparound
     }
 
+    let (view, doc) = current!(editor);
+    let text = doc.text().slice(..);
+    let selection = doc.selection(view.id);
+
     if let Some(mat) = mat {
         let start = text.byte_to_char(mat.start() + offset);
         let end = text.byte_to_char(mat.end() + offset);
@@ -1689,13 +1698,12 @@ fn searcher(cx: &mut Context, direction: Direction) {
                 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
                 .collect()
         },
-        move |view, doc, regex, event| {
+        move |editor, regex, event| {
             if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
                 return;
             }
             search_impl(
-                doc,
-                view,
+                editor,
                 &contents,
                 &regex,
                 Movement::Move,
@@ -1711,7 +1719,7 @@ fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Dir
     let count = cx.count();
     let config = cx.editor.config();
     let scrolloff = config.scrolloff;
-    let (view, doc) = current!(cx.editor);
+    let (_, doc) = current!(cx.editor);
     let registers = &cx.editor.registers;
     if let Some(query) = registers.read('/').and_then(|query| query.last()) {
         let contents = doc.text().slice(..).to_string();
@@ -1729,8 +1737,7 @@ fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Dir
         {
             for _ in 0..count {
                 search_impl(
-                    doc,
-                    view,
+                    cx.editor,
                     &contents,
                     &regex,
                     movement,
@@ -1834,7 +1841,7 @@ fn global_search(cx: &mut Context) {
                 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
                 .collect()
         },
-        move |_view, _doc, regex, event| {
+        move |_editor, regex, event| {
             if event != PromptEvent::Validate {
                 return;
             }
@@ -3773,7 +3780,8 @@ fn keep_or_remove_selections_impl(cx: &mut Context, remove: bool) {
         if remove { "remove:" } else { "keep:" }.into(),
         Some(reg),
         ui::completers::none,
-        move |view, doc, regex, event| {
+        move |editor, regex, event| {
+            let (view, doc) = current!(editor);
             if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
                 return;
             }
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index ba809d9b..8ab15bff 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -26,7 +26,7 @@ pub use text::Text;
 
 use helix_core::regex::Regex;
 use helix_core::regex::RegexBuilder;
-use helix_view::{Document, Editor, View};
+use helix_view::Editor;
 
 use std::path::PathBuf;
 
@@ -61,7 +61,7 @@ pub fn regex_prompt(
     prompt: std::borrow::Cow<'static, str>,
     history_register: Option<char>,
     completion_fn: impl FnMut(&Editor, &str) -> Vec<prompt::Completion> + 'static,
-    fun: impl Fn(&mut View, &mut Document, Regex, PromptEvent) + 'static,
+    fun: impl Fn(&mut Editor, Regex, PromptEvent) + 'static,
 ) {
     let (view, doc) = current!(cx.editor);
     let doc_id = view.doc;
@@ -108,8 +108,9 @@ pub fn regex_prompt(
                                 view.jumps.push((doc_id, snapshot.clone()));
                             }
 
-                            fun(view, doc, regex, event);
+                            fun(cx.editor, regex, event);
 
+                            let (view, doc) = current!(cx.editor);
                             view.ensure_cursor_in_view(doc, config.scrolloff);
                         }
                         Err(err) => {

From 274f2ea45979098a96b7a6d94ecc18351826eaea Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sat, 30 Jul 2022 09:20:07 -0500
Subject: [PATCH 192/884] Use requested direction for new textobject selection
 range

This changes the behavior of operations like `]f`/`[f` to set the
direction of the new range to the direction of the action.

The original behavior was to always use the head of the next function.
This is inconsistent with the behavior of goto_next_paragraph and makes
it impossible to create extend variants of the textobject motions.

This causes a behavior change when there are nested functions. The
behavior in the parent commit is that repeated uses of `]f` will
select every function in the file even if nested. With this commit,
functions are skipped.

It's notable that it's possible to emulate the original behavior by
using the `ensure_selections_forward` (A-:) command between invocations
of `]f`.
---
 helix-core/src/movement.rs  |  8 +++++---
 helix-core/src/selection.rs | 12 +++++++++++-
 helix-term/src/commands.rs  |  1 +
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/helix-core/src/movement.rs b/helix-core/src/movement.rs
index c232484c..278375e8 100644
--- a/helix-core/src/movement.rs
+++ b/helix-core/src/movement.rs
@@ -389,6 +389,8 @@ fn reached_target(target: WordMotionTarget, prev_ch: char, next_ch: char) -> boo
     }
 }
 
+/// Finds the range of the next or previous textobject in the syntax sub-tree of `node`.
+/// Returns the range in the forwards direction.
 pub fn goto_treesitter_object(
     slice: RopeSlice,
     range: Range,
@@ -419,8 +421,8 @@ pub fn goto_treesitter_object(
                 .filter(|n| n.start_byte() > byte_pos)
                 .min_by_key(|n| n.start_byte())?,
             Direction::Backward => nodes
-                .filter(|n| n.start_byte() < byte_pos)
-                .max_by_key(|n| n.start_byte())?,
+                .filter(|n| n.end_byte() < byte_pos)
+                .max_by_key(|n| n.end_byte())?,
         };
 
         let len = slice.len_bytes();
@@ -434,7 +436,7 @@ pub fn goto_treesitter_object(
         let end_char = slice.byte_to_char(end_byte);
 
         // head of range should be at beginning
-        Some(Range::new(end_char, start_char))
+        Some(Range::new(start_char, end_char))
     };
     (0..count).fold(range, |range, _| get_range(range).unwrap_or(range))
 }
diff --git a/helix-core/src/selection.rs b/helix-core/src/selection.rs
index 3463c1d3..1f28ecef 100644
--- a/helix-core/src/selection.rs
+++ b/helix-core/src/selection.rs
@@ -122,7 +122,7 @@ impl Range {
         }
     }
 
-    // flips the direction of the selection
+    /// Flips the direction of the selection
     pub fn flip(&self) -> Self {
         Self {
             anchor: self.head,
@@ -131,6 +131,16 @@ impl Range {
         }
     }
 
+    /// Returns the selection if it goes in the direction of `direction`,
+    /// flipping the selection otherwise.
+    pub fn with_direction(self, direction: Direction) -> Self {
+        if self.direction() == direction {
+            self
+        } else {
+            self.flip()
+        }
+    }
+
     /// Check two ranges for overlap.
     #[must_use]
     pub fn overlaps(&self, other: &Self) -> bool {
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 0a192b4a..53a34c00 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4294,6 +4294,7 @@ fn goto_ts_object_impl(cx: &mut Context, object: &'static str, direction: Direct
                     lang_config,
                     count,
                 )
+                .with_direction(direction)
             });
 
             doc.set_selection(view.id, selection);

From 032d76ccf2ed4f46c51bf60d190c23edc6b26220 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sat, 30 Jul 2022 09:29:07 -0500
Subject: [PATCH 193/884] Use Range::with_direction consistently

---
 helix-term/src/commands.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 53a34c00..b2378222 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2177,10 +2177,7 @@ fn ensure_selections_forward(cx: &mut Context) {
     let selection = doc
         .selection(view.id)
         .clone()
-        .transform(|r| match r.direction() {
-            Direction::Forward => r,
-            Direction::Backward => r.flip(),
-        });
+        .transform(|r| r.with_direction(Direction::Forward));
 
     doc.set_selection(view.id, selection);
 }

From c253139790034bac62bb51da0efd133d12b7f2c6 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sat, 30 Jul 2022 11:57:39 -0500
Subject: [PATCH 194/884] Extend textobject selections in select mode

---
 helix-term/src/commands.rs | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index b2378222..cb561d6d 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4282,7 +4282,7 @@ fn goto_ts_object_impl(cx: &mut Context, object: &'static str, direction: Direct
             let root = syntax.tree().root_node();
 
             let selection = doc.selection(view.id).clone().transform(|range| {
-                movement::goto_treesitter_object(
+                let new_range = movement::goto_treesitter_object(
                     text,
                     range,
                     object,
@@ -4290,8 +4290,19 @@ fn goto_ts_object_impl(cx: &mut Context, object: &'static str, direction: Direct
                     root,
                     lang_config,
                     count,
-                )
-                .with_direction(direction)
+                );
+
+                if editor.mode == Mode::Select {
+                    let head = if new_range.head < range.anchor {
+                        new_range.anchor
+                    } else {
+                        new_range.head
+                    };
+
+                    Range::new(range.anchor, head)
+                } else {
+                    new_range.with_direction(direction)
+                }
             });
 
             doc.set_selection(view.id, selection);

From 6939dd3adb4ccd89ce63e69d9b0586a377a4df42 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 22 Sep 2022 09:49:58 -0500
Subject: [PATCH 195/884] Add tests for select-mode TS textobjects

---
 helix-term/tests/test/movement.rs | 128 ++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)

diff --git a/helix-term/tests/test/movement.rs b/helix-term/tests/test/movement.rs
index 088685df..e5abb0b0 100644
--- a/helix-term/tests/test/movement.rs
+++ b/helix-term/tests/test/movement.rs
@@ -85,3 +85,131 @@ async fn cursor_position_newly_opened_file() -> anyhow::Result<()> {
 
     Ok(())
 }
+
+#[tokio::test]
+async fn select_mode_tree_sitter_next_function_is_union_of_objects() -> anyhow::Result<()> {
+    test_with_config(
+        Args {
+            files: vec![(PathBuf::from("foo.rs"), Position::default())],
+            ..Default::default()
+        },
+        Config::default(),
+        (
+            helpers::platform_line(indoc! {"\
+                #[/|]#// Increments
+                fn inc(x: usize) -> usize { x + 1 }
+                /// Decrements
+                fn dec(x: usize) -> usize { x - 1 }
+            "})
+            .as_ref(),
+            "]fv]f",
+            helpers::platform_line(indoc! {"\
+                /// Increments
+                #[fn inc(x: usize) -> usize { x + 1 }
+                /// Decrements
+                fn dec(x: usize) -> usize { x - 1 }|]#
+            "})
+            .as_ref(),
+        ),
+    )
+    .await?;
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn select_mode_tree_sitter_prev_function_unselects_object() -> anyhow::Result<()> {
+    test_with_config(
+        Args {
+            files: vec![(PathBuf::from("foo.rs"), Position::default())],
+            ..Default::default()
+        },
+        Config::default(),
+        (
+            helpers::platform_line(indoc! {"\
+                /// Increments
+                #[fn inc(x: usize) -> usize { x + 1 }
+                /// Decrements
+                fn dec(x: usize) -> usize { x - 1 }|]#
+            "})
+            .as_ref(),
+            "v[f",
+            helpers::platform_line(indoc! {"\
+                /// Increments
+                #[fn inc(x: usize) -> usize { x + 1 }|]#
+                /// Decrements
+                fn dec(x: usize) -> usize { x - 1 }
+            "})
+            .as_ref(),
+        ),
+    )
+    .await?;
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn select_mode_tree_sitter_prev_function_goes_backwards_to_object() -> anyhow::Result<()> {
+    // Note: the anchor stays put and the head moves back.
+    test_with_config(
+        Args {
+            files: vec![(PathBuf::from("foo.rs"), Position::default())],
+            ..Default::default()
+        },
+        Config::default(),
+        (
+            helpers::platform_line(indoc! {"\
+                /// Increments
+                fn inc(x: usize) -> usize { x + 1 }
+                /// Decrements
+                fn dec(x: usize) -> usize { x - 1 }
+                /// Identity
+                #[fn ident(x: usize) -> usize { x }|]#
+            "})
+            .as_ref(),
+            "v[f",
+            helpers::platform_line(indoc! {"\
+                /// Increments
+                fn inc(x: usize) -> usize { x + 1 }
+                /// Decrements
+                #[|fn dec(x: usize) -> usize { x - 1 }
+                /// Identity
+                ]#fn ident(x: usize) -> usize { x }
+            "})
+            .as_ref(),
+        ),
+    )
+    .await?;
+
+    test_with_config(
+        Args {
+            files: vec![(PathBuf::from("foo.rs"), Position::default())],
+            ..Default::default()
+        },
+        Config::default(),
+        (
+            helpers::platform_line(indoc! {"\
+                /// Increments
+                fn inc(x: usize) -> usize { x + 1 }
+                /// Decrements
+                fn dec(x: usize) -> usize { x - 1 }
+                /// Identity
+                #[fn ident(x: usize) -> usize { x }|]#
+            "})
+            .as_ref(),
+            "v[f[f",
+            helpers::platform_line(indoc! {"\
+                /// Increments
+                #[|fn inc(x: usize) -> usize { x + 1 }
+                /// Decrements
+                fn dec(x: usize) -> usize { x - 1 }
+                /// Identity
+                ]#fn ident(x: usize) -> usize { x }
+            "})
+            .as_ref(),
+        ),
+    )
+    .await?;
+
+    Ok(())
+}

From 589d17c7583716b339875b72972aaffe0ae5efc1 Mon Sep 17 00:00:00 2001
From: ChrHorn <christoph-horn@hotmail.de>
Date: Mon, 3 Oct 2022 16:44:45 +0200
Subject: [PATCH 196/884] Add `ui.gutter.selected` option for themes (#3303)

* add `ui.gutter.selected`

* add `ui.gutter`, `ui.gutter.selected` to docs
---
 book/src/themes.md          | 2 ++
 helix-term/src/ui/editor.rs | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/book/src/themes.md b/book/src/themes.md
index 9908456f..b92b6d7b 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -219,6 +219,8 @@ These scopes are used for theming the editor interface.
 | `ui.cursor.select`        |                                                |
 | `ui.cursor.match`         | Matching bracket etc.                          |
 | `ui.cursor.primary`       | Cursor with primary selection                  |
+| `ui.gutter`               | Gutter                                         |
+| `ui.gutter.selected`      | Gutter for the line the cursor is on           |
 | `ui.linenr`               | Line numbers                                   |
 | `ui.linenr.selected`      | Line number for the line the cursor is on      |
 | `ui.statusline`           | Statusline                                     |
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 7cb29c3b..0269d804 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -696,6 +696,7 @@ impl EditorView {
         let mut offset = 0;
 
         let gutter_style = theme.get("ui.gutter");
+        let gutter_selected_style = theme.get("ui.gutter.selected");
 
         // avoid lots of small allocations by reusing a text buffer for each line
         let mut text = String::with_capacity(8);
@@ -708,6 +709,12 @@ impl EditorView {
                 let x = viewport.x + offset;
                 let y = viewport.y + i as u16;
 
+                let gutter_style = if selected {
+                    gutter_selected_style
+                } else {
+                    gutter_style
+                };
+
                 if let Some(style) = gutter(line, selected, &mut text) {
                     surface.set_stringn(x, y, &text, *width, gutter_style.patch(style));
                 } else {

From 77f33e7b20bb84c6506d745ce05ec6835eee6756 Mon Sep 17 00:00:00 2001
From: PeepNSheep <peepnsheep@gmail.com>
Date: Mon, 3 Oct 2022 10:45:32 -0400
Subject: [PATCH 197/884] Add configureable statusline mode names (#3311)

* Added 'long-mode' statusline element

* Added customizable statusline mode names

* Removed a string clone

* Added documentation

* Updated documentation, moved modenames to a seperate section

* Update configuration.md

* Documentation update

* Documentation update

* Documentation update

* Update configuration.md

* Update configuration.md

* Fixed merge error

* Update configuration.md

* Update configuration.md
---
 book/src/configuration.md       | 18 ++++++++++++++++--
 helix-term/src/ui/statusline.rs |  8 ++++----
 helix-view/src/editor.rs        | 20 ++++++++++++++++++++
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index fdabe768..d44855c7 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -68,13 +68,27 @@ left = ["mode", "spinner"]
 center = ["file-name"]
 right = ["diagnostics", "selections", "position", "file-encoding", "file-line-ending", "file-type"]
 separator = "│"
+mode.normal = "NORMAL"
+mode.insert = "INSERT"
+mode.select = "SELECT"
 ```
+The `[editor.statusline]` key takes the following sub-keys:
 
-The following elements can be configured:
+| Key           | Description | Default |
+| ---           | ---         | ---     |
+| `left`        | A list of elements aligned to the left of the statusline | `["mode", "spinner", "file-name"]` |
+| `center`      | A list of elements aligned to the middle of the statusline | `[]` |
+| `right`       | A list of elements aligned to the right of the statusline | `["diagnostics", "selections", "position", "file-encoding"]` |
+| `separator`   | The character used to separate elements in the statusline | `"│"` |
+| `mode.normal` | The text shown in the `mode` element for normal mode | `"NOR"` |
+| `mode.insert` | The text shown in the `mode` element for insert mode | `"INS"` |
+| `mode.select` | The text shown in the `mode` element for select mode | `"SEL"` |
+
+The following statusline elements can be configured:
 
 | Key    | Description |
 | ------ | ----------- |
-| `mode` | The current editor mode (`NOR`/`INS`/`SEL`) |
+| `mode` | The current editor mode (`mode.normal`/`mode.insert`/`mode.select`) |
 | `spinner` | A progress spinner indicating LSP activity |
 | `file-name` | The path/name of the opened file |
 | `file-encoding` | The encoding of the opened file if it differs from UTF-8 |
diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index 365e1ca9..9bbb268f 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -154,16 +154,16 @@ where
     F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
 {
     let visible = context.focused;
-
+    let modenames = &context.editor.config().statusline.mode;
     write(
         context,
         format!(
             " {} ",
             if visible {
                 match context.editor.mode() {
-                    Mode::Insert => "INS",
-                    Mode::Select => "SEL",
-                    Mode::Normal => "NOR",
+                    Mode::Insert => &modenames.insert,
+                    Mode::Select => &modenames.select,
+                    Mode::Normal => &modenames.normal,
                 }
             } else {
                 // If not focused, explicitly leave an empty space instead of returning None.
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index e804a864..70c49872 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -260,6 +260,7 @@ pub struct StatusLineConfig {
     pub center: Vec<StatusLineElement>,
     pub right: Vec<StatusLineElement>,
     pub separator: String,
+    pub mode: ModeConfig,
 }
 
 impl Default for StatusLineConfig {
@@ -271,6 +272,25 @@ impl Default for StatusLineConfig {
             center: vec![],
             right: vec![E::Diagnostics, E::Selections, E::Position, E::FileEncoding],
             separator: String::from("│"),
+            mode: ModeConfig::default(),
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case", default, deny_unknown_fields)]
+pub struct ModeConfig {
+    pub normal: String,
+    pub insert: String,
+    pub select: String,
+}
+
+impl Default for ModeConfig {
+    fn default() -> Self {
+        Self {
+            normal: String::from("NOR"),
+            insert: String::from("INS"),
+            select: String::from("SEL"),
         }
     }
 }

From 519857d6323d272106e0b48f9a9a23ce066f53f9 Mon Sep 17 00:00:00 2001
From: Slug <106496265+GreasySlug@users.noreply.github.com>
Date: Mon, 3 Oct 2022 23:45:56 +0900
Subject: [PATCH 198/884] Add dark high contrast theme refer to vscode (#3312)

* Add dark high contrast theme

* Add my sign

* Fix typo

* Change gray to white for comment and remove Italic
---
 runtime/themes/dark_high_contrast.toml | 105 +++++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 runtime/themes/dark_high_contrast.toml

diff --git a/runtime/themes/dark_high_contrast.toml b/runtime/themes/dark_high_contrast.toml
new file mode 100644
index 00000000..c65750f4
--- /dev/null
+++ b/runtime/themes/dark_high_contrast.toml
@@ -0,0 +1,105 @@
+# GreasySlug : dark high contrast <9619abgoni@gmail.com>
+
+# Interface
+"ui.background" = { bg = "black" }
+"ui.window" = { fg = "aqua" }
+"special" = "orange" # file picker fuzzy match
+"ui.background.separator" = { fg = "white" }
+"ui.text" = "white"
+"ui.text.focus" = { modifiers = ["reversed"] } # file picker selected
+
+"ui.virtual.whitespace" = "gray"
+"ui.virtual.ruler" = { fg = "gray", bg = "white", modifiers = ["reversed"] }
+"ui.virtual.indent-guide" = "white"
+
+"ui.statusline" = { fg = "white", bg = "deep_blue" }
+"ui.statusline.inactive" = { fg = "gray" }
+"ui.statusline.normal" = { fg = "black", bg = "aqua" }
+"ui.statusline.insert" = { fg = "black", bg = "orange" }
+"ui.statusline.select" = { fg = "black", bg = "purple" }
+# "ui.statusline.separator" = { fg = "aqua", bg = "white" }
+
+"ui.cursor" = { fg = "black", bg = "white" }
+"ui.cursor.insert" = { fg = "black", bg = "white" }
+"ui.cursor.select" = { fg = "black", bg = "white" }
+"ui.cursor.match" = { bg = "white", modifiers = ["dim"] }
+"ui.cursor.primary" = { fg = "black", bg = "white", modifiers = ["slow_blink"] }
+
+"ui.cursor.secondary" = "white"
+"ui.cursorline.primary" = { fg = "orange", modifiers = ["underlined"] }
+"ui.cursorline.secondary" = { fg = "orange", modifiers = ["underlined"] }
+"ui.selection" = { fg = "deep_blue", bg = "white" }
+
+"ui.menu" = { fg = "white", bg = "deep_blue" }
+"ui.menu.selected" = { fg = "orange", modifiers = ["underlined"] }
+"ui.menu.scroll" = { fg = "aqua", bg = "black" }
+"ui.help" = { fg = "white", bg = "deep_blue" }
+
+"ui.popup" = { bg = "deep_blue" }
+"ui.popup.info" = { fg = "white", bg = "deep_blue" }
+
+"ui.gutter" = { bg = "black" }
+"ui.linenr" = { fg = "white", bg = "black" }
+"ui.linenr.selected" = { fg = "orange", bg = "black", modifiers = ["bold"] }
+
+# Diagnostic
+"diagnostic" = "white"
+"diagnostic.info" = { bg = "white", modifiers = ["underlined"] }
+"diagnostic.hint" = { fg = "yellow", modifiers = ["underlined"] }
+"diagnostic.warning" = { fg = "orange", modifiers = ["underlined"] }
+"diagnostic.error" = { fg = "red", modifiers = ["underlined"] }
+"info" = "white" 
+"hint" = "yellow"
+"warning" = "orange"
+"error" = "red"
+"debug" = "red"
+
+"diff.plus" = "green"
+"diff.delta" ="blue"
+"diff.minus" = "pink"
+
+# Syntax high light
+"type" = { fg = "emerald_green" }
+"type.buildin" = "emerald_green"
+"comment" = { fg = "white" }
+"operator" = "white"
+"variable" = { fg = "aqua" }
+"variable.other.member" = "brown"
+"constant" = "aqua"
+"constant.numeric" = "emerald_green"
+"attributes" = { fg = "blue" }
+"namespace" = "blue"
+"string" = "brown"
+"string.special.url" = { fg = "brown", modifiers =["underlined"]}
+"constant.character.escape" = "yellow"
+"constructor" = "aqua"
+"keyword" = { fg = "blue", modifiers = ["underlined"] }
+"keyword.control" = "purple"
+"function" = "yellow"
+"label" = "blue"
+
+# Markup 
+"markup.heading" = { fg = "yellow", modifiers = ["bold", "underlined"] }
+"markup.list" = { fg = "pink" }
+"markup.bold" = { fg = "emerald_green", modifiers = ["bold"] }
+"markup.italic" = { fg = "blue", modifiers = ["italic"] }
+"markup.link.url" = { fg = "blue", modifiers = ["underlined"] }
+"markup.link.text" = "pink"
+"markup.quote" = "yellow"
+"markup.raw" = "brown"
+
+[palette]
+black = "#000000"
+gray = "#585858"
+white = "#ffffff"
+blue = "#66a4ff"
+deep_blue = "#142743"
+aqua = "#6fc3df"
+purple = "#c586c0"
+red = "#b65f5f"
+pink = "#ff5c8d"
+orange = "#f38518"
+brown = "#ce9178"
+yellow = "#cedc84"
+green = "#427a2d"
+emerald_green = "#4ec9b0"

From c144cc0b04c18d6749016773073a23b5e42d5804 Mon Sep 17 00:00:00 2001
From: Joshua Pauline <36560907+joshpauline@users.noreply.github.com>
Date: Tue, 4 Oct 2022 01:54:00 +1100
Subject: [PATCH 199/884] feat(statusline): add option to show total line
 numbers in file (#3960)

* feat(statusline): add option to show total line numbers in file

* feat(line numbers): add config to doc book
---
 book/src/configuration.md       |  1 +
 helix-term/src/ui/statusline.rs | 10 ++++++++++
 helix-view/src/editor.rs        |  3 +++
 3 files changed, 14 insertions(+)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index d44855c7..039d181c 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -93,6 +93,7 @@ The following statusline elements can be configured:
 | `file-name` | The path/name of the opened file |
 | `file-encoding` | The encoding of the opened file if it differs from UTF-8 |
 | `file-line-ending` | The file line endings (CRLF or LF) |
+| `total-line-numbers` | The total line numbers of the opened file |
 | `file-type` | The type of the opened file |
 | `diagnostics` | The number of warnings and/or errors |
 | `selections` | The number of active selections |
diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index 9bbb268f..b0e8ec5d 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -144,6 +144,7 @@ where
         helix_view::editor::StatusLineElement::Selections => render_selections,
         helix_view::editor::StatusLineElement::Position => render_position,
         helix_view::editor::StatusLineElement::PositionPercentage => render_position_percentage,
+        helix_view::editor::StatusLineElement::TotalLineNumbers => render_total_line_numbers,
         helix_view::editor::StatusLineElement::Separator => render_separator,
         helix_view::editor::StatusLineElement::Spacer => render_spacer,
     }
@@ -276,6 +277,15 @@ where
     );
 }
 
+fn render_total_line_numbers<F>(context: &mut RenderContext, write: F)
+where
+    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
+{
+    let total_line_numbers = context.doc.text().len_lines();
+
+    write(context, format!(" {} ", total_line_numbers), None);
+}
+
 fn render_position_percentage<F>(context: &mut RenderContext, write: F)
 where
     F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 70c49872..f3b0e26f 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -331,6 +331,9 @@ pub enum StatusLineElement {
     /// The cursor position as a percent of the total file
     PositionPercentage,
 
+    /// The total line numbers of the current file
+    TotalLineNumbers,
+
     /// A single space
     Spacer,
 }

From b9ff5d0e0a8a0cc17082dede2f662eb35c7a5815 Mon Sep 17 00:00:00 2001
From: Alexis Kalabura <55039048+axdank@users.noreply.github.com>
Date: Mon, 3 Oct 2022 11:54:46 -0300
Subject: [PATCH 200/884] [lsp-restart]: call the force_shutdown method for the
 old_client (#3972)

* [lsp-restart]: call the shutdown_and_exit method for the old_client

* change shutdown_and_exit to force_shutdown

* remove extra log
---
 helix-lsp/src/lib.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index 0717fc04..98300a62 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -370,7 +370,11 @@ impl Registry {
                 let NewClientResult(client, incoming) = start_client(id, language_config, config)?;
                 self.incoming.push(UnboundedReceiverStream::new(incoming));
 
-                entry.insert((id, client.clone()));
+                let (_, old_client) = entry.insert((id, client.clone()));
+
+                tokio::spawn(async move {
+                    let _ = old_client.force_shutdown().await;
+                });
 
                 Ok(Some(client))
             }

From 63ff9309cee6c5a8b361f2e56f0f69228aa1f1b3 Mon Sep 17 00:00:00 2001
From: greg-enbala <66078183+greg-enbala@users.noreply.github.com>
Date: Mon, 3 Oct 2022 10:55:26 -0400
Subject: [PATCH 201/884] goto_window_* extends selection (#3985)

* goto_window_* extends selection

* Don't push to the jumplist
---
 helix-term/src/commands.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index cb561d6d..fc5c2063 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -885,8 +885,12 @@ fn goto_window(cx: &mut Context, align: Align) {
     .min(last_line.saturating_sub(scrolloff));
 
     let pos = doc.text().line_to_char(line);
-
-    doc.set_selection(view.id, Selection::point(pos));
+    let text = doc.text().slice(..);
+    let selection = doc
+        .selection(view.id)
+        .clone()
+        .transform(|range| range.put_cursor(text, pos, cx.editor.mode == Mode::Select));
+    doc.set_selection(view.id, selection);
 }
 
 fn goto_window_top(cx: &mut Context) {

From 93f26a3048606704c6c16c80a0090fbae64eaf80 Mon Sep 17 00:00:00 2001
From: Ivan Tham <pickfire@riseup.net>
Date: Mon, 3 Oct 2022 22:56:24 +0800
Subject: [PATCH 202/884] Fix signature help panic when too large (#4030)

When signature help is too large it may cause a panic when it is too
large, now I just make the hover do an intersection with surface to make
sure it never overflow.
---
 helix-term/src/ui/lsp.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/ui/lsp.rs b/helix-term/src/ui/lsp.rs
index f2854551..393d24c4 100644
--- a/helix-term/src/ui/lsp.rs
+++ b/helix-term/src/ui/lsp.rs
@@ -68,8 +68,9 @@ impl Component for SignatureHelp {
 
         let (_, sig_text_height) = crate::ui::text::required_size(&sig_text, area.width);
         let sig_text_area = area.clip_top(1).with_height(sig_text_height);
+        let sig_text_area = sig_text_area.inner(&margin).intersection(surface.area);
         let sig_text_para = Paragraph::new(sig_text).wrap(Wrap { trim: false });
-        sig_text_para.render(sig_text_area.inner(&margin), surface);
+        sig_text_para.render(sig_text_area, surface);
 
         if self.signature_doc.is_none() {
             return;

From 576c34f84e87f8eb1787d0b6b0940b19e965483b Mon Sep 17 00:00:00 2001
From: nuid32 <91177333+nuid32@users.noreply.github.com>
Date: Mon, 3 Oct 2022 19:56:43 +0500
Subject: [PATCH 203/884] Add command names to command palette (#4071)

---
 helix-term/src/commands.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index fc5c2063..3768ca3f 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2427,11 +2427,11 @@ impl ui::menu::Item for MappableCommand {
 
         match self {
             MappableCommand::Typable { doc, name, .. } => match keymap.get(name as &String) {
-                Some(bindings) => format!("{} ({})", doc, fmt_binding(bindings)).into(),
+                Some(bindings) => format!("{} ({}) [{}]", doc, fmt_binding(bindings), name).into(),
                 None => doc.as_str().into(),
             },
             MappableCommand::Static { doc, name, .. } => match keymap.get(*name) {
-                Some(bindings) => format!("{} ({})", doc, fmt_binding(bindings)).into(),
+                Some(bindings) => format!("{} ({}) [{}]", doc, fmt_binding(bindings), name).into(),
                 None => (*doc).into(),
             },
         }

From 4a3b776b78c68f21017b1900eafb7fefeadeefa8 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 3 Oct 2022 09:56:50 -0500
Subject: [PATCH 204/884] rust: Highlight function signatures as functions
 (#4073)

This stanza highlights functions within trait definitions. For example,
in:

    pub trait Widget {
        fn render(self, area: Rect, buf: &mut Buffer);
    }

`render` is currently highlighted as a variable. With this change it's
highlighted as a function.
---
 runtime/queries/rust/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm
index 7d0afcde..81f05f7a 100644
--- a/runtime/queries/rust/highlights.scm
+++ b/runtime/queries/rust/highlights.scm
@@ -253,6 +253,9 @@
 (function_item
   name: (identifier) @function)
 
+(function_signature_item
+  name: (identifier) @function)
+
 ; ---
 ; Macros
 ; ---

From 66bbba90242e499d7178d4beae1054019067d1c9 Mon Sep 17 00:00:00 2001
From: Ivan Tham <pickfire@riseup.net>
Date: Mon, 3 Oct 2022 23:02:14 +0800
Subject: [PATCH 205/884] Select inserted space after join (#3549)

* Select inserted space after join

* Split join_selections with space selection to A-J

Kakoune does that too and some users may still want to retain their selections.

* Update join_selections docs
---
 book/src/keymap.md               |  1 +
 helix-term/src/commands.rs       | 29 +++++++++++++++++++++++++----
 helix-term/src/keymap/default.rs |  1 +
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 6d90d802..a47f20f3 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -129,6 +129,7 @@
 | `X`                   | Extend selection to line bounds (line-wise selection)             | `extend_to_line_bounds`              |
 | `Alt-x`               | Shrink selection to line bounds (line-wise selection)             | `shrink_to_line_bounds`              |
 | `J`                   | Join lines inside selection                                       | `join_selections`                    |
+| `A-J`                 | Join lines inside selection and select space                      | `join_selections_space`              |
 | `K`                   | Keep selections matching the regex                                | `keep_selections`                    |
 | `Alt-K`               | Remove selections matching the regex                              | `remove_selections`                  |
 | `Ctrl-c`              | Comment/uncomment the selections                                  | `toggle_comments`                    |
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 3768ca3f..470abe8e 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -346,6 +346,7 @@ impl MappableCommand {
         unindent, "Unindent selection",
         format_selections, "Format selection",
         join_selections, "Join lines inside selection",
+        join_selections_space, "Join lines inside selection and select spaces",
         keep_selections, "Keep selections matching regex",
         remove_selections, "Remove selections matching regex",
         align_selections, "Align selections in column",
@@ -3731,7 +3732,7 @@ fn format_selections(cx: &mut Context) {
     }
 }
 
-fn join_selections(cx: &mut Context) {
+fn join_selections_inner(cx: &mut Context, select_space: bool) {
     use movement::skip_while;
     let (view, doc) = current!(cx.editor);
     let text = doc.text();
@@ -3766,9 +3767,21 @@ fn join_selections(cx: &mut Context) {
     // TODO: joining multiple empty lines should be replaced by a single space.
     // need to merge change ranges that touch
 
-    let transaction = Transaction::change(doc.text(), changes.into_iter());
-    // TODO: select inserted spaces
-    // .with_selection(selection);
+    // select inserted spaces
+    let transaction = if select_space {
+        let ranges: SmallVec<_> = changes
+            .iter()
+            .scan(0, |offset, change| {
+                let range = Range::point(change.0 - *offset);
+                *offset += change.1 - change.0 - 1; // -1 because cursor is 0-sized
+                Some(range)
+            })
+            .collect();
+        let selection = Selection::new(ranges, 0);
+        Transaction::change(doc.text(), changes.into_iter()).with_selection(selection)
+    } else {
+        Transaction::change(doc.text(), changes.into_iter())
+    };
 
     doc.apply(&transaction, view.id);
 }
@@ -3797,6 +3810,14 @@ fn keep_or_remove_selections_impl(cx: &mut Context, remove: bool) {
     )
 }
 
+fn join_selections(cx: &mut Context) {
+    join_selections_inner(cx, false)
+}
+
+fn join_selections_space(cx: &mut Context) {
+    join_selections_inner(cx, true)
+}
+
 fn keep_selections(cx: &mut Context) {
     keep_or_remove_selections_impl(cx, false)
 }
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index f07d4028..bad5a81a 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -144,6 +144,7 @@ pub fn default() -> HashMap<Mode, Keymap> {
         "<" => unindent,
         "=" => format_selections,
         "J" => join_selections,
+        "A-J" => join_selections_space,
         "K" => keep_selections,
         "A-K" => remove_selections,
 

From 7c9809eeb2708a9eba3c3cc48c9513e9892409f0 Mon Sep 17 00:00:00 2001
From: ath3 <45574139+ath3@users.noreply.github.com>
Date: Mon, 3 Oct 2022 17:02:49 +0200
Subject: [PATCH 206/884] Find workspace from document path (#3553)

---
 helix-lsp/src/client.rs          |  6 +++++-
 helix-lsp/src/lib.rs             | 15 ++++++++++++---
 helix-term/src/commands/typed.rs |  2 +-
 helix-view/src/editor.rs         |  2 +-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 497ce80c..0b443ccf 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -49,6 +49,7 @@ impl Client {
         root_markers: &[String],
         id: usize,
         req_timeout: u64,
+        doc_path: Option<&std::path::PathBuf>,
     ) -> Result<(Self, UnboundedReceiver<(usize, Call)>, Arc<Notify>)> {
         // Resolve path to the binary
         let cmd = which::which(cmd).map_err(|err| anyhow::anyhow!(err))?;
@@ -72,7 +73,10 @@ impl Client {
         let (server_rx, server_tx, initialize_notify) =
             Transport::start(reader, writer, stderr, id);
 
-        let root_path = find_root(None, root_markers);
+        let root_path = find_root(
+            doc_path.and_then(|x| x.parent().and_then(|x| x.to_str())),
+            root_markers,
+        );
 
         let root_uri = lsp::Url::from_file_path(root_path.clone()).ok();
 
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index 98300a62..feeedc96 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -353,6 +353,7 @@ impl Registry {
     pub fn restart(
         &mut self,
         language_config: &LanguageConfiguration,
+        doc_path: Option<&std::path::PathBuf>,
     ) -> Result<Option<Arc<Client>>> {
         let config = match &language_config.language_server {
             Some(config) => config,
@@ -367,7 +368,8 @@ impl Registry {
                 // initialize a new client
                 let id = self.counter.fetch_add(1, Ordering::Relaxed);
 
-                let NewClientResult(client, incoming) = start_client(id, language_config, config)?;
+                let NewClientResult(client, incoming) =
+                    start_client(id, language_config, config, doc_path)?;
                 self.incoming.push(UnboundedReceiverStream::new(incoming));
 
                 let (_, old_client) = entry.insert((id, client.clone()));
@@ -381,7 +383,11 @@ impl Registry {
         }
     }
 
-    pub fn get(&mut self, language_config: &LanguageConfiguration) -> Result<Option<Arc<Client>>> {
+    pub fn get(
+        &mut self,
+        language_config: &LanguageConfiguration,
+        doc_path: Option<&std::path::PathBuf>,
+    ) -> Result<Option<Arc<Client>>> {
         let config = match &language_config.language_server {
             Some(config) => config,
             None => return Ok(None),
@@ -393,7 +399,8 @@ impl Registry {
                 // initialize a new client
                 let id = self.counter.fetch_add(1, Ordering::Relaxed);
 
-                let NewClientResult(client, incoming) = start_client(id, language_config, config)?;
+                let NewClientResult(client, incoming) =
+                    start_client(id, language_config, config, doc_path)?;
                 self.incoming.push(UnboundedReceiverStream::new(incoming));
 
                 entry.insert((id, client.clone()));
@@ -493,6 +500,7 @@ fn start_client(
     id: usize,
     config: &LanguageConfiguration,
     ls_config: &LanguageServerConfiguration,
+    doc_path: Option<&std::path::PathBuf>,
 ) -> Result<NewClientResult> {
     let (client, incoming, initialize_notify) = Client::start(
         &ls_config.command,
@@ -501,6 +509,7 @@ fn start_client(
         &config.roots,
         id,
         ls_config.timeout,
+        doc_path,
     )?;
 
     let client = Arc::new(client);
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index d5a368a2..c2c37291 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1000,7 +1000,7 @@ fn lsp_restart(
         .context("LSP not defined for the current document")?;
 
     let scope = config.scope.clone();
-    cx.editor.language_servers.restart(config)?;
+    cx.editor.language_servers.restart(config, doc.path())?;
 
     // This collect is needed because refresh_language_server would need to re-borrow editor.
     let document_ids_to_refresh: Vec<DocumentId> = cx
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index f3b0e26f..e144a830 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -868,7 +868,7 @@ impl Editor {
 
         // try to find a language server based on the language name
         let language_server = doc.language.as_ref().and_then(|language| {
-            ls.get(language)
+            ls.get(language, doc.path())
                 .map_err(|e| {
                     log::error!(
                         "Failed to initialize the LSP for `{}` {{ {} }}",

From 772af7ffb1d3a4ae22505693ae803c8d852336f3 Mon Sep 17 00:00:00 2001
From: Kirawi <67773714+kirawi@users.noreply.github.com>
Date: Mon, 3 Oct 2022 11:04:19 -0400
Subject: [PATCH 207/884] remove `split-debuginfo` setting (#3691)

According to [the rustc book](https://doc.rust-lang.org/rustc/codegen-options/index.html#split-debuginfo), this is not supported on Windows. It also prevents Helix from compiling on the latest nightly.
---
 Cargo.toml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 780811f7..9e985ddc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,9 +14,6 @@ default-members = [
   "helix-term"
 ]
 
-[profile.dev]
-split-debuginfo = "unpacked"
-
 [profile.release]
 lto = "thin"
 # debug = true

From dbec057363201d6c4aa2e7258cac928e5ebb6a28 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 3 Oct 2022 10:05:08 -0500
Subject: [PATCH 208/884] Rename I/A "Insert at start/end of line" (#3753)

* keymap: Rename A "Insert at end of line"

The language for the `A` binding is potentially confusing because
`A` behaves like `i` done at the end of the line rather than `a`.
This change renames the command to match Kakoune's language[^1].

[^1]: https://github.com/mawww/kakoune/blob/021da117cf90bf25b65e3344fa8e43ab4262b714/src/normal.cc#L2229

* keymap: Rename I `insert_at_line_start`
---
 book/src/keymap.md               | 4 ++--
 helix-term/src/commands.rs       | 8 ++++----
 helix-term/src/keymap/default.rs | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index a47f20f3..905d3acb 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -68,8 +68,8 @@
 | `` Alt-` `` | Set the selected text to upper case                                  | `switch_to_uppercase`     |
 | `i`         | Insert before selection                                              | `insert_mode`             |
 | `a`         | Insert after selection (append)                                      | `append_mode`             |
-| `I`         | Insert at the start of the line                                      | `prepend_to_line`         |
-| `A`         | Insert at the end of the line                                        | `append_to_line`          |
+| `I`         | Insert at the start of the line                                      | `insert_at_line_start`    |
+| `A`         | Insert at the end of the line                                        | `insert_at_line_end`      |
 | `o`         | Open new line below selection                                        | `open_below`              |
 | `O`         | Open new line above selection                                        | `open_above`              |
 | `.`         | Repeat last insert                                                   | N/A                       |
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 470abe8e..79b62e23 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -273,8 +273,8 @@ impl MappableCommand {
         diagnostics_picker, "Open diagnostic picker",
         workspace_diagnostics_picker, "Open workspace diagnostic picker",
         last_picker, "Open last picker",
-        prepend_to_line, "Insert at start of line",
-        append_to_line, "Append to end of line",
+        insert_at_line_start, "Insert at start of line",
+        insert_at_line_end, "Insert at end of line",
         open_below, "Open new line below selection",
         open_above, "Open new line above selection",
         normal_mode, "Enter normal mode",
@@ -2483,13 +2483,13 @@ fn last_picker(cx: &mut Context) {
 }
 
 // I inserts at the first nonwhitespace character of each line with a selection
-fn prepend_to_line(cx: &mut Context) {
+fn insert_at_line_start(cx: &mut Context) {
     goto_first_nonwhitespace(cx);
     enter_insert_mode(cx);
 }
 
 // A inserts at the end of each line with a selection
-fn append_to_line(cx: &mut Context) {
+fn insert_at_line_end(cx: &mut Context) {
     enter_insert_mode(cx);
     let (view, doc) = current!(cx.editor);
 
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index bad5a81a..4da609ec 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -59,9 +59,9 @@ pub fn default() -> HashMap<Mode, Keymap> {
         ":" => command_mode,
 
         "i" => insert_mode,
-        "I" => prepend_to_line,
+        "I" => insert_at_line_start,
         "a" => append_mode,
-        "A" => append_to_line,
+        "A" => insert_at_line_end,
         "o" => open_below,
         "O" => open_above,
 

From 6764744ce9912a1f48502bf5ee025283e12fded5 Mon Sep 17 00:00:00 2001
From: Robin <robin@robinjint.nl>
Date: Mon, 3 Oct 2022 17:07:04 +0200
Subject: [PATCH 209/884] Add option to skip the first indent guide (#3819)

* Add option to skip the first indent guide

* reorder skip_first option

* change indent-guides.skip_first to a number

* rename skip -> skip_levels

* add skip_levels to the book

* Update book/src/configuration.md

Co-authored-by: A-Walrus <58790821+A-Walrus@users.noreply.github.com>

* Update helix-term/src/ui/editor.rs

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

Co-authored-by: Robin <robinvandijk@klippa.com>
Co-authored-by: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/configuration.md   | 10 ++++++----
 helix-term/src/ui/editor.rs |  3 ++-
 helix-view/src/editor.rs    |  4 +++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 039d181c..276bd7d4 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -233,10 +233,11 @@ tabpad = "·" # Tabs will look like "→···" (depending on tab width)
 
 Options for rendering vertical indent guides.
 
-| Key         | Description                                             | Default |
-| ---         | ---                                                     | ---     |
-| `render`    | Whether to render indent guides.                        | `false` |
-| `character` | Literal character to use for rendering the indent guide | `│`     |
+| Key           | Description                                             | Default |
+| ---           | ---                                                     | ---     |
+| `render`      | Whether to render indent guides.                        | `false` |
+| `character`   | Literal character to use for rendering the indent guide | `│`     |
+| `skip-levels` | Number of indent levels to skip                         | `0`     |
 
 Example:
 
@@ -244,4 +245,5 @@ Example:
 [editor.indent-guides]
 render = true
 character = "╎"
+skip-levels = 1
 ```
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 0269d804..e5dc3c95 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -436,7 +436,8 @@ impl EditorView {
                 return;
             }
 
-            let starting_indent = (offset.col / tab_width) as u16;
+            let starting_indent =
+                (offset.col / tab_width) as u16 + config.indent_guides.skip_levels;
             // TODO: limit to a max indent level too. It doesn't cause visual artifacts but it would avoid some
             // extra loops if the code is deeply nested.
 
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index e144a830..f21244a9 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -552,15 +552,17 @@ impl Default for WhitespaceCharacters {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(default)]
+#[serde(default, rename_all = "kebab-case")]
 pub struct IndentGuidesConfig {
     pub render: bool,
     pub character: char,
+    pub skip_levels: u16,
 }
 
 impl Default for IndentGuidesConfig {
     fn default() -> Self {
         Self {
+            skip_levels: 0,
             render: false,
             character: '│',
         }

From 1d8bb2249b7153b2e9d3591534bdca32176c9975 Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Mon, 3 Oct 2022 18:07:21 +0300
Subject: [PATCH 210/884] Change focus to modified docs on quit (#3872)

* Change focus to modified docs on quit

When quitting with modified documents, automatically switch focus to
one of them.

* Update helix-term/src/commands/typed.rs

Co-authored-by: Poliorcetics <poliorcetics@users.noreply.github.com>

* Make it work with buffer-close-all and the like

* Cleanup

Use Cow instead of String, and rename DoesntExist -> DoesNotExist

Co-authored-by: Poliorcetics <poliorcetics@users.noreply.github.com>
---
 helix-term/src/commands/typed.rs | 54 +++++++++++++++++++++++---------
 helix-view/src/document.rs       |  7 +++++
 helix-view/src/editor.rs         | 23 ++++++++------
 3 files changed, 59 insertions(+), 25 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index c2c37291..96ff75c5 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -2,7 +2,7 @@ use std::ops::Deref;
 
 use super::*;
 
-use helix_view::editor::{Action, ConfigEvent};
+use helix_view::editor::{Action, CloseError, ConfigEvent};
 use ui::completers::{self, Completer};
 
 #[derive(Clone)]
@@ -71,8 +71,29 @@ fn buffer_close_by_ids_impl(
     doc_ids: &[DocumentId],
     force: bool,
 ) -> anyhow::Result<()> {
-    for &doc_id in doc_ids {
-        editor.close_document(doc_id, force)?;
+    let (modified_ids, modified_names): (Vec<_>, Vec<_>) = doc_ids
+        .iter()
+        .filter_map(|&doc_id| {
+            if let Err(CloseError::BufferModified(name)) = editor.close_document(doc_id, force) {
+                Some((doc_id, name))
+            } else {
+                None
+            }
+        })
+        .unzip();
+
+    if let Some(first) = modified_ids.first() {
+        let current = doc!(editor);
+        // If the current document is unmodified, and there are modified
+        // documents, switch focus to the first modified doc.
+        if !modified_ids.contains(&current.id()) {
+            editor.switch(*first, Action::Replace);
+        }
+        bail!(
+            "{} unsaved buffer(s) remaining: {:?}",
+            modified_names.len(),
+            modified_names
+        );
     }
 
     Ok(())
@@ -513,23 +534,26 @@ fn force_write_quit(
     force_quit(cx, &[], event)
 }
 
-/// Results an error if there are modified buffers remaining and sets editor error,
-/// otherwise returns `Ok(())`
+/// Results in an error if there are modified buffers remaining and sets editor
+/// error, otherwise returns `Ok(())`. If the current document is unmodified,
+/// and there are modified documents, switches focus to one of them.
 pub(super) fn buffers_remaining_impl(editor: &mut Editor) -> anyhow::Result<()> {
-    let modified: Vec<_> = editor
+    let (modified_ids, modified_names): (Vec<_>, Vec<_>) = editor
         .documents()
         .filter(|doc| doc.is_modified())
-        .map(|doc| {
-            doc.relative_path()
-                .map(|path| path.to_string_lossy().to_string())
-                .unwrap_or_else(|| SCRATCH_BUFFER_NAME.into())
-        })
-        .collect();
-    if !modified.is_empty() {
+        .map(|doc| (doc.id(), doc.display_name()))
+        .unzip();
+    if let Some(first) = modified_ids.first() {
+        let current = doc!(editor);
+        // If the current document is unmodified, and there are modified
+        // documents, switch focus to the first modified doc.
+        if !modified_ids.contains(&current.id()) {
+            editor.switch(*first, Action::Replace);
+        }
         bail!(
             "{} unsaved buffer(s) remaining: {:?}",
-            modified.len(),
-            modified
+            modified_names.len(),
+            modified_names
         );
     }
     Ok(())
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 2ef99c6a..b6b2f664 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -5,6 +5,7 @@ use helix_core::auto_pairs::AutoPairs;
 use helix_core::Range;
 use serde::de::{self, Deserialize, Deserializer};
 use serde::Serialize;
+use std::borrow::Cow;
 use std::cell::Cell;
 use std::collections::HashMap;
 use std::fmt::Display;
@@ -1038,6 +1039,12 @@ impl Document {
             .map(helix_core::path::get_relative_path)
     }
 
+    pub fn display_name(&self) -> Cow<'static, str> {
+        self.relative_path()
+            .map(|path| path.to_string_lossy().to_string().into())
+            .unwrap_or_else(|| SCRATCH_BUFFER_NAME.into())
+    }
+
     // transact(Fn) ?
 
     // -- LSP methods
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index f21244a9..89759439 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1,6 +1,6 @@
 use crate::{
     clipboard::{get_clipboard_provider, ClipboardProvider},
-    document::{Mode, SCRATCH_BUFFER_NAME},
+    document::Mode,
     graphics::{CursorKind, Rect},
     info::Info,
     input::KeyEvent,
@@ -28,7 +28,7 @@ use tokio::{
     time::{sleep, Duration, Instant, Sleep},
 };
 
-use anyhow::{bail, Error};
+use anyhow::Error;
 
 pub use helix_core::diagnostic::Severity;
 pub use helix_core::register::Registers;
@@ -711,6 +711,14 @@ pub enum Action {
     VerticalSplit,
 }
 
+/// Error thrown on failed document closed
+pub enum CloseError {
+    /// Document doesn't exist
+    DoesNotExist,
+    /// Buffer is modified
+    BufferModified(String),
+}
+
 impl Editor {
     pub fn new(
         mut area: Rect,
@@ -1070,19 +1078,14 @@ impl Editor {
         self._refresh();
     }
 
-    pub fn close_document(&mut self, doc_id: DocumentId, force: bool) -> anyhow::Result<()> {
+    pub fn close_document(&mut self, doc_id: DocumentId, force: bool) -> Result<(), CloseError> {
         let doc = match self.documents.get(&doc_id) {
             Some(doc) => doc,
-            None => bail!("document does not exist"),
+            None => return Err(CloseError::DoesNotExist),
         };
 
         if !force && doc.is_modified() {
-            bail!(
-                "buffer {:?} is modified",
-                doc.relative_path()
-                    .map(|path| path.to_string_lossy().to_string())
-                    .unwrap_or_else(|| SCRATCH_BUFFER_NAME.into())
-            );
+            return Err(CloseError::BufferModified(doc.display_name().into_owned()));
         }
 
         if let Some(language_server) = doc.language_server() {

From 3d59d3f8be214ddb5b75d6a9df5f0ea1fff5f31c Mon Sep 17 00:00:00 2001
From: Ivan Tham <pickfire@riseup.net>
Date: Mon, 3 Oct 2022 23:08:15 +0800
Subject: [PATCH 211/884] Keep arrow and special keys in insert (#3915)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Keep arrow and special keys in insert

Advanced users won't need it and is useful for beginners.
Revert part of #3671.

* Change text for insert mode section

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>

* Remove ctrl-up/down in insert

* Reorganize insert keys and docs

* Improve page up experience on last tutor

The last tutor page can page down multiple times and it will break the
heading on the 80x24 screen paging when reaching the last page, this
keeps the style the same and make sure page up and down won't break it.

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
---
 book/src/keymap.md               | 68 +++++++++++++-------------------
 helix-term/src/keymap/default.rs | 31 ++++++++-------
 runtime/tutor                    | 18 +++++++++
 3 files changed, 63 insertions(+), 54 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 905d3acb..66602233 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -314,7 +314,7 @@ Mappings in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaire
 | `[space` | Add newline above                            | `add_newline_above`   |
 | `]space` | Add newline below                            | `add_newline_below`   |
 
-## Insert Mode
+## Insert mode
 
 Insert mode bindings are somewhat minimal by default. Helix is designed to
 be a modal editor, and this is reflected in the user experience and internal
@@ -323,45 +323,33 @@ escaping from insert mode to normal mode. For this reason, new users are
 strongly encouraged to learn the modal editing paradigm to get the smoothest
 experience.
 
-| Key                                         | Description                 | Command                 |
-| -----                                       | -----------                 | -------                 |
-| `Escape`                                    | Switch to normal mode       | `normal_mode`           |
-| `Ctrl-x`                                    | Autocomplete                | `completion`            |
-| `Ctrl-r`                                    | Insert a register content   | `insert_register`       |
-| `Ctrl-w`, `Alt-Backspace`, `Ctrl-Backspace` | Delete previous word        | `delete_word_backward`  |
-| `Alt-d`, `Alt-Delete`, `Ctrl-Delete`        | Delete next word            | `delete_word_forward`   |
-| `Ctrl-u`                                    | Delete to start of line     | `kill_to_line_start`    |
-| `Ctrl-k`                                    | Delete to end of line       | `kill_to_line_end`      |
-| `Ctrl-j`, `Enter`                           | Insert new line             | `insert_newline`        |
-| `Backspace`, `Ctrl-h`                       | Delete previous char        | `delete_char_backward`  |
-| `Delete`, `Ctrl-d`                          | Delete next char            | `delete_char_forward`   |
-
-However, if you really want navigation in insert mode, this is supported. An
-example config that gives the ability to use arrow keys while still in insert
-mode:
-
-```toml
-[keys.insert]
-"up" = "move_line_up"
-"down" = "move_line_down"
-"left" = "move_char_left"
-"right" = "move_char_right"
-"C-b" = "move_char_left"
-"C-f" = "move_char_right"
-"A-b" = "move_prev_word_end"
-"C-left" = "move_prev_word_end"
-"A-f" = "move_next_word_start"
-"C-right" = "move_next_word_start"
-"A-<" = "goto_file_start"
-"A->" = "goto_file_end"
-"pageup" = "page_up"
-"pagedown" = "page_down"
-"home" = "goto_line_start"
-"C-a" = "goto_line_start"
-"end" = "goto_line_end_newline"
-"C-e" = "goto_line_end_newline"
-"A-left" = "goto_line_start"
-```
+| Key                                         | Description                 | Command                  |
+| -----                                       | -----------                 | -------                  |
+| `Escape`                                    | Switch to normal mode       | `normal_mode`            |
+| `Ctrl-s`                                    | Commit undo checkpoint      | `commit_undo_checkpoint` |
+| `Ctrl-x`                                    | Autocomplete                | `completion`             |
+| `Ctrl-r`                                    | Insert a register content   | `insert_register`        |
+| `Ctrl-w`, `Alt-Backspace`                   | Delete previous word        | `delete_word_backward`   |
+| `Alt-d`, `Alt-Delete`                       | Delete next word            | `delete_word_forward`    |
+| `Ctrl-u`                                    | Delete to start of line     | `kill_to_line_start`     |
+| `Ctrl-k`                                    | Delete to end of line       | `kill_to_line_end`       |
+| `Ctrl-h`, `Backspace`                       | Delete previous char        | `delete_char_backward`   |
+| `Ctrl-d`, `Delete`                          | Delete next char            | `delete_char_forward`    |
+| `Ctrl-j`, `Enter`                           | Insert new line             | `insert_newline`         |
+
+These keys are not recommended, but are included for new users less familiar
+with modal editors.
+
+| Key                                         | Description                 | Command                  |
+| -----                                       | -----------                 | -------                  |
+| `Up`                                        | Move to previous line       | `move_line_up`           |
+| `Down`                                      | Move to next line           | `move_line_down`         |
+| `Left`                                      | Backward a char             | `move_char_left`         |
+| `Right`                                     | Forward a char              | `move_char_right`        |
+| `PageUp`                                    | Move one page up            | `page_up`                |
+| `PageDown`                                  | Move one page down          | `page_down`              |
+| `Home`                                      | Move to line start          | `goto_line_start`        |
+| `End`                                       | Move to line end            | `goto_line_end_newline`  |
 
 ## Select / extend mode
 
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index 4da609ec..6c327ee6 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -343,24 +343,27 @@ pub fn default() -> HashMap<Mode, Keymap> {
     let insert = keymap!({ "Insert mode"
         "esc" => normal_mode,
 
-        "backspace" => delete_char_backward,
-        "C-h" => delete_char_backward,
-        "del" => delete_char_forward,
-        "C-d" => delete_char_forward,
-        "ret" => insert_newline,
-        "C-j" => insert_newline,
-        "tab" => insert_tab,
-        "C-w" => delete_word_backward,
-        "A-backspace" => delete_word_backward,
-        "A-d" => delete_word_forward,
-        "A-del" => delete_word_forward,
         "C-s" => commit_undo_checkpoint,
+        "C-x" => completion,
+        "C-r" => insert_register,
 
-        "C-k" => kill_to_line_end,
+        "C-w" | "A-backspace" => delete_word_backward,
+        "A-d" | "A-del" => delete_word_forward,
         "C-u" => kill_to_line_start,
+        "C-k" => kill_to_line_end,
+        "C-h" | "backspace" => delete_char_backward,
+        "C-d" | "del" => delete_char_forward,
+        "C-j" | "ret" => insert_newline,
+        "tab" => insert_tab,
 
-        "C-x" => completion,
-        "C-r" => insert_register,
+        "up" => move_line_up,
+        "down" => move_line_down,
+        "left" => move_char_left,
+        "right" => move_char_right,
+        "pageup" => page_up,
+        "pagedown" => page_down,
+        "home" => goto_line_start,
+        "end" => goto_line_end_newline,
     });
     hashmap!(
         Mode::Normal => Keymap::new(normal),
diff --git a/runtime/tutor b/runtime/tutor
index 8eef33af..7133c489 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -1054,6 +1054,24 @@ letters! that is not good grammar. you can fix this.
 
 
 
+=================================================================
+=                                                               =
+=================================================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 =================================================================
  This tutorial is still a work-in-progress.
  More sections are planned.

From 9124c231f426318e970c62647c1ddabed3c9a389 Mon Sep 17 00:00:00 2001
From: Karsten Gebbert <k@ioctl.it>
Date: Mon, 3 Oct 2022 17:08:32 +0200
Subject: [PATCH 212/884] respond to SIGUSR1 by reloading config (#3952)

* respond to SIGUSR1 by reloading config

* document USR1 signal handling
---
 book/src/configuration.md     | 4 ++++
 helix-term/src/application.rs | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 276bd7d4..a5092b9d 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -28,6 +28,10 @@ hidden = false
 You may also specify a file to use for configuration with the `-c` or
 `--config` CLI argument: `hx -c path/to/custom-config.toml`.
 
+It is also possible to trigger configuration file reloading by sending the `USR1`
+signal to the helix process, e.g. via `pkill -USR1 hx`. This is only supported 
+on unix operating systems.
+
 ## Editor
 
 ### `[editor]` Section
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index cd499f1c..ee0e08ef 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -224,8 +224,8 @@ impl Application {
         #[cfg(windows)]
         let signals = futures_util::stream::empty();
         #[cfg(not(windows))]
-        let signals =
-            Signals::new(&[signal::SIGTSTP, signal::SIGCONT]).context("build signal handler")?;
+        let signals = Signals::new(&[signal::SIGTSTP, signal::SIGCONT, signal::SIGUSR1])
+            .context("build signal handler")?;
 
         let app = Self {
             compositor,
@@ -426,6 +426,10 @@ impl Application {
                 self.compositor.load_cursor();
                 self.render();
             }
+            signal::SIGUSR1 => {
+                self.refresh_config();
+                self.render();
+            }
             _ => unreachable!(),
         }
     }

From 6cca7375ec1965e61c791bbe738c617ea43c6dce Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 3 Oct 2022 10:14:57 -0500
Subject: [PATCH 213/884] Automatically track pseudo-pending text (#4077)

This change automatically tracks pending text for for commands which use
on-next-key callbacks. For example, `t` will await the next key event
and "t" will be shown in the bottom right-hand corner to show that we're
in a pending state.

Previously, the text for these on-next-key commands needed to be
hard-coded into the command definition which had some drawbacks:

* It was easy to forget to write and clear the pending text.
* If a command was remapped in a custom config, the pending text would
  still show the old key.

With this change, pending text is automatically tracked based on the
key events that lead to the command being executed. This works even
when the command is remapped in config and when the on-next-key
callback is nested under some key sequence (for example `mi`).
---
 helix-term/src/commands.rs  | 78 ++++++++++++++++---------------------
 helix-term/src/ui/editor.rs | 12 +++++-
 helix-view/src/editor.rs    |  2 -
 3 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 79b62e23..2563880b 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1091,27 +1091,18 @@ fn extend_next_long_word_end(cx: &mut Context) {
     extend_word_impl(cx, movement::move_next_long_word_end)
 }
 
-fn will_find_char<F>(
-    cx: &mut Context,
-    search_fn: F,
-    inclusive: bool,
-    extend: bool,
-    pseudo_pending: &str,
-) where
+fn will_find_char<F>(cx: &mut Context, search_fn: F, inclusive: bool, extend: bool)
+where
     F: Fn(RopeSlice, char, usize, usize, bool) -> Option<usize> + 'static,
 {
     // TODO: count is reset to 1 before next key so we move it into the closure here.
     // Would be nice to carry over.
     let count = cx.count();
 
-    cx.editor.pseudo_pending = Some(pseudo_pending.to_string());
-
     // need to wait for next key
     // TODO: should this be done by grapheme rather than char?  For example,
     // we can't properly handle the line-ending CRLF case here in terms of char.
     cx.on_next_key(move |cx, event| {
-        cx.editor.pseudo_pending = None;
-
         let ch = match event {
             KeyEvent {
                 code: KeyCode::Enter,
@@ -1214,35 +1205,35 @@ fn find_prev_char_impl(
 }
 
 fn find_till_char(cx: &mut Context) {
-    will_find_char(cx, find_next_char_impl, false, false, "t")
+    will_find_char(cx, find_next_char_impl, false, false)
 }
 
 fn find_next_char(cx: &mut Context) {
-    will_find_char(cx, find_next_char_impl, true, false, "f")
+    will_find_char(cx, find_next_char_impl, true, false)
 }
 
 fn extend_till_char(cx: &mut Context) {
-    will_find_char(cx, find_next_char_impl, false, true, "t")
+    will_find_char(cx, find_next_char_impl, false, true)
 }
 
 fn extend_next_char(cx: &mut Context) {
-    will_find_char(cx, find_next_char_impl, true, true, "f")
+    will_find_char(cx, find_next_char_impl, true, true)
 }
 
 fn till_prev_char(cx: &mut Context) {
-    will_find_char(cx, find_prev_char_impl, false, false, "T")
+    will_find_char(cx, find_prev_char_impl, false, false)
 }
 
 fn find_prev_char(cx: &mut Context) {
-    will_find_char(cx, find_prev_char_impl, true, false, "F")
+    will_find_char(cx, find_prev_char_impl, true, false)
 }
 
 fn extend_till_prev_char(cx: &mut Context) {
-    will_find_char(cx, find_prev_char_impl, false, true, "T")
+    will_find_char(cx, find_prev_char_impl, false, true)
 }
 
 fn extend_prev_char(cx: &mut Context) {
-    will_find_char(cx, find_prev_char_impl, true, true, "F")
+    will_find_char(cx, find_prev_char_impl, true, true)
 }
 
 fn repeat_last_motion(cx: &mut Context) {
@@ -4392,7 +4383,6 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
 
     cx.on_next_key(move |cx, event| {
         cx.editor.autoinfo = None;
-        cx.editor.pseudo_pending = None;
         if let Some(ch) = event.char() {
             let textobject = move |editor: &mut Editor| {
                 let (view, doc) = current!(editor);
@@ -4441,33 +4431,31 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
         }
     });
 
-    if let Some((title, abbrev)) = match objtype {
-        textobject::TextObject::Inside => Some(("Match inside", "mi")),
-        textobject::TextObject::Around => Some(("Match around", "ma")),
+    let title = match objtype {
+        textobject::TextObject::Inside => "Match inside",
+        textobject::TextObject::Around => "Match around",
         _ => return,
-    } {
-        let help_text = [
-            ("w", "Word"),
-            ("W", "WORD"),
-            ("p", "Paragraph"),
-            ("c", "Class (tree-sitter)"),
-            ("f", "Function (tree-sitter)"),
-            ("a", "Argument/parameter (tree-sitter)"),
-            ("o", "Comment (tree-sitter)"),
-            ("t", "Test (tree-sitter)"),
-            ("m", "Closest surrounding pair to cursor"),
-            (" ", "... or any character acting as a pair"),
-        ];
-
-        cx.editor.autoinfo = Some(Info::new(
-            title,
-            help_text
-                .into_iter()
-                .map(|(col1, col2)| (col1.to_string(), col2.to_string()))
-                .collect(),
-        ));
-        cx.editor.pseudo_pending = Some(abbrev.to_string());
     };
+    let help_text = [
+        ("w", "Word"),
+        ("W", "WORD"),
+        ("p", "Paragraph"),
+        ("c", "Class (tree-sitter)"),
+        ("f", "Function (tree-sitter)"),
+        ("a", "Argument/parameter (tree-sitter)"),
+        ("o", "Comment (tree-sitter)"),
+        ("t", "Test (tree-sitter)"),
+        ("m", "Closest surrounding pair to cursor"),
+        (" ", "... or any character acting as a pair"),
+    ];
+
+    cx.editor.autoinfo = Some(Info::new(
+        title,
+        help_text
+            .into_iter()
+            .map(|(col1, col2)| (col1.to_string(), col2.to_string()))
+            .collect(),
+    ));
 }
 
 fn surround_add(cx: &mut Context) {
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index e5dc3c95..97639ff2 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -33,6 +33,7 @@ use super::statusline;
 pub struct EditorView {
     pub keymaps: Keymaps,
     on_next_key: Option<Box<dyn FnOnce(&mut commands::Context, KeyEvent)>>,
+    pseudo_pending: Vec<KeyEvent>,
     last_insert: (commands::MappableCommand, Vec<InsertEvent>),
     pub(crate) completion: Option<Completion>,
     spinners: ProgressSpinners,
@@ -56,6 +57,7 @@ impl EditorView {
         Self {
             keymaps,
             on_next_key: None,
+            pseudo_pending: Vec::new(),
             last_insert: (commands::MappableCommand::normal_mode, Vec::new()),
             completion: None,
             spinners: ProgressSpinners::default(),
@@ -839,6 +841,7 @@ impl EditorView {
         event: KeyEvent,
     ) -> Option<KeymapResult> {
         let mut last_mode = mode;
+        self.pseudo_pending.extend(self.keymaps.pending());
         let key_result = self.keymaps.get(mode, event);
         cxt.editor.autoinfo = self.keymaps.sticky().map(|node| node.infobox());
 
@@ -1316,6 +1319,11 @@ impl Component for EditorView {
                 }
 
                 self.on_next_key = cx.on_next_key_callback.take();
+                match self.on_next_key {
+                    Some(_) => self.pseudo_pending.push(key),
+                    None => self.pseudo_pending.clear(),
+                }
+
                 // appease borrowck
                 let callback = cx.callback.take();
 
@@ -1416,8 +1424,8 @@ impl Component for EditorView {
             for key in self.keymaps.pending() {
                 disp.push_str(&key.key_sequence_format());
             }
-            if let Some(pseudo_pending) = &cx.editor.pseudo_pending {
-                disp.push_str(pseudo_pending.as_str())
+            for key in &self.pseudo_pending {
+                disp.push_str(&key.key_sequence_format());
             }
             let style = cx.editor.theme.get("ui.text");
             let macro_width = if cx.editor.macro_recording.is_some() {
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 89759439..d09d0ac3 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -677,7 +677,6 @@ pub struct Editor {
 
     pub idle_timer: Pin<Box<Sleep>>,
     pub last_motion: Option<Motion>,
-    pub pseudo_pending: Option<String>,
 
     pub last_completion: Option<CompleteAction>,
 
@@ -758,7 +757,6 @@ impl Editor {
             idle_timer: Box::pin(sleep(conf.idle_timeout)),
             last_motion: None,
             last_completion: None,
-            pseudo_pending: None,
             config,
             auto_pairs,
             exit_code: 0,

From 27b70696df78430c5596cb7681be496ac305ec05 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Mon, 3 Oct 2022 11:35:42 -0400
Subject: [PATCH 214/884] Exit gracefully when close operation fails (#4081)

If the close method fails, the editor will quit before restoring the
terminal. This causes the shell to break if, e.g. the LS times out
shutting down.

This fixes this by always restoring the terminal after closing, and
printing out a message to stderr if there is an error.
---
 helix-term/src/application.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index ee0e08ef..c7d98fce 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -870,9 +870,16 @@ impl Application {
         }));
 
         self.event_loop(input_stream).await;
-        self.close().await?;
+
+        let err = self.close().await.err();
+
         restore_term()?;
 
+        if let Some(err) = err {
+            self.editor.exit_code = 1;
+            eprintln!("Error: {}", err);
+        }
+
         Ok(self.editor.exit_code)
     }
 

From 7c33b9c76d2e6c336480530e5e8e8184153c29da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 18:38:24 -0500
Subject: [PATCH 215/884] build(deps): bump smallvec from 1.9.0 to 1.10.0
 (#4093)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 4 ++--
 helix-core/Cargo.toml | 2 +-
 helix-term/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6537543a..c7bd0b68 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1025,9 +1025,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
 
 [[package]]
 name = "smartstring"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index ba6901ba..d7ab89ba 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -18,7 +18,7 @@ integration = []
 helix-loader = { version = "0.6", path = "../helix-loader" }
 
 ropey = { version = "1.5", default-features = false, features = ["simd"] }
-smallvec = "1.9"
+smallvec = "1.10"
 smartstring = "1.0.1"
 unicode-segmentation = "1.10"
 unicode-width = "0.1"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index ac50b610..30de5589 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -74,6 +74,6 @@ signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
 helix-loader = { version = "0.6", path = "../helix-loader" }
 
 [dev-dependencies]
-smallvec = "1.9"
+smallvec = "1.10"
 indoc = "1.0.6"
 tempfile = "3.3.0"

From 6b0fffb64700046d118ca5f546b2cbea75bdc3d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 18:38:43 -0500
Subject: [PATCH 216/884] build(deps): bump tokio from 1.21.1 to 1.21.2 (#4094)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c7bd0b68..ed7a3d04 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1165,9 +1165,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.21.1"
+version = "1.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0020c875007ad96677dcc890298f4b942882c5d4eb7cc8f439fc3bf813dc9c95"
+checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099"
 dependencies = [
  "autocfg",
  "bytes",
@@ -1175,7 +1175,6 @@ dependencies = [
  "memchr",
  "mio",
  "num_cpus",
- "once_cell",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",

From 581fe5c6754f7af4ad53f65227428bbbcd31be3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 18:38:56 -0500
Subject: [PATCH 217/884] build(deps): bump thiserror from 1.0.36 to 1.0.37
 (#4095)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ed7a3d04..45eb9023 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1112,18 +1112,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a99cb8c4b9a8ef0e7907cd3b617cc8dc04d571c4e73c8ae403d80ac160bb122"
+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a891860d3c8d66fec8e73ddb3765f90082374dbaaa833407b904a94f1a7eb43"
+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
 dependencies = [
  "proc-macro2",
  "quote",

From ed5febf4b35071b988f8999f841e05f1f26e8811 Mon Sep 17 00:00:00 2001
From: Poliorcetics <poliorcetics@users.noreply.github.com>
Date: Tue, 4 Oct 2022 16:40:51 +0200
Subject: [PATCH 218/884] doc: add example to disable arrow keys in insert mode
 (#4088)

---
 book/src/keymap.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 66602233..85110634 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -351,6 +351,21 @@ with modal editors.
 | `Home`                                      | Move to line start          | `goto_line_start`        |
 | `End`                                       | Move to line end            | `goto_line_end_newline`  |
 
+If you want to disable them in insert mode as you become more comfortable with modal editing, you can use
+the following in your `config.toml`:
+
+```toml
+[keys.insert]
+up = "no_op"
+down = "no_op"
+left = "no_op"
+right = "no_op"
+pageup = "no_op"
+pagedown = "no_op"
+home = "no_op"
+end = "no_op"
+```
+
 ## Select / extend mode
 
 This mode echoes Normal mode, but changes any movements to extend

From ccb38e76962cb4dad1ca293b7dca07c90d5e0768 Mon Sep 17 00:00:00 2001
From: Jaden <thejadenjack@gmail.com>
Date: Tue, 4 Oct 2022 14:33:45 -0700
Subject: [PATCH 219/884] doc: add theme inheritance example (#4096)

---
 book/src/themes.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/book/src/themes.md b/book/src/themes.md
index b92b6d7b..4cded68f 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -89,6 +89,21 @@ Less common modifiers might not be supported by your terminal emulator.
 | `hidden`       |
 | `crossed_out`  |
 
+### Inheritance
+
+Extend upon other themes by setting the `inherits` property to an existing theme.
+
+```toml
+inherits = "boo_berry"
+
+# Override the theming for "keyword"s:
+"keyword" = { fg = "gold" }
+
+# Override colors in the palette:
+[palette]
+berry = "#2A2A4D"
+```
+
 ### Scopes
 
 The following is a list of scopes available to use for styling.

From c927d61791968eebe1e6988d92d212b1662c66c0 Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Wed, 5 Oct 2022 00:49:43 +0300
Subject: [PATCH 220/884] Fix bugs in search wraparound message (#4101)

---
 helix-term/src/commands.rs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 2563880b..2db5bfcf 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1561,6 +1561,7 @@ fn split_selection_on_newline(cx: &mut Context) {
     doc.set_selection(view.id, selection);
 }
 
+#[allow(clippy::too_many_arguments)]
 fn search_impl(
     editor: &mut Editor,
     contents: &str,
@@ -1569,6 +1570,7 @@ fn search_impl(
     direction: Direction,
     scrolloff: usize,
     wrap_around: bool,
+    show_warnings: bool,
 ) {
     let (view, doc) = current!(editor);
     let text = doc.text().slice(..);
@@ -1609,9 +1611,13 @@ fn search_impl(
                     regex.find_iter(&contents[start..]).last()
                 }
             };
-            editor.set_status("Wrapped around document");
-        } else {
-            editor.set_error("No more matches");
+        }
+        if show_warnings {
+            if wrap_around && mat.is_some() {
+                editor.set_status("Wrapped around document");
+            } else {
+                editor.set_error("No more matches");
+            }
         }
     }
 
@@ -1706,6 +1712,7 @@ fn searcher(cx: &mut Context, direction: Direction) {
                 direction,
                 scrolloff,
                 wrap_around,
+                false,
             );
         },
     );
@@ -1740,6 +1747,7 @@ fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Dir
                     direction,
                     scrolloff,
                     wrap_around,
+                    true,
                 );
             }
         } else {

From 45956836220d78ff7fa62b50f08e191951c1b975 Mon Sep 17 00:00:00 2001
From: Jonathan <jon.lundholm@gmail.com>
Date: Wed, 5 Oct 2022 22:04:01 +0200
Subject: [PATCH 221/884] Fix tutor typo (#4116)

---
 runtime/tutor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/tutor b/runtime/tutor
index 7133c489..5e4a4b33 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -967,7 +967,7 @@ lines.
 
 
 =================================================================
-=              10.1 CYCLING AND REMOVING SELECIONS              =
+=             10.1 CYCLING AND REMOVING SELECTIONS              =
 =================================================================
 
  Type ) and ( to cycle the primary selection forward and backward

From 9ca4ac6901fc89823fd168ed56fead66a38e0595 Mon Sep 17 00:00:00 2001
From: allanderek <allan.clark@gmail.com>
Date: Thu, 6 Oct 2022 16:52:10 +0100
Subject: [PATCH 222/884] Pallettise the bogster theme and, more importantly,
 add support for color-modes to the bogster theme. (#4121)

---
 runtime/themes/bogster.toml | 127 +++++++++++++++++++++---------------
 1 file changed, 74 insertions(+), 53 deletions(-)

diff --git a/runtime/themes/bogster.toml b/runtime/themes/bogster.toml
index c1902b9b..d251edb2 100644
--- a/runtime/themes/bogster.toml
+++ b/runtime/themes/bogster.toml
@@ -1,32 +1,32 @@
 # Author : Wojciech Kępka <wojciech@wkepka.dev>
 
-"attribute" = "#dc7759"
-"keyword" = { fg = "#dcb659", modifiers = ["bold"] }
-"keyword.directive" = "#dcb659"
-"namespace" = "#d32c5d"
-"punctuation" = "#dc7759"
-"punctuation.delimiter" = "#dc7759"
-"operator" = { fg = "#dc7759", modifiers = ["bold"] }
-"special" = "#7fdc59"
-"variable.other.member" = "#c6b8ad"
-"variable" = "#c6b8ad"
-"variable.parameter" = "#c6b8ad"
-"type" = "#dc597f"
-"type.builtin" = { fg = "#d32c5d", modifiers = ["bold"] }
-"constructor" = "#dc597f"
-"function" = "#59dcd8"
-"function.macro" = { fg = "#dc7759", modifiers = ["bold"] }
-"function.builtin" = { fg = "#59dcd8", modifiers = ["bold"] }
-"comment" = "#627d9d"
-"variable.builtin" = "#c6b8ad"
-"constant" = "#59dcb7"
-"constant.builtin" = "#59dcb7"
-"string" = "#59dcb7"
-"constant.numeric" = "#59c0dc"
-"constant.character.escape" = { fg = "#7fdc59", modifiers = ["bold"] }
-"label" = "#59c0dc"
+"attribute" = "bogster0"
+"keyword" = { fg = "bogster1", modifiers = ["bold"] }
+"keyword.directive" = "bogster1"
+"namespace" = "bogster2"
+"punctuation" = "bogster0"
+"punctuation.delimiter" = "bogster0"
+"operator" = { fg = "bogster0", modifiers = ["bold"] }
+"special" = "bogster3"
+"variable.other.member" = "bogster4"
+"variable" = "bogster4"
+"variable.parameter" = "bogster4"
+"type" = "bogster5"
+"type.builtin" = { fg = "bogster2", modifiers = ["bold"] }
+"constructor" = "bogster5"
+"function" = "bogster6"
+"function.macro" = { fg = "bogster0", modifiers = ["bold"] }
+"function.builtin" = { fg = "bogster6", modifiers = ["bold"] }
+"comment" = "bogster7"
+"variable.builtin" = "bogster4"
+"constant" = "bogster8"
+"constant.builtin" = "bogster8"
+"string" = "bogster8"
+"constant.numeric" = "bogster9"
+"constant.character.escape" = { fg = "bogster3", modifiers = ["bold"] }
+"label" = "bogster9"
 
-"module" = "#d32c5d"
+"module" = "bogster2"
 
 # TODO
 "markup.heading" = "blue"
@@ -38,39 +38,60 @@
 "markup.quote" = "cyan"
 "markup.raw" = "green"
 
-"diff.plus" = "#59dcb7"
-"diff.delta" = "#dc7759"
-"diff.minus" = "#dc597f"
+"diff.plus" = "bogster8"
+"diff.delta" = "bogster0"
+"diff.minus" = "bogster5"
 
-"ui.background" = { bg = "#161c23" }
-"ui.linenr" = { fg = "#415367" }
-"ui.linenr.selected" = { fg = "#e5ded6" }  # TODO
-"ui.cursorline" = { bg = "#131920" }
-"ui.statusline" = { fg = "#e5ded6", bg = "#232d38" }
-"ui.statusline.inactive" = { fg = "#c6b8ad", bg = "#232d38" }
-"ui.bufferline" = { fg = "#627d9d", bg = "#131920" }
-"ui.bufferline.active" = { fg = "#e5ded6", bg = "#232d38" }
-"ui.popup" = { bg = "#232d38" }
-"ui.window" = { bg = "#232d38" }
-"ui.help" = { bg = "#232d38", fg = "#e5ded6" }
+"ui.background" = { bg = "bogster10" }
+"ui.linenr" = { fg = "bogster11" }
+"ui.linenr.selected" = { fg = "bogster12" }  # TODO
+"ui.cursorline" = { bg = "bogster13" }
+"ui.statusline" = { fg = "bogster12", bg = "bogster14" }
+"ui.statusline.inactive" = { fg = "bogster4", bg = "bogster14" }
+"ui.popup" = { bg = "bogster14" }
+"ui.window" = { bg = "bogster14" }
+"ui.help" = { bg = "bogster14", fg = "bogster12" }
 
-"ui.text" = { fg = "#e5ded6" }
-"ui.text.focus" = { fg = "#e5ded6", modifiers= ["bold"] }
-"ui.virtual.whitespace" = "#627d9d"
-"ui.virtual.ruler" = { bg = "#131920" }
+"ui.statusline.normal" = { fg = "bogster10", bg = "bogster9", modifiers = [ "bold" ]}
+"ui.statusline.insert" = { fg = "bogster10", bg = "bogster3", modifiers = [ "bold" ]}
+"ui.statusline.select" = { fg = "bogster10", bg = "bogster2", modifiers = [ "bold" ] }
 
-"ui.selection" = { bg = "#313f4e" }
+"ui.text" = { fg = "bogster12" }
+"ui.text.focus" = { fg = "bogster12", modifiers= ["bold"] }
+"ui.virtual.whitespace" = "bogster7"
+"ui.virtual.ruler" = { bg = "bogster13" }
+
+"ui.selection" = { bg = "bogster15" }
 # "ui.cursor.match"  # TODO might want to override this because dimmed is not widely supported
-"ui.cursor.match" = { fg = "#313f4e", bg = "#dc7759" }
-"ui.cursor" = { fg = "#ABB2BF", modifiers = ["reversed"] }
+"ui.cursor.match" = { fg = "bogster15", bg = "bogster0" }
+"ui.cursor" = { fg = "bogster16", modifiers = ["reversed"] }
 
-"ui.menu" = { fg = "#e5ded6bg", bg = "#232d38" }
-"ui.menu.selected" = { bg = "#313f4e" }
+"ui.menu" = { fg = "bogster12", bg = "bogster14" }
+"ui.menu.selected" = { bg = "bogster15" }
 
-"warning" = "#dc7759"
-"error" = "#dc597f"
-"info" = "#59dcb7"
-"hint" = "#59c0dc"
+"warning" = "bogster0"
+"error" = "bogster5"
+"info" = "bogster8"
+"hint" = "bogster9"
 
 # make diagnostic underlined, to distinguish with selection text.
 diagnostic = { modifiers = ["underlined"] }
+
+[palette]
+bogster0 = "#dc7759"
+bogster1 = "#dcb659"
+bogster2 = "#d32c5d"
+bogster3 = "#7fdc59"
+bogster4 = "#c6b8ad"
+bogster5 = "#dc597f"
+bogster6 = "#59dcd8"
+bogster7 = "#627d9d"
+bogster8 = "#59dcb7"
+bogster9 = "#59c0dc"
+bogster10 = "#161c23" 
+bogster11 = "#415367" 
+bogster12 = "#e5ded6"
+bogster13 = "#131920"
+bogster14 = "#232d38"
+bogster15 = "#313f4e" 
+bogster16 = "#ABB2BF"

From 4d4be0e880efd136100439cc34e8c526d299ec34 Mon Sep 17 00:00:00 2001
From: Oleksii Dorozhkin <vf.velt@gmail.com>
Date: Thu, 6 Oct 2022 18:53:05 +0300
Subject: [PATCH 223/884] Update sonokai.toml (#4089)

---
 runtime/themes/sonokai.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/themes/sonokai.toml b/runtime/themes/sonokai.toml
index 54804697..18417f00 100644
--- a/runtime/themes/sonokai.toml
+++ b/runtime/themes/sonokai.toml
@@ -58,7 +58,7 @@
 "ui.selection" = { bg = "bg4" }
 "ui.linenr" = "grey"
 "ui.linenr.selected" = "fg"
-"ui.cursorline.primary" = { bg = "bg2" }
+"ui.cursorline.primary" = { bg = "bg1" }
 "ui.statusline" = { fg = "fg", bg = "bg3" }
 "ui.statusline.inactive" = { fg = "grey", bg = "bg1" }
 "ui.popup" = { fg = "grey", bg = "bg2" }
@@ -86,7 +86,7 @@ bg0 = "#2c2e34"
 bg1 = "#33353f"
 bg2 = "#363944"
 bg3 = "#3b3e48"
-bg4 = "#414550"
+bg4 = "#545862"
 bg_red = "#ff6077"
 diff_red = "#55393d"
 bg_green = "#a7df78"

From 114610f7dc5d6395ef5cce9111a363f7c8d879a4 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Thu, 6 Oct 2022 20:46:24 +0200
Subject: [PATCH 224/884] switch to termini for terminfo

---
 Cargo.lock                         | 17 ++++++++++-------
 helix-tui/Cargo.toml               |  2 +-
 helix-tui/src/backend/crossterm.rs |  6 +++---
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f980c417..03b3a6d4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -176,12 +176,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "cxterminfo"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da92c5e3aaf2cc1fea346d9b3bac0c59c6ffc1d1d46f18d991d449912a3e6f07"
-
 [[package]]
 name = "dirs-next"
 version = "2.0.0"
@@ -510,10 +504,10 @@ dependencies = [
  "bitflags",
  "cassowary",
  "crossterm",
- "cxterminfo",
  "helix-core",
  "helix-view",
  "serde",
+ "termini",
  "unicode-segmentation",
 ]
 
@@ -1105,6 +1099,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "termini"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00733d628ac0a8bd4fd3171a28eb6c09759ae1b43d8b587eadebaccee01d01a3"
+dependencies = [
+ "dirs-next",
+]
+
 [[package]]
 name = "textwrap"
 version = "0.15.1"
diff --git a/helix-tui/Cargo.toml b/helix-tui/Cargo.toml
index 1c6a6a8d..a4a1c389 100644
--- a/helix-tui/Cargo.toml
+++ b/helix-tui/Cargo.toml
@@ -20,7 +20,7 @@ bitflags = "1.3"
 cassowary = "0.3"
 unicode-segmentation = "1.10"
 crossterm = { version = "0.25", optional = true }
-cxterminfo = "0.2"
+termini = "0.1"
 serde = { version = "1", "optional" = true, features = ["derive"]}
 helix-view = { version = "0.6", path = "../helix-view", features = ["term"] }
 helix-core = { version = "0.6", path = "../helix-core" }
diff --git a/helix-tui/src/backend/crossterm.rs b/helix-tui/src/backend/crossterm.rs
index 3e6dc5f5..4d8c6650 100644
--- a/helix-tui/src/backend/crossterm.rs
+++ b/helix-tui/src/backend/crossterm.rs
@@ -27,13 +27,13 @@ impl Capabilities {
     /// on the $TERM environment variable. If detection fails, returns
     /// a default value where no capability is supported.
     pub fn from_env_or_default() -> Self {
-        match cxterminfo::terminfo::TermInfo::from_env() {
+        match termini::TermInfo::from_env() {
             Err(_) => Capabilities::default(),
             Ok(t) => Capabilities {
                 // Smulx, VTE: https://unix.stackexchange.com/a/696253/246284
                 // Su (used by kitty): https://sw.kovidgoyal.net/kitty/underlines
-                has_extended_underlines: t.get_ext_string("Smulx").is_some()
-                    || *t.get_ext_bool("Su").unwrap_or(&false)
+                has_extended_underlines: t.extended_cap("Smulx").is_some()
+                    || t.extended_cap("Su").is_some()
                     || vte_version() >= Some(5102),
             },
         }

From 7bc324fde986fab2ded2ad29d7b5244521eddc44 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Thu, 6 Oct 2022 20:50:54 +0200
Subject: [PATCH 225/884] make casing consistent with other configuration

---
 book/src/themes.md            | 6 +++---
 helix-view/src/theme.rs       | 4 ++--
 runtime/themes/dark_plus.toml | 4 ++--
 runtime/themes/onedark.toml   | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/book/src/themes.md b/book/src/themes.md
index 450b3364..b386973a 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -13,7 +13,7 @@ The default theme.toml can be found [here](https://github.com/helix-editor/helix
 Each line in the theme file is specified as below:
 
 ```toml
-key = { fg = "#ffffff", bg = "#000000", underline_color = "#ff0000", underline_style = "curl", modifiers = ["bold", "italic"] }
+key = { fg = "#ffffff", bg = "#000000", underline-color = "#ff0000", underline-style = "curl", modifiers = ["bold", "italic"] }
 ```
 
 where `key` represents what you want to style, `fg` specifies the foreground color, `bg` the background color, `underline_style` the underline style, `underline_color` the underline color (only meaningful if an underline style is enabled), and `modifiers` is a list of style modifiers. `bg`, `underline` and `modifiers` can be omitted to defer to the defaults.
@@ -91,7 +91,7 @@ Less common modifiers might not be supported by your terminal emulator.
 
 ### Underline Style
 
-One of the following values may be used as an `underline_styles`. 
+One of the following values may be used as an `underline-style`. 
 
 Some styles might not be supported by your terminal emulator.
 
@@ -101,7 +101,7 @@ Some styles might not be supported by your terminal emulator.
 | `curl`         |
 | `dashed`       |
 | `dot`          |
-| `double-line`  |
+| `double_line`  |
 
 
 ### Scopes
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index 90185937..b1c96f94 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -277,8 +277,8 @@ impl ThemePalette {
                 match name.as_str() {
                     "fg" => *style = style.fg(self.parse_color(value)?),
                     "bg" => *style = style.bg(self.parse_color(value)?),
-                    "underline_color" => *style = style.underline_color(self.parse_color(value)?),
-                    "underline_style" => {
+                    "underline-color" => *style = style.underline_color(self.parse_color(value)?),
+                    "underline-style" => {
                         warn!("found style");
                         *style = style.underline_style(Self::parse_underline_style(&value)?)
                     }
diff --git a/runtime/themes/dark_plus.toml b/runtime/themes/dark_plus.toml
index fa6b34ab..afbd1b71 100644
--- a/runtime/themes/dark_plus.toml
+++ b/runtime/themes/dark_plus.toml
@@ -92,8 +92,8 @@
 "info" = { fg = "light_blue" }
 "hint" = { fg = "light_gray3" }
 
-"diagnostic.error" = {underline_color = "red", underline_style = "curl"}
-"diagnostic" = {underline_color = "gold", underline_style = "curl" }
+"diagnostic.error" = {underline-color = "red", underline-style = "curl"}
+"diagnostic" = {underline-color = "gold", underline-style = "curl" }
 
 [palette]
 white = "#ffffff"
diff --git a/runtime/themes/onedark.toml b/runtime/themes/onedark.toml
index 5f337a8d..cce0474f 100644
--- a/runtime/themes/onedark.toml
+++ b/runtime/themes/onedark.toml
@@ -39,10 +39,10 @@
 "diff.delta" = "gold"
 "diff.minus" = "red"
 
-"diagnostic.info" = { underline_color = "blue", underline_style = "curl" }
-"diagnostic.hint" = { underline_color = "green", underline_style = "curl" }
-"diagnostic.warning" = { underline_color = "yellow", underline_style = "curl" }
-"diagnostic.error" = { underline_color = "red", underline_style = "curl" }
+"diagnostic.info" = { underline-color = "blue", underline-style = "curl" }
+"diagnostic.hint" = { underline-color = "green", underline-style = "curl" }
+"diagnostic.warning" = { underline-color = "yellow", underline-style = "curl" }
+"diagnostic.error" = { underline-color = "red", underline-style = "curl" }
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "green", modifiers = ["bold"] }
 "warning" = { fg = "yellow", modifiers = ["bold"] }

From 4c36c067b06e3bba24e0b2bd0f40f259ca6c8b41 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Fri, 7 Oct 2022 00:09:55 +0200
Subject: [PATCH 226/884] avoid visual artificats on terminal emulators that do
 not support underline colors

---
 helix-tui/src/backend/crossterm.rs | 77 ++++++++++++++++++++++++++----
 1 file changed, 68 insertions(+), 9 deletions(-)

diff --git a/helix-tui/src/backend/crossterm.rs b/helix-tui/src/backend/crossterm.rs
index 4d8c6650..7b3b0817 100644
--- a/helix-tui/src/backend/crossterm.rs
+++ b/helix-tui/src/backend/crossterm.rs
@@ -4,13 +4,16 @@ use crossterm::{
     execute, queue,
     style::{
         Attribute as CAttribute, Color as CColor, Print, SetAttribute, SetBackgroundColor,
-        SetForegroundColor, SetUnderlineColor,
+        SetForegroundColor,
     },
     terminal::{self, Clear, ClearType},
+    Command,
 };
 use helix_view::graphics::{Color, CursorKind, Modifier, Rect, UnderlineStyle};
-use std::io::{self, Write};
-
+use std::{
+    fmt,
+    io::{self, Write},
+};
 fn vte_version() -> Option<usize> {
     std::env::var("VTE_VERSION").ok()?.parse().ok()
 }
@@ -108,18 +111,19 @@ where
                 map_error(queue!(self.buffer, SetBackgroundColor(color)))?;
                 bg = cell.bg;
             }
-            if cell.underline_color != underline_color {
-                let color = CColor::from(cell.underline_color);
-                map_error(queue!(self.buffer, SetUnderlineColor(color)))?;
-                underline_color = cell.underline_color;
-            }
 
             let mut new_underline_style = cell.underline_style;
             if !self.capabilities.has_extended_underlines {
                 match new_underline_style {
-                    UnderlineStyle::Reset => (),
+                    UnderlineStyle::Reset | UnderlineStyle::Line => (),
                     _ => new_underline_style = UnderlineStyle::Line,
                 }
+
+                if cell.underline_color != underline_color {
+                    let color = CColor::from(cell.underline_color);
+                    map_error(queue!(self.buffer, SetUnderlineColor(color)))?;
+                    underline_color = cell.underline_color;
+                }
             }
 
             if new_underline_style != underline_style {
@@ -244,3 +248,58 @@ impl ModifierDiff {
         Ok(())
     }
 }
+
+/// Crossterm uses semicolon as a seperator for colors
+/// this is actually not spec compliant (altough commonly supported)
+/// However the correct approach is to use colons as a seperator.
+/// This usually doesn't make a difference for emulators that do support colored underlines.
+/// However terminals that do not support colored underlines will ignore underlines colors with colons
+/// while escape sequences with semicolons are always processed which leads to weird visual artifacts.
+/// See [this nvim issue](https://github.com/neovim/neovim/issues/9270) for details
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct SetUnderlineColor(pub CColor);
+
+impl Command for SetUnderlineColor {
+    fn write_ansi(&self, f: &mut impl fmt::Write) -> fmt::Result {
+        let color = self.0;
+
+        if color == CColor::Reset {
+            write!(f, "\x1b[59m")?;
+            return Ok(());
+        }
+        f.write_str("\x1b[58:")?;
+
+        let res = match color {
+            CColor::Black => f.write_str("5:0"),
+            CColor::DarkGrey => f.write_str("5:8"),
+            CColor::Red => f.write_str("5:9"),
+            CColor::DarkRed => f.write_str("5:1"),
+            CColor::Green => f.write_str("5:10"),
+            CColor::DarkGreen => f.write_str("5:2"),
+            CColor::Yellow => f.write_str("5:11"),
+            CColor::DarkYellow => f.write_str("5:3"),
+            CColor::Blue => f.write_str("5:12"),
+            CColor::DarkBlue => f.write_str("5:4"),
+            CColor::Magenta => f.write_str("5:13"),
+            CColor::DarkMagenta => f.write_str("5:5"),
+            CColor::Cyan => f.write_str("5:14"),
+            CColor::DarkCyan => f.write_str("5:6"),
+            CColor::White => f.write_str("5:15"),
+            CColor::Grey => f.write_str("5:7"),
+            CColor::Rgb { r, g, b } => write!(f, "2::{}:{}:{}", r, g, b),
+            CColor::AnsiValue(val) => write!(f, "5:{}", val),
+            _ => Ok(()),
+        };
+        res?;
+        write!(f, "m")?;
+        Ok(())
+    }
+
+    #[cfg(windows)]
+    fn execute_winapi(&self) -> crossterm::Result<()> {
+        Err(std::io::Error::new(
+            std::io::ErrorKind::Other,
+            "SetUnderlineColor not supported by winapi.",
+        ))
+    }
+}

From 18cfe864f44e9d97f11335b7db14e28c804ea794 Mon Sep 17 00:00:00 2001
From: Brandon Dong <brandondong604@hotmail.com>
Date: Fri, 7 Oct 2022 11:22:35 -0700
Subject: [PATCH 227/884] Fix incorrect scrolloff default in documentation
 (#4136)

---
 book/src/configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index a5092b9d..4761ebe4 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -38,7 +38,7 @@ on unix operating systems.
 
 | Key | Description | Default |
 |--|--|---------|
-| `scrolloff` | Number of lines of padding around the edge of the screen when scrolling. | `3` |
+| `scrolloff` | Number of lines of padding around the edge of the screen when scrolling. | `5` |
 | `mouse` | Enable mouse mode. | `true` |
 | `middle-click-paste` | Middle click paste support. | `true` |
 | `scroll-lines` | Number of lines to scroll per scroll wheel step. | `3` |

From ad0eb4094b39e458e9681eaa83539ea6cf09e5de Mon Sep 17 00:00:00 2001
From: pascalkuthe <dspom@protonmail.com>
Date: Sat, 8 Oct 2022 16:39:02 +0200
Subject: [PATCH 228/884] add deprectation not for underlined modifier to docs

---
 book/src/themes.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/book/src/themes.md b/book/src/themes.md
index b386973a..c5a623b0 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -89,6 +89,9 @@ Less common modifiers might not be supported by your terminal emulator.
 | `hidden`             |
 | `crossed_out`        |
 
+> Note: The `underlined` modifier is deprecated and only available for backwards compatability.
+> It's behaviour is equivalent to `underline-style="line"`
+
 ### Underline Style
 
 One of the following values may be used as an `underline-style`. 

From 2f7088c1f37f11606944a9db52814a652f97fdcd Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Sat, 8 Oct 2022 17:43:32 +0200
Subject: [PATCH 229/884] fix typo

Co-authored-by: Omnikar <omkar.subramaniam@icloud.com>
---
 book/src/themes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/src/themes.md b/book/src/themes.md
index c5a623b0..e84f8705 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -90,7 +90,7 @@ Less common modifiers might not be supported by your terminal emulator.
 | `crossed_out`        |
 
 > Note: The `underlined` modifier is deprecated and only available for backwards compatability.
-> It's behaviour is equivalent to `underline-style="line"`
+> Its behaviour is equivalent to `underline-style="line"`.
 
 ### Underline Style
 

From c15f1ea274d300feb23208324aa5b27d7274bebd Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Sat, 8 Oct 2022 21:28:42 +0300
Subject: [PATCH 230/884] Add cursorcolumn (#4084)

* Implement cursorcolumn

* Add documentation

* Separate column style from line with fallback

* Fallback to cursorcolumn first

* Switch to non-fallback try_get_exact

Add new function `try_get_exact`, which doesn't perform fallback,
and use that instead because the fallback behaviour is being handled
manually.
---
 book/src/configuration.md   |  1 +
 book/src/themes.md          | 92 +++++++++++++++++++------------------
 helix-term/src/ui/editor.rs | 52 ++++++++++++++++++++-
 helix-view/src/editor.rs    |  3 ++
 helix-view/src/theme.rs     |  7 +++
 5 files changed, 109 insertions(+), 46 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 4761ebe4..707102f6 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -45,6 +45,7 @@ on unix operating systems.
 | `shell` | Shell to use when running external commands. | Unix: `["sh", "-c"]`<br/>Windows: `["cmd", "/C"]` |
 | `line-number` | Line number display: `absolute` simply shows each line's number, while `relative` shows the distance from the current line. When unfocused or in insert mode, `relative` will still show absolute line numbers. | `absolute` |
 | `cursorline` | Highlight all lines with a cursor. | `false` |
+| `cursorcolumn` | Highlight all columns with a cursor. | `false` |
 | `gutters` | Gutters to display: Available are `diagnostics` and `line-numbers` and `spacer`, note that `diagnostics` also includes other features like breakpoints, 1-width padding will be inserted if gutters is non-empty | `["diagnostics", "line-numbers"]` |
 | `auto-completion` | Enable automatic pop up of auto-completion. | `true` |
 | `auto-format` | Enable automatic formatting on save. | `true` |
diff --git a/book/src/themes.md b/book/src/themes.md
index 4cded68f..2563bb85 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -225,51 +225,53 @@ These scopes are used for theming the editor interface.
       - `hover` - for hover popup ui
 
 
-| Key                       | Notes                                          |
-| ---                       | ---                                            |
-| `ui.background`           |                                                |
-| `ui.background.separator` | Picker separator below input line              |
-| `ui.cursor`               |                                                |
-| `ui.cursor.insert`        |                                                |
-| `ui.cursor.select`        |                                                |
-| `ui.cursor.match`         | Matching bracket etc.                          |
-| `ui.cursor.primary`       | Cursor with primary selection                  |
-| `ui.gutter`               | Gutter                                         |
-| `ui.gutter.selected`      | Gutter for the line the cursor is on           |
-| `ui.linenr`               | Line numbers                                   |
-| `ui.linenr.selected`      | Line number for the line the cursor is on      |
-| `ui.statusline`           | Statusline                                     |
-| `ui.statusline.inactive`  | Statusline (unfocused document)                |
-| `ui.statusline.normal`    | Statusline mode during normal mode ([only if `editor.color-modes` is enabled][editor-section]) |
-| `ui.statusline.insert`    | Statusline mode during insert mode ([only if `editor.color-modes` is enabled][editor-section]) |
-| `ui.statusline.select`    | Statusline mode during select mode ([only if `editor.color-modes` is enabled][editor-section]) |
-| `ui.statusline.separator` | Separator character in statusline              |
-| `ui.popup`                | Documentation popups (e.g space-k)             |
-| `ui.popup.info`           | Prompt for multiple key options                |
-| `ui.window`               | Border lines separating splits                 |
-| `ui.help`                 | Description box for commands                   |
-| `ui.text`                 | Command prompts, popup text, etc.              |
-| `ui.text.focus`           |                                                |
-| `ui.text.info`            | The key: command text in `ui.popup.info` boxes |
-| `ui.virtual.ruler`        | Ruler columns (see the [`editor.rulers` config][editor-section])|
-| `ui.virtual.whitespace`   | Visible white-space characters                 |
-| `ui.virtual.indent-guide` | Vertical indent width guides                   |
-| `ui.menu`                 | Code and command completion menus              |
-| `ui.menu.selected`        | Selected autocomplete item                     |
-| `ui.menu.scroll`          | `fg` sets thumb color, `bg` sets track color of scrollbar |
-| `ui.selection`            | For selections in the editing area             |
-| `ui.selection.primary`    |                                                |
-| `ui.cursorline.primary`   | The line of the primary cursor                 |
-| `ui.cursorline.secondary` | The lines of any other cursors                 |
-| `warning`                 | Diagnostics warning (gutter)                   |
-| `error`                   | Diagnostics error (gutter)                     |
-| `info`                    | Diagnostics info (gutter)                      |
-| `hint`                    | Diagnostics hint (gutter)                      |
-| `diagnostic`              | Diagnostics fallback style (editing area)      |
-| `diagnostic.hint`         | Diagnostics hint (editing area)                |
-| `diagnostic.info`         | Diagnostics info (editing area)                |
-| `diagnostic.warning`      | Diagnostics warning (editing area)             |
-| `diagnostic.error`        | Diagnostics error (editing area)               |
+| Key                         | Notes                                                                                          |
+| ---                         | ---                                                                                            |
+| `ui.background`             |                                                                                                |
+| `ui.background.separator`   | Picker separator below input line                                                              |
+| `ui.cursor`                 |                                                                                                |
+| `ui.cursor.insert`          |                                                                                                |
+| `ui.cursor.select`          |                                                                                                |
+| `ui.cursor.match`           | Matching bracket etc.                                                                          |
+| `ui.cursor.primary`         | Cursor with primary selection                                                                  |
+| `ui.gutter`                 | Gutter                                                                                         |
+| `ui.gutter.selected`        | Gutter for the line the cursor is on                                                           |
+| `ui.linenr`                 | Line numbers                                                                                   |
+| `ui.linenr.selected`        | Line number for the line the cursor is on                                                      |
+| `ui.statusline`             | Statusline                                                                                     |
+| `ui.statusline.inactive`    | Statusline (unfocused document)                                                                |
+| `ui.statusline.normal`      | Statusline mode during normal mode ([only if `editor.color-modes` is enabled][editor-section]) |
+| `ui.statusline.insert`      | Statusline mode during insert mode ([only if `editor.color-modes` is enabled][editor-section]) |
+| `ui.statusline.select`      | Statusline mode during select mode ([only if `editor.color-modes` is enabled][editor-section]) |
+| `ui.statusline.separator`   | Separator character in statusline                                                              |
+| `ui.popup`                  | Documentation popups (e.g space-k)                                                             |
+| `ui.popup.info`             | Prompt for multiple key options                                                                |
+| `ui.window`                 | Border lines separating splits                                                                 |
+| `ui.help`                   | Description box for commands                                                                   |
+| `ui.text`                   | Command prompts, popup text, etc.                                                              |
+| `ui.text.focus`             |                                                                                                |
+| `ui.text.info`              | The key: command text in `ui.popup.info` boxes                                                 |
+| `ui.virtual.ruler`          | Ruler columns (see the [`editor.rulers` config][editor-section])                               |
+| `ui.virtual.whitespace`     | Visible white-space characters                                                                 |
+| `ui.virtual.indent-guide`   | Vertical indent width guides                                                                   |
+| `ui.menu`                   | Code and command completion menus                                                              |
+| `ui.menu.selected`          | Selected autocomplete item                                                                     |
+| `ui.menu.scroll`            | `fg` sets thumb color, `bg` sets track color of scrollbar                                      |
+| `ui.selection`              | For selections in the editing area                                                             |
+| `ui.selection.primary`      |                                                                                                |
+| `ui.cursorline.primary`     | The line of the primary cursor ([if cursorline is enabled][editor-section])                    |
+| `ui.cursorline.secondary`   | The lines of any other cursors ([if cursorline is enabled][editor-section])                    |
+| `ui.cursorcolumn.primary`   | The column of the primary cursor ([if cursorcolumn is enabled][editor-section])                |
+| `ui.cursorcolumn.secondary` | The columns of any other cursors ([if cursorcolumn is enabled][editor-section])                |
+| `warning`                   | Diagnostics warning (gutter)                                                                   |
+| `error`                     | Diagnostics error (gutter)                                                                     |
+| `info`                      | Diagnostics info (gutter)                                                                      |
+| `hint`                      | Diagnostics hint (gutter)                                                                      |
+| `diagnostic`                | Diagnostics fallback style (editing area)                                                      |
+| `diagnostic.hint`           | Diagnostics hint (editing area)                                                                |
+| `diagnostic.info`           | Diagnostics info (editing area)                                                                |
+| `diagnostic.warning`        | Diagnostics warning (editing area)                                                             |
+| `diagnostic.error`          | Diagnostics error (editing area)                                                               |
 
 You can check compliance to spec with
 
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 97639ff2..47fb7a4a 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -13,7 +13,7 @@ use helix_core::{
     movement::Direction,
     syntax::{self, HighlightEvent},
     unicode::width::UnicodeWidthStr,
-    LineEnding, Position, Range, Selection, Transaction,
+    visual_coords_at_pos, LineEnding, Position, Range, Selection, Transaction,
 };
 use helix_view::{
     document::{Mode, SCRATCH_BUFFER_NAME},
@@ -118,6 +118,9 @@ impl EditorView {
         if is_focused && editor.config().cursorline {
             Self::highlight_cursorline(doc, view, surface, theme);
         }
+        if is_focused && editor.config().cursorcolumn {
+            Self::highlight_cursorcolumn(doc, view, surface, theme);
+        }
 
         let highlights = Self::doc_syntax_highlights(doc, view.offset, inner.height, theme);
         let highlights = syntax::merge(highlights, Self::doc_diagnostics_highlights(doc, theme));
@@ -830,6 +833,53 @@ impl EditorView {
         }
     }
 
+    /// Apply the highlighting on the columns where a cursor is active
+    pub fn highlight_cursorcolumn(
+        doc: &Document,
+        view: &View,
+        surface: &mut Surface,
+        theme: &Theme,
+    ) {
+        let text = doc.text().slice(..);
+
+        // Manual fallback behaviour:
+        // ui.cursorcolumn.{p/s} -> ui.cursorcolumn -> ui.cursorline.{p/s}
+        let primary_style = theme
+            .try_get_exact("ui.cursorcolumn.primary")
+            .or_else(|| theme.try_get_exact("ui.cursorcolumn"))
+            .unwrap_or_else(|| theme.get("ui.cursorline.primary"));
+        let secondary_style = theme
+            .try_get_exact("ui.cursorcolumn.secondary")
+            .or_else(|| theme.try_get_exact("ui.cursorcolumn"))
+            .unwrap_or_else(|| theme.get("ui.cursorline.secondary"));
+
+        let inner_area = view.inner_area();
+        let offset = view.offset.col;
+
+        let selection = doc.selection(view.id);
+        let primary = selection.primary();
+        for range in selection.iter() {
+            let is_primary = primary == *range;
+
+            let Position { row: _, col } =
+                visual_coords_at_pos(text, range.cursor(text), doc.tab_width());
+            // if the cursor is horizontally in the view
+            if col >= offset && inner_area.width > (col - offset) as u16 {
+                let area = Rect::new(
+                    inner_area.x + (col - offset) as u16,
+                    view.area.y,
+                    1,
+                    view.area.height,
+                );
+                if is_primary {
+                    surface.set_style(area, primary_style)
+                } else {
+                    surface.set_style(area, secondary_style)
+                }
+            }
+        }
+    }
+
     /// Handle events by looking them up in `self.keymaps`. Returns None
     /// if event was handled (a command was executed or a subkeymap was
     /// activated). Only KeymapResult::{NotFound, Cancelled} is returned
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index d09d0ac3..60b3880c 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -124,6 +124,8 @@ pub struct Config {
     pub line_number: LineNumber,
     /// Highlight the lines cursors are currently on. Defaults to false.
     pub cursorline: bool,
+    /// Highlight the columns cursors are currently on. Defaults to false.
+    pub cursorcolumn: bool,
     /// Gutters. Default ["diagnostics", "line-numbers"]
     pub gutters: Vec<GutterType>,
     /// Middle click paste support. Defaults to true.
@@ -582,6 +584,7 @@ impl Default for Config {
             },
             line_number: LineNumber::Absolute,
             cursorline: false,
+            cursorcolumn: false,
             gutters: vec![GutterType::Diagnostics, GutterType::LineNumbers],
             middle_click_paste: true,
             auto_pairs: AutoPairConfig::default(),
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index 85f5cc13..8a1f8b7e 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -277,6 +277,13 @@ impl Theme {
             .find_map(|s| self.styles.get(s).copied())
     }
 
+    /// Get the style of a scope, without falling back to dot separated broader
+    /// scopes. For example if `ui.text.focus` is not defined in the theme, it
+    /// will return `None`, even if `ui.text` is.
+    pub fn try_get_exact(&self, scope: &str) -> Option<Style> {
+        self.styles.get(scope).copied()
+    }
+
     #[inline]
     pub fn scopes(&self) -> &[String] {
         &self.scopes

From 9b7f349f5c9b2699faead8c7f6feabbd7fd1cba9 Mon Sep 17 00:00:00 2001
From: Mike Sampson <mike@sambodata.com>
Date: Mon, 10 Oct 2022 06:15:28 +1100
Subject: [PATCH 231/884] tutor: 5.5 add missing words (#4160)

---
 runtime/tutor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/tutor b/runtime/tutor
index 5e4a4b33..f006d6dc 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -576,7 +576,7 @@ _________________________________________________________________
 
  Type A-s (Alt-s) to split the selection(s) on newlines.
 
- 1. Move the first row of the table below.
+ 1. Move the cursor to the first row of the table below.
  2. Select the entire table with 6x.
  3. Type A-s to split into selections at each line.
  4. Align the table with &.

From d27551d814f9741d44eb63fe9ba0f28506afffc5 Mon Sep 17 00:00:00 2001
From: S1m <31284753+p1gp1g@users.noreply.github.com>
Date: Mon, 10 Oct 2022 17:26:10 +0200
Subject: [PATCH 232/884] Use different cursor color for primary cursor for
 ayu_mirage (#4140)

---
 runtime/themes/ayu_mirage.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/runtime/themes/ayu_mirage.toml b/runtime/themes/ayu_mirage.toml
index f3b49d87..e01866a9 100644
--- a/runtime/themes/ayu_mirage.toml
+++ b/runtime/themes/ayu_mirage.toml
@@ -34,7 +34,8 @@
 
 # Interface
 "ui.background"= { bg = "background" }
-"ui.cursor" = { bg = "yellow", fg = "dark_gray" }
+"ui.cursor" = { bg = "green", fg = "dark_gray" }
+"ui.cursor.primary" = { bg = "orange", fg = "dark_gray" }
 "ui.cursor.match" = { fg = "orange" }
 "ui.linenr" = { fg = "dark_gray" }
 "ui.linenr.selected" = { fg = "orange" }

From 8e8ba06f60e02c44915da633eb8e51b1eb097478 Mon Sep 17 00:00:00 2001
From: Chickenkeeper <chrism.chickenkeeper24@gmail.com>
Date: Mon, 10 Oct 2022 18:07:14 +0100
Subject: [PATCH 233/884] Improve C# syntax highlighting (#4118)

---
 languages.toml                         |   2 +-
 runtime/queries/c-sharp/highlights.scm | 143 +++++++++++++++----------
 2 files changed, 87 insertions(+), 58 deletions(-)

diff --git a/languages.toml b/languages.toml
index def55182..4a7f990d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -235,7 +235,7 @@ language-server = { command = "OmniSharp", args = [ "--languageserver" ] }
 
 [[grammar]]
 name = "c-sharp"
-source = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "9c494a503c8e2044bfffce57f70b480c01a82f03" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "5b60f99545fea00a33bbfae5be956f684c4c69e2" }
 
 [[language]]
 name = "go"
diff --git a/runtime/queries/c-sharp/highlights.scm b/runtime/queries/c-sharp/highlights.scm
index dbb7c778..e26a0877 100644
--- a/runtime/queries/c-sharp/highlights.scm
+++ b/runtime/queries/c-sharp/highlights.scm
@@ -9,25 +9,23 @@
   (member_access_expression
     name: (identifier) @function))
 
-(invocation_expression
-  (member_access_expression
-    expression: (identifier) @variable))
-
 (invocation_expression
   function: (conditional_access_expression
     (member_binding_expression
       name: (identifier) @function)))
 
 (invocation_expression
-      [(identifier) (qualified_name)] @function)
+  [(identifier) (qualified_name)] @function)
+
+(local_function_statement
+  name: (identifier) @function)
 
 ; Generic Method invocation with generic type
 (invocation_expression
   function: (generic_name
-              . (identifier) @function))
+    . (identifier) @function))
 
 ;; Namespaces
-
 (namespace_declaration
   name: [(identifier) (qualified_name)] @namespace)
 
@@ -40,8 +38,11 @@
 (namespace_declaration name: (identifier) @type)
 (using_directive (_) @namespace)
 (constructor_declaration name: (identifier) @type)
+(destructor_declaration name: (identifier) @type)
 (object_creation_expression [(identifier) (qualified_name)] @type)
 (type_parameter_list (type_parameter) @type)
+(array_type (identifier) @type)
+(for_each_statement type: (identifier) @type)
 
 [
   (implicit_type)
@@ -66,7 +67,7 @@
 
 (object_creation_expression
   (generic_name
-   (identifier) @type))
+    (identifier) @type))
 
 (property_declaration
   (generic_name
@@ -74,7 +75,7 @@
 
 (_
   type: (generic_name
-   (identifier) @type))
+    (identifier) @type))
 
 ;; Enum
 (enum_member_declaration (identifier) @variable.other.member)
@@ -91,6 +92,7 @@
   (verbatim_string_literal)
   (interpolated_string_text)
   (interpolated_verbatim_string_text)
+  (interpolation_format_clause)
   "\""
   "$\""
   "@$\""
@@ -150,6 +152,7 @@
   "%"
   "%="
   ":"
+  "::"
   ".."
   "&="
   "->"
@@ -166,50 +169,27 @@
 ]  @punctuation.bracket
 
 ;; Keywords
-(modifier) @keyword
+(modifier) @keyword.storage.modifier
 (this_expression) @keyword
 (escape_sequence) @constant.character.escape
 
 [
   "as"
   "base"
-  "break"
-  "case"
   "catch"
   "checked"
-  "class"
-  "continue"
-  "default"
-  "delegate"
-  "do"
-  "else"
-  "enum"
-  "event"
-  "explicit"
   "finally"
-  "for"
-  "foreach"
-  "goto"
-  "if"
-  "implicit"
-  "interface"
   "is"
   "lock"
-  "namespace"
   "operator"
   "params"
-  "return"
   "sizeof"
   "stackalloc"
-  "static"
-  "struct"
-  "switch"
   "throw"
   "try"
   "typeof"
   "unchecked"
   "using"
-  "while"
   "new"
   "await"
   "in"
@@ -222,25 +202,63 @@
   "from"
   "where"
   "select"
-  "record"
   "init"
   "with"
   "let"
 ] @keyword
 
-(nullable_directive) @keyword.directive
-(define_directive) @keyword.directive
-(undef_directive) @keyword.directive
-(if_directive) @keyword.directive
-(else_directive) @keyword.directive
-(elif_directive) @keyword.directive
-(endif_directive) @keyword.directive
-(region_directive) @keyword.directive
-(endregion_directive) @keyword.directive
-(error_directive) @keyword.directive
-(warning_directive) @keyword.directive
-(line_directive) @keyword.directive
-(pragma_directive) @keyword.directive
+[
+  "class"
+  "delegate"
+  "enum"
+  "event"
+  "interface"
+  "namespace"
+  "struct"
+  "record"
+] @keyword.storage.type
+
+[
+  "explicit"
+  "implicit"
+  "static"
+] @keyword.storage.modifier
+
+[
+  "for"
+  "foreach"
+  "do"
+  "while"
+  "break"
+  "continue"
+] @keyword.control.repeat
+
+[
+  "goto"
+  "if"
+  "else"
+  "switch"
+  "case"
+  "default"
+] @keyword.control.conditional
+
+"return" @keyword.control.return
+
+[
+  (nullable_directive)
+  (define_directive)
+  (undef_directive)
+  (if_directive)
+  (else_directive)
+  (elif_directive)
+  (endif_directive)
+  (region_directive)
+  (endregion_directive)
+  (error_directive)
+  (warning_directive)
+  (line_directive)
+  (pragma_directive)
+] @keyword.directive
 
 ;; Linq
 (from_clause (identifier) @variable)
@@ -259,10 +277,16 @@
 (binary_expression [(identifier) (qualified_name)] @variable [(identifier) (qualified_name)] @variable)
 (binary_expression [(identifier) (qualified_name)]* @variable)
 (conditional_expression [(identifier) (qualified_name)] @variable)
+(conditional_access_expression [(identifier) (qualified_name)] @variable)
 (prefix_unary_expression [(identifier) (qualified_name)] @variable)
 (postfix_unary_expression [(identifier) (qualified_name)]* @variable)
 (assignment_expression [(identifier) (qualified_name)] @variable)
 (cast_expression [(identifier) (qualified_name)] @type [(identifier) (qualified_name)] @variable)
+(element_access_expression (identifier) @variable)
+(member_access_expression
+  expression: ([(identifier) (qualified_name)] @type
+    (#match? @type "^[A-Z]")))
+(member_access_expression [(identifier) (qualified_name)] @variable)
 
 ;; Class
 (base_list (identifier) @type)
@@ -278,7 +302,6 @@
   name: (identifier) @variable)
   
 ;; Delegate
-
 (delegate_declaration (identifier) @type)
 
 ;; Lambda
@@ -296,11 +319,11 @@
 
 (parameter_list
   (parameter
-   name: (identifier) @parameter))
+    name: (identifier) @parameter))
 
 (parameter_list
   (parameter
-   type: [(identifier) (qualified_name)] @type))
+    type: [(identifier) (qualified_name)] @type))
 
 ;; Typeof
 (type_of_expression [(identifier) (qualified_name)] @type)
@@ -315,7 +338,7 @@
 
 ;; Type
 (generic_name (identifier) @type)
-(type_parameter [(identifier) (qualified_name)] @variable.parameter)
+(type_parameter [(identifier) (qualified_name)] @type)
 (type_argument_list [(identifier) (qualified_name)] @type)
 
 ;; Type constraints
@@ -333,15 +356,21 @@
 ;; Lock statement
 (lock_statement (identifier) @variable)
 
+;; Declaration expression
+(declaration_expression
+  type: (identifier) @type
+  name: (identifier) @variable)
+
 ;; Rest
-(member_access_expression) @variable
-(element_access_expression (identifier) @variable)
 (argument (identifier) @variable)
+(name_colon (identifier) @variable)
+(if_statement (identifier) @variable)
 (for_statement (identifier) @variable)
 (for_each_statement (identifier) @variable)
 (expression_statement (identifier) @variable)
-(member_access_expression expression: (identifier) @variable)
-(member_access_expression name: (identifier) @variable)
-(conditional_access_expression [(identifier) (qualified_name)] @variable)
+(array_rank_specifier (identifier) @variable)
+(equals_value_clause (identifier) @variable)
+(interpolation (identifier) @variable)
+(cast_expression (identifier) @variable)
 ((identifier) @comment.unused
- (#eq? @comment.unused "_"))
+  (#eq? @comment.unused "_"))

From 530f9e3c5395c559e66f7b9df30552950369e42b Mon Sep 17 00:00:00 2001
From: Brandon Dong <brandondong604@hotmail.com>
Date: Mon, 10 Oct 2022 10:12:48 -0700
Subject: [PATCH 234/884] Fix goto/view center mismatch (#4135)

---
 helix-view/src/lib.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/helix-view/src/lib.rs b/helix-view/src/lib.rs
index 788304bc..0145677d 100644
--- a/helix-view/src/lib.rs
+++ b/helix-view/src/lib.rs
@@ -53,12 +53,12 @@ pub fn align_view(doc: &Document, view: &mut View, align: Align) {
         .cursor(doc.text().slice(..));
     let line = doc.text().char_to_line(pos);
 
-    let height = view.inner_area().height as usize;
+    let last_line_height = view.inner_area().height.saturating_sub(1) as usize;
 
     let relative = match align {
-        Align::Center => height / 2,
+        Align::Center => last_line_height / 2,
         Align::Top => 0,
-        Align::Bottom => height,
+        Align::Bottom => last_line_height,
     };
 
     view.offset.row = line.saturating_sub(relative);

From 7af7dadd17a45a22633cad2325ca3cf9ac815ca7 Mon Sep 17 00:00:00 2001
From: David <12832280+David-Else@users.noreply.github.com>
Date: Mon, 10 Oct 2022 18:23:36 +0100
Subject: [PATCH 235/884] Add instructions for gnome desktop support using the
 `.desktop` file (#4165)

---
 README.md           | 27 ++++++++++++++++++++++-----
 book/src/install.md | 34 +++++++++++++++++++++++++---------
 2 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index ff0699c6..1e12ef2d 100644
--- a/README.md
+++ b/README.md
@@ -48,11 +48,11 @@ tree-sitter grammars may be manually fetched and built with `hx --grammar fetch`
 Helix also needs its runtime files so make sure to copy/symlink the `runtime/` directory into the
 config directory (for example `~/.config/helix/runtime` on Linux/macOS, or `%AppData%/helix/runtime` on Windows).
 
-| OS                   | Command                                      |
-| -------------------- | -------------------------------------------- |
-| Windows (cmd.exe)    | `xcopy /e /i runtime %AppData%\helix\runtime`      |
-| Windows (PowerShell) | `xcopy /e /i runtime $Env:AppData\helix\runtime`   |
-| Linux/macOS          | `ln -s $PWD/runtime ~/.config/helix/runtime` |
+| OS                   | Command                                          |
+| -------------------- | ------------------------------------------------ |
+| Windows (cmd.exe)    | `xcopy /e /i runtime %AppData%\helix\runtime`    |
+| Windows (PowerShell) | `xcopy /e /i runtime $Env:AppData\helix\runtime` |
+| Linux/macOS          | `ln -s $PWD/runtime ~/.config/helix/runtime`     |
 
 This location can be overridden via the `HELIX_RUNTIME` environment variable.
 
@@ -68,6 +68,23 @@ for a language.
 
 [![Packaging status](https://repology.org/badge/vertical-allrepos/helix.svg)](https://repology.org/project/helix/versions)
 
+## Adding Helix to your desktop environment
+
+If installing from source, to use Helix in desktop environments that supports [XDG desktop menu](https://specifications.freedesktop.org/menu-spec/menu-spec-latest.html), including Gnome and KDE, copy the provided `.desktop` file to the correct folder:
+
+```bash
+cp contrib/Helix.desktop ~/.local/share/applications
+```
+
+To use another terminal than the default, you will need to modify the `.desktop` file. For example, to use `kitty`:
+
+```bash
+sed -i "s|Exec=hx %F|Exec=kitty hx %F|g" ~/.local/share/applications/Helix.desktop
+sed -i "s|Terminal=true|Terminal=false|g" ~/.local/share/applications/Helix.desktop
+```
+
+Please note: there is no icon for Helix yet, so the system default will be used.
+
 ## MacOS
 
 Helix can be installed on MacOS through homebrew:
diff --git a/book/src/install.md b/book/src/install.md
index d7a51ac2..136e12c9 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -60,24 +60,40 @@ cargo install --path helix-term
 
 This will install the `hx` binary to `$HOME/.cargo/bin`.
 
-Helix also needs it's runtime files so make sure to copy/symlink the `runtime/` directory into the
+Helix also needs its runtime files so make sure to copy/symlink the `runtime/` directory into the
 config directory (for example `~/.config/helix/runtime` on Linux/macOS). This location can be overridden
 via the `HELIX_RUNTIME` environment variable.
 
-| OS                | command   |
-|-------------------|-----------|
-|windows(cmd.exe)   |`xcopy /e /i runtime %AppData%/helix/runtime`     |
-|windows(powershell)|`xcopy /e /i runtime $Env:AppData\helix\runtime`  |
-|linux/macos        |`ln -s $PWD/runtime ~/.config/helix/runtime`|
+| OS                  | command                                          |
+| ------------------- | ------------------------------------------------ |
+| windows(cmd.exe)    | `xcopy /e /i runtime %AppData%/helix/runtime`    |
+| windows(powershell) | `xcopy /e /i runtime $Env:AppData\helix\runtime` |
+| linux/macos         | `ln -s $PWD/runtime ~/.config/helix/runtime`     |
 
-## Finishing up the installation 
+To use Helix in desktop environments that supports [XDG desktop menu](https://specifications.freedesktop.org/menu-spec/menu-spec-latest.html), including Gnome and KDE, copy the provided `.desktop` file to the correct folder:
+
+```bash
+cp contrib/Helix.desktop ~/.local/share/applications
+```
+
+To use another terminal than the default, you will need to modify the `.desktop` file. For example, to use `kitty`:
+
+```bash
+sed -i "s|Exec=hx %F|Exec=kitty hx %F|g" ~/.local/share/applications/Helix.desktop
+sed -i "s|Terminal=true|Terminal=false|g" ~/.local/share/applications/Helix.desktop
+```
+
+Please note: there is no icon for Helix yet, so the system default will be used.
+
+## Finishing up the installation
+
+To make sure everything is set up as expected you should finally run the helix healthcheck via
 
-To make sure everything is set up as expected you should finally run the helix healthcheck via 
 ```
 hx --health
 ```
-For more information on the information displayed in the healthcheck results refer to [Healthcheck](https://github.com/helix-editor/helix/wiki/Healthcheck).
 
+For more information on the information displayed in the health check results refer to [Healthcheck](https://github.com/helix-editor/helix/wiki/Healthcheck).
 
 ### Building tree-sitter grammars
 

From a079f2c9bd2ec5f9cb9d0b06969a522463edac53 Mon Sep 17 00:00:00 2001
From: Sumit Sahrawat <115335378+sumit-sahrawat@users.noreply.github.com>
Date: Mon, 10 Oct 2022 21:23:14 +0000
Subject: [PATCH 236/884] Add some vertical characters to the
 editor.indent-guides documentation (#4163)

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 707102f6..996c5fb6 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -249,6 +249,6 @@ Example:
 ```toml
 [editor.indent-guides]
 render = true
-character = "╎"
+character = "╎" # Some characters that work well: "▏", "┆", "┊", "⸽"
 skip-levels = 1
 ```

From 9f36468b15c740d17a5755801986e01e7fb841ce Mon Sep 17 00:00:00 2001
From: gbprod <contact@gb-prod.fr>
Date: Mon, 10 Oct 2022 23:27:14 +0200
Subject: [PATCH 237/884] Change twig tree-sitter grammar (#4176)

---
 languages.toml                      |  2 +-
 runtime/queries/twig/highlights.scm | 70 +++++++++++++++++++++++------
 2 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/languages.toml b/languages.toml
index 4a7f990d..08645af8 100644
--- a/languages.toml
+++ b/languages.toml
@@ -537,7 +537,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "twig"
-source = { git = "https://github.com/eirabben/tree-sitter-twig", rev = "b7444181fb38e603e25ea8fcdac55f9492e49c27" }
+source = { git = "https://github.com/gbprod/tree-sitter-twig", rev = "807b293fec3fead64f54c64fdf6fb05516c032b9" }
 
 [[language]]
 name = "latex"
diff --git a/runtime/queries/twig/highlights.scm b/runtime/queries/twig/highlights.scm
index 2c95ab63..1ef8d06b 100644
--- a/runtime/queries/twig/highlights.scm
+++ b/runtime/queries/twig/highlights.scm
@@ -1,16 +1,60 @@
-(comment_directive) @comment
+(comment) @comment
+
+(filter_identifier) @function.method
+(function_identifier) @function.method
+(test) @function.builtin
+(variable) @variable
+(string) @string
+(interpolated_string) @string
+(operator) @operator
+(number) @constant.numeric.integer
+(boolean) @constant.builtin.boolean
+(null) @constant.builtin
+(keyword) @keyword
+(attribute) @attribute
+(tag) @tag
+(conditional) @keyword.control.conditional
+(repeat) @keyword.control.repeat
+(method) @function.method
+(parameter) @variable.parameter
 
 [
-  "{%"
-  "{%-"
-  "{%~"
-  "%}"
-  "-%}"
-  "~%}"
-  "{{"
-  "{{-"
-  "{{~"
-  "}}"
-  "-}}"
-  "~}}"
+    "{{"
+    "}}"
+    "{{-"
+    "-}}"
+    "{{~"
+    "~}}"
+    "{%"
+    "%}"
+    "{%-"
+    "-%}"
+    "{%~"
+    "~%}"
 ] @keyword
+
+[
+    ","
+    "."
+    "?"
+    ":"
+    "="
+] @punctuation.delimiter
+
+(interpolated_string [
+    "#{" 
+    "}"
+] @punctuation.delimiter)
+
+[
+    "("
+    ")"
+    "["
+    "]"
+    "{"
+] @punctuation.bracket
+
+(hash [
+    "}"
+] @punctuation.bracket)
+

From 5e1c589d43ee92412a97bfb0dd3d5b333eac4971 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Oct 2022 18:44:40 -0500
Subject: [PATCH 238/884] build(deps): bump serde_json from 1.0.85 to 1.0.86
 (#4187)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 45eb9023..d4befc96 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -937,9 +937,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.85"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
+checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074"
 dependencies = [
  "itoa",
  "ryu",

From 001858b11fb60926725e061ec31dfa9c77562148 Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Tue, 11 Oct 2022 05:40:01 +0530
Subject: [PATCH 239/884] Propagate idle timeout event to components (#3172)

---
 helix-term/src/application.rs |  9 ++-------
 helix-term/src/ui/editor.rs   | 13 +++----------
 helix-view/src/input.rs       |  1 +
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index c7d98fce..4bb36b59 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -435,18 +435,13 @@ impl Application {
     }
 
     pub fn handle_idle_timeout(&mut self) {
-        use crate::compositor::EventResult;
-        let editor_view = self
-            .compositor
-            .find::<ui::EditorView>()
-            .expect("expected at least one EditorView");
-
         let mut cx = crate::compositor::Context {
             editor: &mut self.editor,
             jobs: &mut self.jobs,
             scroll: None,
         };
-        if let EventResult::Consumed(_) = editor_view.handle_idle_timeout(&mut cx) {
+        let should_render = self.compositor.handle_event(&Event::IdleTimeout, &mut cx);
+        if should_render {
             self.render();
         }
     }
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 47fb7a4a..18e1271f 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1066,7 +1066,7 @@ impl EditorView {
         editor.clear_idle_timer(); // don't retrigger
     }
 
-    pub fn handle_idle_timeout(&mut self, cx: &mut crate::compositor::Context) -> EventResult {
+    pub fn handle_idle_timeout(&mut self, cx: &mut commands::Context) -> EventResult {
         if self.completion.is_some()
             || cx.editor.mode != Mode::Insert
             || !cx.editor.config().auto_completion
@@ -1074,15 +1074,7 @@ impl EditorView {
             return EventResult::Ignored(None);
         }
 
-        let mut cx = commands::Context {
-            register: None,
-            editor: cx.editor,
-            jobs: cx.jobs,
-            count: None,
-            callback: None,
-            on_next_key_callback: None,
-        };
-        crate::commands::insert::idle_completion(&mut cx);
+        crate::commands::insert::idle_completion(cx);
 
         EventResult::Consumed(None)
     }
@@ -1403,6 +1395,7 @@ impl Component for EditorView {
             }
 
             Event::Mouse(event) => self.handle_mouse_event(event, &mut cx),
+            Event::IdleTimeout => self.handle_idle_timeout(&mut cx),
             Event::FocusGained | Event::FocusLost => EventResult::Ignored(None),
         }
     }
diff --git a/helix-view/src/input.rs b/helix-view/src/input.rs
index 083a1e08..30fa72c4 100644
--- a/helix-view/src/input.rs
+++ b/helix-view/src/input.rs
@@ -14,6 +14,7 @@ pub enum Event {
     Mouse(MouseEvent),
     Paste(String),
     Resize(u16, u16),
+    IdleTimeout,
 }
 
 #[derive(Debug, PartialOrd, PartialEq, Eq, Clone, Copy, Hash)]

From a85e3862988933953d1c0e7435969604d3722959 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 11 Oct 2022 09:53:55 +0900
Subject: [PATCH 240/884] picker: Highlight the document on idle timeout

---
 helix-term/src/ui/picker.rs | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index a56455d7..49eb986b 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -161,6 +161,27 @@ impl<T: Item> FilePicker<T> {
         self.preview_cache.insert(path.to_owned(), preview);
         Preview::Cached(&self.preview_cache[path])
     }
+
+    fn handle_idle_timeout(&mut self, cx: &mut Context) -> EventResult {
+        // Try to find a document in the cache
+        let doc = self
+            .current_file(cx.editor)
+            .and_then(|(path, _range)| self.preview_cache.get_mut(&path))
+            .and_then(|cache| match cache {
+                CachedPreview::Document(doc) => Some(doc),
+                _ => None,
+            });
+
+        // Then attempt to highlight it if it has no language set
+        if let Some(doc) = doc {
+            if doc.language_config().is_none() {
+                let loader = cx.editor.syn_loader.clone();
+                doc.detect_language(loader);
+            }
+        }
+
+        EventResult::Consumed(None)
+    }
 }
 
 impl<T: Item + 'static> Component for FilePicker<T> {
@@ -261,6 +282,9 @@ impl<T: Item + 'static> Component for FilePicker<T> {
     }
 
     fn handle_event(&mut self, event: &Event, ctx: &mut Context) -> EventResult {
+        if let Event::IdleTimeout = event {
+            return self.handle_idle_timeout(ctx);
+        }
         // TODO: keybinds for scrolling preview
         self.picker.handle_event(event, ctx)
     }
@@ -505,6 +529,9 @@ impl<T: Item + 'static> Component for Picker<T> {
             compositor.last_picker = compositor.pop();
         })));
 
+        // So that idle timeout retriggers
+        cx.editor.reset_idle_timer();
+
         match key_event {
             shift!(Tab) | key!(Up) | ctrl!('p') => {
                 self.move_by(1, Direction::Backward);

From d418f0795d8a33c83ad87c5530c4819d83da09ef Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 10 Oct 2022 14:54:57 -0500
Subject: [PATCH 241/884] Add View::apply for adjusting jumplist ranges

Applying a transaction to a View adjusts the ranges in the jumplist
to ensure that they remain within the text of the document and follow
regular selection invariants (for example, must be have a width of at
least one).
---
 helix-view/src/view.rs | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index 3df533df..62984b88 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -3,7 +3,9 @@ use crate::{
     gutter::{self, Gutter},
     Document, DocumentId, ViewId,
 };
-use helix_core::{pos_at_visual_coords, visual_coords_at_pos, Position, RopeSlice, Selection};
+use helix_core::{
+    pos_at_visual_coords, visual_coords_at_pos, Position, RopeSlice, Selection, Transaction,
+};
 
 use std::fmt;
 
@@ -62,6 +64,22 @@ impl JumpList {
     pub fn get(&self) -> &[Jump] {
         &self.jumps
     }
+
+    /// Applies a [`Transaction`] of changes to the jumplist.
+    /// This is necessary to ensure that changes to documents do not leave jump-list
+    /// selections pointing to parts of the text which no longer exist.
+    fn apply(&mut self, transaction: &Transaction, doc: &Document) {
+        let text = doc.text().slice(..);
+
+        for (doc_id, selection) in &mut self.jumps {
+            if doc.id() == *doc_id {
+                *selection = selection
+                    .clone()
+                    .map(transaction.changes())
+                    .ensure_invariants(text);
+            }
+        }
+    }
 }
 
 #[derive(Clone)]
@@ -334,6 +352,14 @@ impl View {
     //         (None, None) => return,
     //     }
     // }
+
+    /// Applies a [`Transaction`] to the view.
+    /// Instead of calling this function directly, use [crate::apply_transaction]
+    /// which applies a transaction to the [`Document`] and view together.
+    pub fn apply(&mut self, transaction: &Transaction, doc: &Document) -> bool {
+        self.jumps.apply(transaction, doc);
+        true
+    }
 }
 
 #[cfg(test)]

From 0aedef03334dfc0cb2a723cce23abc5b4ca55a22 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 10 Oct 2022 14:56:26 -0500
Subject: [PATCH 242/884] Apply transactions to Views

This change adds View::apply calls for all Document::apply call-sites,
ensuring that changes to a document do not leave invalid entries in
the View's jumplist.
---
 helix-term/src/commands.rs       | 43 ++++++++++++++++++++++++++------
 helix-term/src/commands/lsp.rs   |  5 ++--
 helix-term/src/commands/typed.rs |  6 ++++-
 helix-term/src/ui/completion.rs  |  7 ++++--
 helix-term/src/ui/editor.rs      |  3 ++-
 helix-view/src/document.rs       | 14 ++++++-----
 6 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 2db5bfcf..e2bd9402 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -860,6 +860,7 @@ fn align_selections(cx: &mut Context) {
 
     let transaction = Transaction::change(doc.text(), changes.into_iter());
     doc.apply(&transaction, view.id);
+    view.apply(&transaction, doc);
 }
 
 fn goto_window(cx: &mut Context, align: Align) {
@@ -1290,6 +1291,7 @@ fn replace(cx: &mut Context) {
             });
 
             doc.apply(&transaction, view.id);
+            view.apply(&transaction, doc);
         }
     })
 }
@@ -1307,6 +1309,7 @@ where
     });
 
     doc.apply(&transaction, view.id);
+    view.apply(&transaction, doc);
 }
 
 fn switch_case(cx: &mut Context) {
@@ -2113,6 +2116,7 @@ fn delete_selection_impl(cx: &mut Context, op: Operation) {
         (range.from(), range.to(), None)
     });
     doc.apply(&transaction, view.id);
+    view.apply(&transaction, doc);
 
     match op {
         Operation::Delete => {
@@ -2126,7 +2130,7 @@ fn delete_selection_impl(cx: &mut Context, op: Operation) {
 }
 
 #[inline]
-fn delete_selection_insert_mode(doc: &mut Document, view: &View, selection: &Selection) {
+fn delete_selection_insert_mode(doc: &mut Document, view: &mut View, selection: &Selection) {
     let view_id = view.id;
 
     // then delete
@@ -2134,6 +2138,7 @@ fn delete_selection_insert_mode(doc: &mut Document, view: &View, selection: &Sel
         (range.from(), range.to(), None)
     });
     doc.apply(&transaction, view_id);
+    view.apply(&transaction, doc);
 }
 
 fn delete_selection(cx: &mut Context) {
@@ -2230,6 +2235,7 @@ fn append_mode(cx: &mut Context) {
             [(end, end, Some(doc.line_ending.as_str().into()))].into_iter(),
         );
         doc.apply(&transaction, view.id);
+        view.apply(&transaction, doc);
     }
 
     let selection = doc.selection(view.id).clone().transform(|range| {
@@ -2530,6 +2536,7 @@ async fn make_format_callback(
         let view = view_mut!(editor);
         if doc.version() == doc_version {
             doc.apply(&format, view.id);
+            view.apply(&format, doc);
             doc.append_changes_to_history(view.id);
             doc.detect_indent_and_line_ending();
             view.ensure_cursor_in_view(doc, scrolloff);
@@ -2617,6 +2624,7 @@ fn open(cx: &mut Context, open: Open) {
     transaction = transaction.with_selection(Selection::new(ranges, selection.primary_index()));
 
     doc.apply(&transaction, view.id);
+    view.apply(&transaction, doc);
 }
 
 // o inserts a new line after each line with a selection
@@ -2637,7 +2645,7 @@ fn normal_mode(cx: &mut Context) {
     cx.editor.mode = Mode::Normal;
     let (view, doc) = current!(cx.editor);
 
-    try_restore_indent(doc, view.id);
+    try_restore_indent(doc, view);
 
     // if leaving append mode, move cursor back by 1
     if doc.restore_cursor {
@@ -2654,7 +2662,7 @@ fn normal_mode(cx: &mut Context) {
     }
 }
 
-fn try_restore_indent(doc: &mut Document, view_id: ViewId) {
+fn try_restore_indent(doc: &mut Document, view: &mut View) {
     use helix_core::chars::char_is_whitespace;
     use helix_core::Operation;
 
@@ -2673,18 +2681,19 @@ fn try_restore_indent(doc: &mut Document, view_id: ViewId) {
 
     let doc_changes = doc.changes().changes();
     let text = doc.text().slice(..);
-    let range = doc.selection(view_id).primary();
+    let range = doc.selection(view.id).primary();
     let pos = range.cursor(text);
     let line_end_pos = line_end_char_index(&text, range.cursor_line(text));
 
     if inserted_a_new_blank_line(doc_changes, pos, line_end_pos) {
         // Removes tailing whitespaces.
         let transaction =
-            Transaction::change_by_selection(doc.text(), doc.selection(view_id), |range| {
+            Transaction::change_by_selection(doc.text(), doc.selection(view.id), |range| {
                 let line_start_pos = text.line_to_char(range.cursor_line(text));
                 (line_start_pos, pos, None)
             });
-        doc.apply(&transaction, view_id);
+        doc.apply(&transaction, view.id);
+        view.apply(&transaction, doc);
     }
 }
 
@@ -2999,6 +3008,7 @@ pub mod insert {
         let (view, doc) = current!(cx.editor);
         if let Some(t) = transaction {
             doc.apply(&t, view.id);
+            view.apply(&t, doc);
         }
 
         // TODO: need a post insert hook too for certain triggers (autocomplete, signature help, etc)
@@ -3021,6 +3031,7 @@ pub mod insert {
             indent,
         );
         doc.apply(&transaction, view.id);
+        view.apply(&transaction, doc);
     }
 
     pub fn insert_newline(cx: &mut Context) {
@@ -3108,6 +3119,7 @@ pub mod insert {
 
         let (view, doc) = current!(cx.editor);
         doc.apply(&transaction, view.id);
+        view.apply(&transaction, doc);
     }
 
     pub fn delete_char_backward(cx: &mut Context) {
@@ -3202,6 +3214,7 @@ pub mod insert {
             });
         let (view, doc) = current!(cx.editor);
         doc.apply(&transaction, view.id);
+        view.apply(&transaction, doc);
 
         lsp::signature_help_impl(cx, SignatureHelpInvoked::Automatic);
     }
@@ -3220,6 +3233,7 @@ pub mod insert {
                 )
             });
         doc.apply(&transaction, view.id);
+        view.apply(&transaction, doc);
 
         lsp::signature_help_impl(cx, SignatureHelpInvoked::Automatic);
     }
@@ -3413,7 +3427,7 @@ enum Paste {
     Cursor,
 }
 
-fn paste_impl(values: &[String], doc: &mut Document, view: &View, action: Paste, count: usize) {
+fn paste_impl(values: &[String], doc: &mut Document, view: &mut View, action: Paste, count: usize) {
     let repeat = std::iter::repeat(
         values
             .last()
@@ -3457,6 +3471,7 @@ fn paste_impl(values: &[String], doc: &mut Document, view: &View, action: Paste,
         (pos, pos, values.next())
     });
     doc.apply(&transaction, view.id);
+    view.apply(&transaction, doc);
 }
 
 pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {
@@ -3549,6 +3564,7 @@ fn replace_with_yanked(cx: &mut Context) {
             });
 
             doc.apply(&transaction, view.id);
+            view.apply(&transaction, doc);
         }
     }
 }
@@ -3572,6 +3588,7 @@ fn replace_selections_with_clipboard_impl(
             });
 
             doc.apply(&transaction, view.id);
+            view.apply(&transaction, doc);
             doc.append_changes_to_history(view.id);
             Ok(())
         }
@@ -3642,6 +3659,7 @@ fn indent(cx: &mut Context) {
         }),
     );
     doc.apply(&transaction, view.id);
+    view.apply(&transaction, doc);
 }
 
 fn unindent(cx: &mut Context) {
@@ -3681,6 +3699,7 @@ fn unindent(cx: &mut Context) {
     let transaction = Transaction::change(doc.text(), changes.into_iter());
 
     doc.apply(&transaction, view.id);
+    view.apply(&transaction, doc);
 }
 
 fn format_selections(cx: &mut Context) {
@@ -3728,6 +3747,7 @@ fn format_selections(cx: &mut Context) {
         // );
 
         // doc.apply(&transaction, view.id);
+        // view.apply(&transaction, doc);
     }
 }
 
@@ -3783,6 +3803,7 @@ fn join_selections_inner(cx: &mut Context, select_space: bool) {
     };
 
     doc.apply(&transaction, view.id);
+    view.apply(&transaction, doc);
 }
 
 fn keep_or_remove_selections_impl(cx: &mut Context, remove: bool) {
@@ -3936,6 +3957,7 @@ fn toggle_comments(cx: &mut Context) {
     let transaction = comment::toggle_line_comments(doc.text(), doc.selection(view.id), token);
 
     doc.apply(&transaction, view.id);
+    view.apply(&transaction, doc);
     exit_select_mode(cx);
 }
 
@@ -3992,6 +4014,7 @@ fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
     );
 
     doc.apply(&transaction, view.id);
+    view.apply(&transaction, doc);
 }
 
 fn rotate_selection_contents_forward(cx: &mut Context) {
@@ -4488,6 +4511,7 @@ fn surround_add(cx: &mut Context) {
 
         let transaction = Transaction::change(doc.text(), changes.into_iter());
         doc.apply(&transaction, view.id);
+        view.apply(&transaction, doc);
     })
 }
 
@@ -4527,6 +4551,7 @@ fn surround_replace(cx: &mut Context) {
                 }),
             );
             doc.apply(&transaction, view.id);
+            view.apply(&transaction, doc);
         });
     })
 }
@@ -4554,6 +4579,7 @@ fn surround_delete(cx: &mut Context) {
         let transaction =
             Transaction::change(doc.text(), change_pos.into_iter().map(|p| (p, p + 1, None)));
         doc.apply(&transaction, view.id);
+        view.apply(&transaction, doc);
     })
 }
 
@@ -4729,6 +4755,7 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
     if behavior != &ShellBehavior::Ignore {
         let transaction = Transaction::change(doc.text(), changes.into_iter());
         doc.apply(&transaction, view.id);
+        view.apply(&transaction, doc);
         doc.append_changes_to_history(view.id);
     }
 
@@ -4792,6 +4819,7 @@ fn add_newline_impl(cx: &mut Context, open: Open) {
 
     let transaction = Transaction::change(text, changes);
     doc.apply(&transaction, view.id);
+    view.apply(&transaction, doc);
 }
 
 /// Increment object under cursor by count.
@@ -4885,6 +4913,7 @@ fn increment_impl(cx: &mut Context, amount: i64) {
         let transaction = transaction.with_selection(selection.clone());
 
         doc.apply(&transaction, view.id);
+        view.apply(&transaction, doc);
     }
 }
 
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 1113b44e..726aec67 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -596,9 +596,7 @@ pub fn apply_workspace_edit(
             }
         };
 
-        let doc = editor
-            .document_mut(doc_id)
-            .expect("Document for document_changes not found");
+        let doc = doc_mut!(editor, &doc_id);
 
         // Need to determine a view for apply/append_changes_to_history
         let selections = doc.selections();
@@ -620,6 +618,7 @@ pub fn apply_workspace_edit(
             offset_encoding,
         );
         doc.apply(&transaction, view_id);
+        view_mut!(editor, view_id).apply(&transaction, doc);
         doc.append_changes_to_history(view_id);
     };
 
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 96ff75c5..574e895b 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -463,6 +463,7 @@ fn set_line_ending(
         }),
     );
     doc.apply(&transaction, view.id);
+    view.apply(&transaction, doc);
     doc.append_changes_to_history(view.id);
 
     Ok(())
@@ -884,6 +885,7 @@ fn replace_selections_with_clipboard_impl(
             });
 
             doc.apply(&transaction, view.id);
+            view.apply(&transaction, doc);
             doc.append_changes_to_history(view.id);
             Ok(())
         }
@@ -1004,7 +1006,7 @@ fn reload(
 
     let scrolloff = cx.editor.config().scrolloff;
     let (view, doc) = current!(cx.editor);
-    doc.reload(view.id).map(|_| {
+    doc.reload(view).map(|_| {
         view.ensure_cursor_in_view(doc, scrolloff);
     })
 }
@@ -1399,6 +1401,7 @@ fn sort_impl(
     );
 
     doc.apply(&transaction, view.id);
+    view.apply(&transaction, doc);
     doc.append_changes_to_history(view.id);
 
     Ok(())
@@ -1443,6 +1446,7 @@ fn reflow(
     });
 
     doc.apply(&transaction, view.id);
+    view.apply(&transaction, doc);
     doc.append_changes_to_history(view.id);
     view.ensure_cursor_in_view(doc, scrolloff);
 
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 2d7d4f92..c0a5da2e 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -143,11 +143,11 @@ impl Completion {
             let (view, doc) = current!(editor);
 
             // if more text was entered, remove it
-            doc.restore(view.id);
+            doc.restore(view);
 
             match event {
                 PromptEvent::Abort => {
-                    doc.restore(view.id);
+                    doc.restore(view);
                     editor.last_completion = None;
                 }
                 PromptEvent::Update => {
@@ -165,6 +165,7 @@ impl Completion {
                     // initialize a savepoint
                     doc.savepoint();
                     doc.apply(&transaction, view.id);
+                    view.apply(&transaction, doc);
 
                     editor.last_completion = Some(CompleteAction {
                         trigger_offset,
@@ -184,6 +185,7 @@ impl Completion {
                     );
 
                     doc.apply(&transaction, view.id);
+                    view.apply(&transaction, doc);
 
                     editor.last_completion = Some(CompleteAction {
                         trigger_offset,
@@ -214,6 +216,7 @@ impl Completion {
                                 offset_encoding, // TODO: should probably transcode in Client
                             );
                             doc.apply(&transaction, view.id);
+                            view.apply(&transaction, doc);
                         }
                     }
                 }
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 18e1271f..3b71748b 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -988,7 +988,7 @@ impl EditorView {
                         InsertEvent::CompletionApply(compl) => {
                             let (view, doc) = current!(cxt.editor);
 
-                            doc.restore(view.id);
+                            doc.restore(view);
 
                             let text = doc.text().slice(..);
                             let cursor = doc.selection(view.id).primary().cursor(text);
@@ -1003,6 +1003,7 @@ impl EditorView {
                                 }),
                             );
                             doc.apply(&tx, view.id);
+                            view.apply(&tx, doc);
                         }
                         InsertEvent::TriggerCompletion => {
                             let (_, doc) = current!(cxt.editor);
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index b6b2f664..631c540b 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -24,7 +24,7 @@ use helix_core::{
     DEFAULT_LINE_ENDING,
 };
 
-use crate::{DocumentId, Editor, ViewId};
+use crate::{DocumentId, Editor, View, ViewId};
 
 /// 8kB of buffer space for encoding and decoding `Rope`s.
 const BUF_SIZE: usize = 8192;
@@ -601,7 +601,7 @@ impl Document {
     }
 
     /// Reload the document from its path.
-    pub fn reload(&mut self, view_id: ViewId) -> Result<(), Error> {
+    pub fn reload(&mut self, view: &mut View) -> Result<(), Error> {
         let encoding = &self.encoding;
         let path = self.path().filter(|path| path.exists());
 
@@ -617,8 +617,9 @@ impl Document {
         // This is not considered a modification of the contents of the file regardless
         // of the encoding.
         let transaction = helix_core::diff::compare_ropes(self.text(), &rope);
-        self.apply(&transaction, view_id);
-        self.append_changes_to_history(view_id);
+        self.apply(&transaction, view.id);
+        view.apply(&transaction, self);
+        self.append_changes_to_history(view.id);
         self.reset_modified();
 
         self.detect_indent_and_line_ending();
@@ -862,9 +863,10 @@ impl Document {
         self.savepoint = Some(Transaction::new(self.text()));
     }
 
-    pub fn restore(&mut self, view_id: ViewId) {
+    pub fn restore(&mut self, view: &mut View) {
         if let Some(revert) = self.savepoint.take() {
-            self.apply(&revert, view_id);
+            self.apply(&revert, view.id);
+            view.apply(&revert, self);
         }
     }
 

From c388e16e09b36c665c4f92db4f7a071e7c1d9761 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 10 Oct 2022 15:15:37 -0500
Subject: [PATCH 243/884] Add a helper function for applying transactions

It is easy to forget to call `Document::apply` and/or `View::apply` in
the correct order. This commit introduces a helper function which
closes over both calls.
---
 helix-term/src/commands.rs       | 91 +++++++++++---------------------
 helix-term/src/commands/lsp.rs   |  5 +-
 helix-term/src/commands/typed.rs | 17 +++---
 helix-term/src/ui/completion.rs  | 11 ++--
 helix-term/src/ui/editor.rs      |  4 +-
 helix-view/src/document.rs       | 11 ++--
 helix-view/src/lib.rs            | 13 +++++
 7 files changed, 65 insertions(+), 87 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index e2bd9402..754e4473 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -27,6 +27,7 @@ use helix_core::{
     SmallVec, Tendril, Transaction,
 };
 use helix_view::{
+    apply_transaction,
     clipboard::ClipboardType,
     document::{FormatterError, Mode, SCRATCH_BUFFER_NAME},
     editor::{Action, Motion},
@@ -859,8 +860,7 @@ fn align_selections(cx: &mut Context) {
     changes.sort_unstable_by_key(|(from, _, _)| *from);
 
     let transaction = Transaction::change(doc.text(), changes.into_iter());
-    doc.apply(&transaction, view.id);
-    view.apply(&transaction, doc);
+    apply_transaction(&transaction, doc, view);
 }
 
 fn goto_window(cx: &mut Context, align: Align) {
@@ -1290,8 +1290,7 @@ fn replace(cx: &mut Context) {
                 }
             });
 
-            doc.apply(&transaction, view.id);
-            view.apply(&transaction, doc);
+            apply_transaction(&transaction, doc, view);
         }
     })
 }
@@ -1308,8 +1307,7 @@ where
         (range.from(), range.to(), Some(text))
     });
 
-    doc.apply(&transaction, view.id);
-    view.apply(&transaction, doc);
+    apply_transaction(&transaction, doc, view);
 }
 
 fn switch_case(cx: &mut Context) {
@@ -2115,8 +2113,7 @@ fn delete_selection_impl(cx: &mut Context, op: Operation) {
     let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
         (range.from(), range.to(), None)
     });
-    doc.apply(&transaction, view.id);
-    view.apply(&transaction, doc);
+    apply_transaction(&transaction, doc, view);
 
     match op {
         Operation::Delete => {
@@ -2131,14 +2128,10 @@ fn delete_selection_impl(cx: &mut Context, op: Operation) {
 
 #[inline]
 fn delete_selection_insert_mode(doc: &mut Document, view: &mut View, selection: &Selection) {
-    let view_id = view.id;
-
-    // then delete
     let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
         (range.from(), range.to(), None)
     });
-    doc.apply(&transaction, view_id);
-    view.apply(&transaction, doc);
+    apply_transaction(&transaction, doc, view);
 }
 
 fn delete_selection(cx: &mut Context) {
@@ -2234,8 +2227,7 @@ fn append_mode(cx: &mut Context) {
             doc.text(),
             [(end, end, Some(doc.line_ending.as_str().into()))].into_iter(),
         );
-        doc.apply(&transaction, view.id);
-        view.apply(&transaction, doc);
+        apply_transaction(&transaction, doc, view);
     }
 
     let selection = doc.selection(view.id).clone().transform(|range| {
@@ -2535,8 +2527,7 @@ async fn make_format_callback(
         let doc = doc_mut!(editor, &doc_id);
         let view = view_mut!(editor);
         if doc.version() == doc_version {
-            doc.apply(&format, view.id);
-            view.apply(&format, doc);
+            apply_transaction(&format, doc, view);
             doc.append_changes_to_history(view.id);
             doc.detect_indent_and_line_ending();
             view.ensure_cursor_in_view(doc, scrolloff);
@@ -2623,8 +2614,7 @@ fn open(cx: &mut Context, open: Open) {
 
     transaction = transaction.with_selection(Selection::new(ranges, selection.primary_index()));
 
-    doc.apply(&transaction, view.id);
-    view.apply(&transaction, doc);
+    apply_transaction(&transaction, doc, view);
 }
 
 // o inserts a new line after each line with a selection
@@ -2692,8 +2682,7 @@ fn try_restore_indent(doc: &mut Document, view: &mut View) {
                 let line_start_pos = text.line_to_char(range.cursor_line(text));
                 (line_start_pos, pos, None)
             });
-        doc.apply(&transaction, view.id);
-        view.apply(&transaction, doc);
+        apply_transaction(&transaction, doc, view);
     }
 }
 
@@ -3007,8 +2996,7 @@ pub mod insert {
 
         let (view, doc) = current!(cx.editor);
         if let Some(t) = transaction {
-            doc.apply(&t, view.id);
-            view.apply(&t, doc);
+            apply_transaction(&t, doc, view);
         }
 
         // TODO: need a post insert hook too for certain triggers (autocomplete, signature help, etc)
@@ -3030,8 +3018,7 @@ pub mod insert {
             &doc.selection(view.id).clone().cursors(doc.text().slice(..)),
             indent,
         );
-        doc.apply(&transaction, view.id);
-        view.apply(&transaction, doc);
+        apply_transaction(&transaction, doc, view);
     }
 
     pub fn insert_newline(cx: &mut Context) {
@@ -3118,8 +3105,7 @@ pub mod insert {
         transaction = transaction.with_selection(Selection::new(ranges, selection.primary_index()));
 
         let (view, doc) = current!(cx.editor);
-        doc.apply(&transaction, view.id);
-        view.apply(&transaction, doc);
+        apply_transaction(&transaction, doc, view);
     }
 
     pub fn delete_char_backward(cx: &mut Context) {
@@ -3213,8 +3199,7 @@ pub mod insert {
                 }
             });
         let (view, doc) = current!(cx.editor);
-        doc.apply(&transaction, view.id);
-        view.apply(&transaction, doc);
+        apply_transaction(&transaction, doc, view);
 
         lsp::signature_help_impl(cx, SignatureHelpInvoked::Automatic);
     }
@@ -3232,8 +3217,7 @@ pub mod insert {
                     None,
                 )
             });
-        doc.apply(&transaction, view.id);
-        view.apply(&transaction, doc);
+        apply_transaction(&transaction, doc, view);
 
         lsp::signature_help_impl(cx, SignatureHelpInvoked::Automatic);
     }
@@ -3470,8 +3454,7 @@ fn paste_impl(values: &[String], doc: &mut Document, view: &mut View, action: Pa
         };
         (pos, pos, values.next())
     });
-    doc.apply(&transaction, view.id);
-    view.apply(&transaction, doc);
+    apply_transaction(&transaction, doc, view);
 }
 
 pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {
@@ -3563,8 +3546,7 @@ fn replace_with_yanked(cx: &mut Context) {
                 }
             });
 
-            doc.apply(&transaction, view.id);
-            view.apply(&transaction, doc);
+            apply_transaction(&transaction, doc, view);
         }
     }
 }
@@ -3587,8 +3569,7 @@ fn replace_selections_with_clipboard_impl(
                 )
             });
 
-            doc.apply(&transaction, view.id);
-            view.apply(&transaction, doc);
+            apply_transaction(&transaction, doc, view);
             doc.append_changes_to_history(view.id);
             Ok(())
         }
@@ -3658,8 +3639,7 @@ fn indent(cx: &mut Context) {
             Some((pos, pos, Some(indent.clone())))
         }),
     );
-    doc.apply(&transaction, view.id);
-    view.apply(&transaction, doc);
+    apply_transaction(&transaction, doc, view);
 }
 
 fn unindent(cx: &mut Context) {
@@ -3698,8 +3678,7 @@ fn unindent(cx: &mut Context) {
 
     let transaction = Transaction::change(doc.text(), changes.into_iter());
 
-    doc.apply(&transaction, view.id);
-    view.apply(&transaction, doc);
+    apply_transaction(&transaction, doc, view);
 }
 
 fn format_selections(cx: &mut Context) {
@@ -3746,8 +3725,7 @@ fn format_selections(cx: &mut Context) {
         //     language_server.offset_encoding(),
         // );
 
-        // doc.apply(&transaction, view.id);
-        // view.apply(&transaction, doc);
+        // apply_transaction(&transaction, doc, view);
     }
 }
 
@@ -3802,8 +3780,7 @@ fn join_selections_inner(cx: &mut Context, select_space: bool) {
         Transaction::change(doc.text(), changes.into_iter())
     };
 
-    doc.apply(&transaction, view.id);
-    view.apply(&transaction, doc);
+    apply_transaction(&transaction, doc, view);
 }
 
 fn keep_or_remove_selections_impl(cx: &mut Context, remove: bool) {
@@ -3956,8 +3933,7 @@ fn toggle_comments(cx: &mut Context) {
         .map(|tc| tc.as_ref());
     let transaction = comment::toggle_line_comments(doc.text(), doc.selection(view.id), token);
 
-    doc.apply(&transaction, view.id);
-    view.apply(&transaction, doc);
+    apply_transaction(&transaction, doc, view);
     exit_select_mode(cx);
 }
 
@@ -4013,8 +3989,7 @@ fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
             .map(|(range, fragment)| (range.from(), range.to(), Some(fragment))),
     );
 
-    doc.apply(&transaction, view.id);
-    view.apply(&transaction, doc);
+    apply_transaction(&transaction, doc, view);
 }
 
 fn rotate_selection_contents_forward(cx: &mut Context) {
@@ -4510,8 +4485,7 @@ fn surround_add(cx: &mut Context) {
         }
 
         let transaction = Transaction::change(doc.text(), changes.into_iter());
-        doc.apply(&transaction, view.id);
-        view.apply(&transaction, doc);
+        apply_transaction(&transaction, doc, view);
     })
 }
 
@@ -4550,8 +4524,7 @@ fn surround_replace(cx: &mut Context) {
                     (pos, pos + 1, Some(t))
                 }),
             );
-            doc.apply(&transaction, view.id);
-            view.apply(&transaction, doc);
+            apply_transaction(&transaction, doc, view);
         });
     })
 }
@@ -4578,8 +4551,7 @@ fn surround_delete(cx: &mut Context) {
 
         let transaction =
             Transaction::change(doc.text(), change_pos.into_iter().map(|p| (p, p + 1, None)));
-        doc.apply(&transaction, view.id);
-        view.apply(&transaction, doc);
+        apply_transaction(&transaction, doc, view);
     })
 }
 
@@ -4754,8 +4726,7 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
 
     if behavior != &ShellBehavior::Ignore {
         let transaction = Transaction::change(doc.text(), changes.into_iter());
-        doc.apply(&transaction, view.id);
-        view.apply(&transaction, doc);
+        apply_transaction(&transaction, doc, view);
         doc.append_changes_to_history(view.id);
     }
 
@@ -4818,8 +4789,7 @@ fn add_newline_impl(cx: &mut Context, open: Open) {
     });
 
     let transaction = Transaction::change(text, changes);
-    doc.apply(&transaction, view.id);
-    view.apply(&transaction, doc);
+    apply_transaction(&transaction, doc, view);
 }
 
 /// Increment object under cursor by count.
@@ -4912,8 +4882,7 @@ fn increment_impl(cx: &mut Context, amount: i64) {
         let transaction = Transaction::change(doc.text(), changes);
         let transaction = transaction.with_selection(selection.clone());
 
-        doc.apply(&transaction, view.id);
-        view.apply(&transaction, doc);
+        apply_transaction(&transaction, doc, view);
     }
 }
 
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 726aec67..3fa5c96f 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -9,7 +9,7 @@ use tui::text::{Span, Spans};
 use super::{align_view, push_jump, Align, Context, Editor, Open};
 
 use helix_core::{path, Selection};
-use helix_view::{editor::Action, theme::Style};
+use helix_view::{apply_transaction, editor::Action, theme::Style};
 
 use crate::{
     compositor::{self, Compositor},
@@ -617,8 +617,7 @@ pub fn apply_workspace_edit(
             text_edits,
             offset_encoding,
         );
-        doc.apply(&transaction, view_id);
-        view_mut!(editor, view_id).apply(&transaction, doc);
+        apply_transaction(&transaction, doc, view_mut!(editor, view_id));
         doc.append_changes_to_history(view_id);
     };
 
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 574e895b..726c7456 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -2,7 +2,10 @@ use std::ops::Deref;
 
 use super::*;
 
-use helix_view::editor::{Action, CloseError, ConfigEvent};
+use helix_view::{
+    apply_transaction,
+    editor::{Action, CloseError, ConfigEvent},
+};
 use ui::completers::{self, Completer};
 
 #[derive(Clone)]
@@ -462,8 +465,7 @@ fn set_line_ending(
             }
         }),
     );
-    doc.apply(&transaction, view.id);
-    view.apply(&transaction, doc);
+    apply_transaction(&transaction, doc, view);
     doc.append_changes_to_history(view.id);
 
     Ok(())
@@ -884,8 +886,7 @@ fn replace_selections_with_clipboard_impl(
                 (range.from(), range.to(), Some(contents.as_str().into()))
             });
 
-            doc.apply(&transaction, view.id);
-            view.apply(&transaction, doc);
+            apply_transaction(&transaction, doc, view);
             doc.append_changes_to_history(view.id);
             Ok(())
         }
@@ -1400,8 +1401,7 @@ fn sort_impl(
             .map(|(s, fragment)| (s.from(), s.to(), Some(fragment))),
     );
 
-    doc.apply(&transaction, view.id);
-    view.apply(&transaction, doc);
+    apply_transaction(&transaction, doc, view);
     doc.append_changes_to_history(view.id);
 
     Ok(())
@@ -1445,8 +1445,7 @@ fn reflow(
         (range.from(), range.to(), Some(reflowed_text))
     });
 
-    doc.apply(&transaction, view.id);
-    view.apply(&transaction, doc);
+    apply_transaction(&transaction, doc, view);
     doc.append_changes_to_history(view.id);
     view.ensure_cursor_in_view(doc, scrolloff);
 
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index c0a5da2e..7348dcf4 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -1,5 +1,5 @@
 use crate::compositor::{Component, Context, Event, EventResult};
-use helix_view::editor::CompleteAction;
+use helix_view::{apply_transaction, editor::CompleteAction};
 use tui::buffer::Buffer as Surface;
 use tui::text::Spans;
 
@@ -164,8 +164,7 @@ impl Completion {
 
                     // initialize a savepoint
                     doc.savepoint();
-                    doc.apply(&transaction, view.id);
-                    view.apply(&transaction, doc);
+                    apply_transaction(&transaction, doc, view);
 
                     editor.last_completion = Some(CompleteAction {
                         trigger_offset,
@@ -184,8 +183,7 @@ impl Completion {
                         trigger_offset,
                     );
 
-                    doc.apply(&transaction, view.id);
-                    view.apply(&transaction, doc);
+                    apply_transaction(&transaction, doc, view);
 
                     editor.last_completion = Some(CompleteAction {
                         trigger_offset,
@@ -215,8 +213,7 @@ impl Completion {
                                 additional_edits.clone(),
                                 offset_encoding, // TODO: should probably transcode in Client
                             );
-                            doc.apply(&transaction, view.id);
-                            view.apply(&transaction, doc);
+                            apply_transaction(&transaction, doc, view);
                         }
                     }
                 }
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 3b71748b..4e4fd49c 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -16,6 +16,7 @@ use helix_core::{
     visual_coords_at_pos, LineEnding, Position, Range, Selection, Transaction,
 };
 use helix_view::{
+    apply_transaction,
     document::{Mode, SCRATCH_BUFFER_NAME},
     editor::{CompleteAction, CursorShapeConfig},
     graphics::{Color, CursorKind, Modifier, Rect, Style},
@@ -1002,8 +1003,7 @@ impl EditorView {
                                     (shift_position(start), shift_position(end), t)
                                 }),
                             );
-                            doc.apply(&tx, view.id);
-                            view.apply(&tx, doc);
+                            apply_transaction(&tx, doc, view);
                         }
                         InsertEvent::TriggerCompletion => {
                             let (_, doc) = current!(cxt.editor);
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 631c540b..93708339 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -24,7 +24,7 @@ use helix_core::{
     DEFAULT_LINE_ENDING,
 };
 
-use crate::{DocumentId, Editor, View, ViewId};
+use crate::{apply_transaction, DocumentId, Editor, View, ViewId};
 
 /// 8kB of buffer space for encoding and decoding `Rope`s.
 const BUF_SIZE: usize = 8192;
@@ -617,8 +617,7 @@ impl Document {
         // This is not considered a modification of the contents of the file regardless
         // of the encoding.
         let transaction = helix_core::diff::compare_ropes(self.text(), &rope);
-        self.apply(&transaction, view.id);
-        view.apply(&transaction, self);
+        apply_transaction(&transaction, self, view);
         self.append_changes_to_history(view.id);
         self.reset_modified();
 
@@ -811,6 +810,9 @@ impl Document {
     }
 
     /// Apply a [`Transaction`] to the [`Document`] to change its text.
+    /// Instead of calling this function directly, use [crate::apply_transaction]
+    /// to ensure that the transaction is applied to the appropriate [`View`] as
+    /// well.
     pub fn apply(&mut self, transaction: &Transaction, view_id: ViewId) -> bool {
         // store the state just before any changes are made. This allows us to undo to the
         // state just before a transaction was applied.
@@ -865,8 +867,7 @@ impl Document {
 
     pub fn restore(&mut self, view: &mut View) {
         if let Some(revert) = self.savepoint.take() {
-            self.apply(&revert, view.id);
-            view.apply(&revert, self);
+            apply_transaction(&revert, self, view);
         }
     }
 
diff --git a/helix-view/src/lib.rs b/helix-view/src/lib.rs
index 0145677d..276be441 100644
--- a/helix-view/src/lib.rs
+++ b/helix-view/src/lib.rs
@@ -64,6 +64,19 @@ pub fn align_view(doc: &Document, view: &mut View, align: Align) {
     view.offset.row = line.saturating_sub(relative);
 }
 
+/// Applies a [`helix_core::Transaction`] to the given [`Document`]
+/// and [`View`].
+pub fn apply_transaction(
+    transaction: &helix_core::Transaction,
+    doc: &mut Document,
+    view: &mut View,
+) -> bool {
+    // This is a short function but it's easy to call `Document::apply`
+    // without calling `View::apply` or in the wrong order. The transaction
+    // must be applied to the document before the view.
+    doc.apply(transaction, view.id) && view.apply(transaction, doc)
+}
+
 pub use document::Document;
 pub use editor::Editor;
 pub use theme::Theme;

From 7af599e0af964d1ea9d3e454782ac5d977f1621f Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Sun, 25 Sep 2022 23:43:24 +0200
Subject: [PATCH 244/884] Treat space as a seperator instead of a character in
 fuzzy picker

---
 helix-term/src/ui/fuzzy_match.rs      | 74 +++++++++++++++++++++++++++
 helix-term/src/ui/fuzzy_match/test.rs | 47 +++++++++++++++++
 helix-term/src/ui/mod.rs              |  1 +
 helix-term/src/ui/picker.rs           | 16 +++---
 4 files changed, 130 insertions(+), 8 deletions(-)
 create mode 100644 helix-term/src/ui/fuzzy_match.rs
 create mode 100644 helix-term/src/ui/fuzzy_match/test.rs

diff --git a/helix-term/src/ui/fuzzy_match.rs b/helix-term/src/ui/fuzzy_match.rs
new file mode 100644
index 00000000..e25d7328
--- /dev/null
+++ b/helix-term/src/ui/fuzzy_match.rs
@@ -0,0 +1,74 @@
+use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
+use fuzzy_matcher::FuzzyMatcher;
+
+#[cfg(test)]
+mod test;
+
+pub struct FuzzyQuery {
+    queries: Vec<String>,
+}
+
+impl FuzzyQuery {
+    pub fn new(query: &str) -> FuzzyQuery {
+        let mut saw_backslash = false;
+        let queries = query
+            .split(|c| {
+                saw_backslash = match c {
+                    ' ' if !saw_backslash => return true,
+                    '\\' => true,
+                    _ => false,
+                };
+                false
+            })
+            .filter_map(|query| {
+                if query.is_empty() {
+                    None
+                } else {
+                    Some(query.replace("\\ ", " "))
+                }
+            })
+            .collect();
+        FuzzyQuery { queries }
+    }
+
+    pub fn fuzzy_match(&self, item: &str, matcher: &Matcher) -> Option<i64> {
+        // use the rank of the first query for the rank, because merging ranks is not really possible
+        // this behaviour matches fzf and skim
+        let score = matcher.fuzzy_match(item, self.queries.get(0)?)?;
+        if self
+            .queries
+            .iter()
+            .any(|query| matcher.fuzzy_match(item, query).is_none())
+        {
+            return None;
+        }
+        Some(score)
+    }
+
+    pub fn fuzzy_indicies(&self, item: &str, matcher: &Matcher) -> Option<(i64, Vec<usize>)> {
+        if self.queries.len() == 1 {
+            return matcher.fuzzy_indices(item, &self.queries[0]);
+        }
+
+        // use the rank of the first query for the rank, because merging ranks is not really possible
+        // this behaviour matches fzf and skim
+        let (score, mut indicies) = matcher.fuzzy_indices(item, self.queries.get(0)?)?;
+
+        // fast path for the common case of not using a space
+        // during matching this branch should be free thanks to branch prediction
+        if self.queries.len() == 1 {
+            return Some((score, indicies));
+        }
+
+        for query in &self.queries[1..] {
+            let (_, matched_indicies) = matcher.fuzzy_indices(item, query)?;
+            indicies.extend_from_slice(&matched_indicies);
+        }
+
+        // deadup and remove duplicate matches
+        indicies.sort_unstable();
+        indicies.dedup();
+
+        Some((score, indicies))
+    }
+}
diff --git a/helix-term/src/ui/fuzzy_match/test.rs b/helix-term/src/ui/fuzzy_match/test.rs
new file mode 100644
index 00000000..3f90ef68
--- /dev/null
+++ b/helix-term/src/ui/fuzzy_match/test.rs
@@ -0,0 +1,47 @@
+use crate::ui::fuzzy_match::FuzzyQuery;
+use crate::ui::fuzzy_match::Matcher;
+
+fn run_test<'a>(query: &str, items: &'a [&'a str]) -> Vec<String> {
+    let query = FuzzyQuery::new(query);
+    let matcher = Matcher::default();
+    items
+        .iter()
+        .filter_map(|item| {
+            let (_, indicies) = query.fuzzy_indicies(item, &matcher)?;
+            let matched_string = indicies
+                .iter()
+                .map(|&pos| item.chars().nth(pos).unwrap())
+                .collect();
+            Some(matched_string)
+        })
+        .collect()
+}
+
+#[test]
+fn match_single_value() {
+    let matches = run_test("foo", &["foobar", "foo", "bar"]);
+    assert_eq!(matches, &["foo", "foo"])
+}
+
+#[test]
+fn match_multiple_values() {
+    let matches = run_test(
+        "foo bar",
+        &["foo bar", "foo   bar", "bar foo", "bar", "foo"],
+    );
+    assert_eq!(matches, &["foobar", "foobar", "barfoo"])
+}
+
+#[test]
+fn space_escape() {
+    let matches = run_test(r"foo\ bar", &["bar foo", "foo bar", "foobar"]);
+    assert_eq!(matches, &["foo bar"])
+}
+
+#[test]
+fn trim() {
+    let matches = run_test(r" foo bar ", &["bar foo", "foo bar", "foobar"]);
+    assert_eq!(matches, &["barfoo", "foobar", "foobar"]);
+    let matches = run_test(r" foo bar\ ", &["bar foo", "foo bar", "foobar"]);
+    assert_eq!(matches, &["bar foo"])
+}
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 8ab15bff..6ac4dbb7 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -1,5 +1,6 @@
 mod completion;
 pub(crate) mod editor;
+mod fuzzy_match;
 mod info;
 pub mod lsp;
 mod markdown;
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 49eb986b..ac97e3cc 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -1,7 +1,7 @@
 use crate::{
     compositor::{Component, Compositor, Context, Event, EventResult},
     ctrl, key, shift,
-    ui::{self, EditorView},
+    ui::{self, fuzzy_match::FuzzyQuery, EditorView},
 };
 use tui::{
     buffer::Buffer as Surface,
@@ -9,7 +9,6 @@ use tui::{
 };
 
 use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
-use fuzzy_matcher::FuzzyMatcher;
 use tui::widgets::Widget;
 
 use std::time::Instant;
@@ -389,13 +388,14 @@ impl<T: Item> Picker<T> {
                     .map(|(index, _option)| (index, 0)),
             );
         } else if pattern.starts_with(&self.previous_pattern) {
+            let query = FuzzyQuery::new(pattern);
             // optimization: if the pattern is a more specific version of the previous one
             // then we can score the filtered set.
             self.matches.retain_mut(|(index, score)| {
                 let option = &self.options[*index];
                 let text = option.sort_text(&self.editor_data);
 
-                match self.matcher.fuzzy_match(&text, pattern) {
+                match query.fuzzy_match(&text, &self.matcher) {
                     Some(s) => {
                         // Update the score
                         *score = s;
@@ -408,6 +408,7 @@ impl<T: Item> Picker<T> {
             self.matches
                 .sort_unstable_by_key(|(_, score)| Reverse(*score));
         } else {
+            let query = FuzzyQuery::new(pattern);
             self.matches.clear();
             self.matches.extend(
                 self.options
@@ -423,8 +424,8 @@ impl<T: Item> Picker<T> {
 
                         let text = option.filter_text(&self.editor_data);
 
-                        self.matcher
-                            .fuzzy_match(&text, pattern)
+                        query
+                            .fuzzy_match(&text, &self.matcher)
                             .map(|score| (index, score))
                     }),
             );
@@ -657,9 +658,8 @@ impl<T: Item + 'static> Component for Picker<T> {
             }
 
             let spans = option.label(&self.editor_data);
-            let (_score, highlights) = self
-                .matcher
-                .fuzzy_indices(&String::from(&spans), self.prompt.line())
+            let (_score, highlights) = FuzzyQuery::new(self.prompt.line())
+                .fuzzy_indicies(&String::from(&spans), &self.matcher)
                 .unwrap_or_default();
 
             spans.0.into_iter().fold(inner, |pos, span| {

From 1a87cbd5082f410aee362a274edcc817bfb9f34a Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Sat, 1 Oct 2022 19:35:49 +0200
Subject: [PATCH 245/884] remove filterting with C-space from picker

---
 book/src/keymap.md          |  1 -
 helix-term/src/ui/picker.rs | 21 ---------------------
 2 files changed, 22 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 85110634..9bc1c31e 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -391,7 +391,6 @@ Keys to use within picker. Remapping currently not supported.
 | `PageDown`, `Ctrl-d`         | Page down         |
 | `Home`                       | Go to first entry |
 | `End`                        | Go to last entry  |
-| `Ctrl-space`                 | Filter options    |
 | `Enter`                      | Open selected     |
 | `Ctrl-s`                     | Open horizontally |
 | `Ctrl-v`                     | Open vertically   |
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index ac97e3cc..c7149c61 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -310,8 +310,6 @@ pub struct Picker<T: Item> {
     matcher: Box<Matcher>,
     /// (index, score)
     matches: Vec<(usize, i64)>,
-    /// Filter over original options.
-    filters: Vec<usize>, // could be optimized into bit but not worth it now
 
     /// Current height of the completions box
     completion_height: u16,
@@ -346,7 +344,6 @@ impl<T: Item> Picker<T> {
             editor_data,
             matcher: Box::new(Matcher::default()),
             matches: Vec::new(),
-            filters: Vec::new(),
             cursor: 0,
             prompt,
             previous_pattern: String::new(),
@@ -415,13 +412,6 @@ impl<T: Item> Picker<T> {
                     .iter()
                     .enumerate()
                     .filter_map(|(index, option)| {
-                        // filter options first before matching
-                        if !self.filters.is_empty() {
-                            // TODO: this filters functionality seems inefficient,
-                            // instead store and operate on filters if any
-                            self.filters.binary_search(&index).ok()?;
-                        }
-
                         let text = option.filter_text(&self.editor_data);
 
                         query
@@ -485,14 +475,6 @@ impl<T: Item> Picker<T> {
             .map(|(index, _score)| &self.options[*index])
     }
 
-    pub fn save_filter(&mut self, cx: &Context) {
-        self.filters.clear();
-        self.filters
-            .extend(self.matches.iter().map(|(index, _)| *index));
-        self.filters.sort_unstable(); // used for binary search later
-        self.prompt.clear(cx.editor);
-    }
-
     pub fn toggle_preview(&mut self) {
         self.show_preview = !self.show_preview;
     }
@@ -573,9 +555,6 @@ impl<T: Item + 'static> Component for Picker<T> {
                 }
                 return close_fn;
             }
-            ctrl!(' ') => {
-                self.save_filter(cx);
-            }
             ctrl!('t') => {
                 self.toggle_preview();
             }

From 65febe0cf40807b446722fb402c1cfa6c983299a Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 11 Oct 2022 01:46:47 -0500
Subject: [PATCH 246/884] Overlay all diagnostics with highest severity on top
 (#4113)

Here we separate the diagnostics by severity and then overlay the Vec
of spans for each severity on top of the highlights. The error
diagnostics end up overlaid on the warning diagnostics, which are
overlaid on the hints, overlaid on info, overlaid on any other severity
(default), then overlaid on the syntax highlights.

This fixes two things:

* Error diagnostics are now always visible when overlapped with other
  diagnostics.
* Ghost text is eliminated.
    * Ghost text was caused by duplicate diagnostics at the EOF:
      overlaps within the merged `Vec<(usize, Range<usize>)>` violate
      assumptions in `helix_core::syntax::Merge`.
    * When we push a new range, we check it against the last range and
      merge the two if they overlap. This is safe because they both
      have the same severity and therefore highlight.

The actual merge is skipped for any of these when they are empty, so
this is very fast in practice. For some data, I threw together an FPS
counter which renders as fast as possible and logs the renders per
second.

With no diagnostics, I see an FPS gain from this change from 868 FPS
to 878 (+1.1%) on a release build on a Rust file. On an Erlang file
with 12 error diagnostics and 6 warnings in view (233 errors and 66
warnings total), I see a decrease in average FPS from 795 to 790
(-0.6%) on a release build.
---
 helix-term/src/ui/editor.rs | 65 ++++++++++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 19 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 4e4fd49c..fb70fa0f 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -123,8 +123,15 @@ impl EditorView {
             Self::highlight_cursorcolumn(doc, view, surface, theme);
         }
 
-        let highlights = Self::doc_syntax_highlights(doc, view.offset, inner.height, theme);
-        let highlights = syntax::merge(highlights, Self::doc_diagnostics_highlights(doc, theme));
+        let mut highlights = Self::doc_syntax_highlights(doc, view.offset, inner.height, theme);
+        for diagnostic in Self::doc_diagnostics_highlights(doc, theme) {
+            // Most of the `diagnostic` Vecs are empty most of the time. Skipping
+            // a merge for any empty Vec saves a significant amount of work.
+            if diagnostic.is_empty() {
+                continue;
+            }
+            highlights = Box::new(syntax::merge(highlights, diagnostic));
+        }
         let highlights: Box<dyn Iterator<Item = HighlightEvent>> = if is_focused {
             Box::new(syntax::merge(
                 highlights,
@@ -268,7 +275,7 @@ impl EditorView {
     pub fn doc_diagnostics_highlights(
         doc: &Document,
         theme: &Theme,
-    ) -> Vec<(usize, std::ops::Range<usize>)> {
+    ) -> [Vec<(usize, std::ops::Range<usize>)>; 5] {
         use helix_core::diagnostic::Severity;
         let get_scope_of = |scope| {
             theme
@@ -289,22 +296,42 @@ impl EditorView {
         let error = get_scope_of("diagnostic.error");
         let r#default = get_scope_of("diagnostic"); // this is a bit redundant but should be fine
 
-        doc.diagnostics()
-            .iter()
-            .map(|diagnostic| {
-                let diagnostic_scope = match diagnostic.severity {
-                    Some(Severity::Info) => info,
-                    Some(Severity::Hint) => hint,
-                    Some(Severity::Warning) => warning,
-                    Some(Severity::Error) => error,
-                    _ => r#default,
-                };
-                (
-                    diagnostic_scope,
-                    diagnostic.range.start..diagnostic.range.end,
-                )
-            })
-            .collect()
+        let mut default_vec: Vec<(usize, std::ops::Range<usize>)> = Vec::new();
+        let mut info_vec = Vec::new();
+        let mut hint_vec = Vec::new();
+        let mut warning_vec = Vec::new();
+        let mut error_vec = Vec::new();
+
+        let diagnostics = doc.diagnostics();
+
+        // Diagnostics must be sorted by range. Otherwise, the merge strategy
+        // below would not be accurate.
+        debug_assert!(diagnostics
+            .windows(2)
+            .all(|window| window[0].range.start <= window[1].range.start
+                && window[0].range.end <= window[1].range.end));
+
+        for diagnostic in diagnostics {
+            // Separate diagnostics into different Vecs by severity.
+            let (vec, scope) = match diagnostic.severity {
+                Some(Severity::Info) => (&mut info_vec, info),
+                Some(Severity::Hint) => (&mut hint_vec, hint),
+                Some(Severity::Warning) => (&mut warning_vec, warning),
+                Some(Severity::Error) => (&mut error_vec, error),
+                _ => (&mut default_vec, r#default),
+            };
+
+            // If any diagnostic overlaps ranges with the prior diagnostic,
+            // merge the two together. Otherwise push a new span.
+            match vec.last_mut() {
+                Some((_, range)) if diagnostic.range.start <= range.end => {
+                    range.end = diagnostic.range.end.max(range.end)
+                }
+                _ => vec.push((scope, diagnostic.range.start..diagnostic.range.end)),
+            }
+        }
+
+        [default_vec, info_vec, hint_vec, warning_vec, error_vec]
     }
 
     /// Get highlight spans for selections in a document view.

From 28cb89eadb67b6526b026105919a772ce8e726a3 Mon Sep 17 00:00:00 2001
From: "Alexis (Poliorcetics) Bourget" <alexis.bourget@gmail.com>
Date: Sat, 8 Oct 2022 20:03:22 +0200
Subject: [PATCH 247/884] chore: fix clippy linting

---
 xtask/src/themelint.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/xtask/src/themelint.rs b/xtask/src/themelint.rs
index 26d1cb04..06dfae40 100644
--- a/xtask/src/themelint.rs
+++ b/xtask/src/themelint.rs
@@ -171,7 +171,7 @@ pub fn lint(file: String) -> Result<(), DynError> {
             let message = m.replace("$THEME", theme.as_str());
             println!("{}", message);
         });
-        Err(format!("{} has issues", file.clone().as_str()).into())
+        Err(format!("{} has issues", file).into())
     } else {
         Ok(())
     }
@@ -183,8 +183,7 @@ pub fn lint_all() -> Result<(), DynError> {
     let ok_files_count = files
         .into_iter()
         .filter_map(|path| lint(path.replace(".toml", "")).ok())
-        .collect::<Vec<()>>()
-        .len();
+        .count();
 
     if files_count != ok_files_count {
         Err(format!(

From b58899bc8e0f339fd83a1740a896fcc62976f7a7 Mon Sep 17 00:00:00 2001
From: "Alexis (Poliorcetics) Bourget" <alexis.bourget@gmail.com>
Date: Sat, 8 Oct 2022 20:06:23 +0200
Subject: [PATCH 248/884] fix: remove unneeded allocations when calling
 helix_view::Info::new

---
 helix-term/src/commands.rs |  8 +-------
 helix-view/src/info.rs     | 33 +++++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 754e4473..ad84c85c 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4455,13 +4455,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
         (" ", "... or any character acting as a pair"),
     ];
 
-    cx.editor.autoinfo = Some(Info::new(
-        title,
-        help_text
-            .into_iter()
-            .map(|(col1, col2)| (col1.to_string(), col2.to_string()))
-            .collect(),
-    ));
+    cx.editor.autoinfo = Some(Info::new(title, &help_text));
 }
 
 fn surround_add(cx: &mut Context) {
diff --git a/helix-view/src/info.rs b/helix-view/src/info.rs
index 5ad6a60c..3080cf8e 100644
--- a/helix-view/src/info.rs
+++ b/helix-view/src/info.rs
@@ -16,7 +16,11 @@ pub struct Info {
 }
 
 impl Info {
-    pub fn new(title: &str, body: Vec<(String, String)>) -> Self {
+    pub fn new<T, U>(title: &str, body: &[(T, U)]) -> Self
+    where
+        T: AsRef<str>,
+        U: AsRef<str>,
+    {
         if body.is_empty() {
             return Self {
                 title: title.to_string(),
@@ -26,11 +30,21 @@ impl Info {
             };
         }
 
-        let item_width = body.iter().map(|(item, _)| item.width()).max().unwrap();
+        let item_width = body
+            .iter()
+            .map(|(item, _)| item.as_ref().width())
+            .max()
+            .unwrap();
         let mut text = String::new();
 
-        for (item, desc) in &body {
-            let _ = writeln!(text, "{:width$}  {}", item, desc, width = item_width);
+        for (item, desc) in body {
+            let _ = writeln!(
+                text,
+                "{:width$}  {}",
+                item.as_ref(),
+                desc.as_ref(),
+                width = item_width
+            );
         }
 
         Self {
@@ -42,19 +56,19 @@ impl Info {
     }
 
     pub fn from_keymap(title: &str, body: Vec<(&str, BTreeSet<KeyEvent>)>) -> Self {
-        let body = body
+        let body: Vec<_> = body
             .into_iter()
             .map(|(desc, events)| {
                 let events = events.iter().map(ToString::to_string).collect::<Vec<_>>();
-                (events.join(", "), desc.to_string())
+                (events.join(", "), desc)
             })
             .collect();
 
-        Self::new(title, body)
+        Self::new(title, &body)
     }
 
     pub fn from_registers(registers: &Registers) -> Self {
-        let body = registers
+        let body: Vec<_> = registers
             .inner()
             .iter()
             .map(|(ch, reg)| {
@@ -62,13 +76,12 @@ impl Info {
                     .read()
                     .get(0)
                     .and_then(|s| s.lines().next())
-                    .map(String::from)
                     .unwrap_or_default();
                 (ch.to_string(), content)
             })
             .collect();
 
-        let mut infobox = Self::new("Registers", body);
+        let mut infobox = Self::new("Registers", &body);
         infobox.width = 30; // copied content could be very long
         infobox
     }

From 543d75da23425bb3f2c7208dfa4d56bc9031ce67 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Tue, 11 Oct 2022 08:48:12 +0200
Subject: [PATCH 249/884] do not reparse unmodified injections (#4146)

---
 Cargo.lock               |  1 +
 helix-core/Cargo.toml    |  1 +
 helix-core/src/syntax.rs | 73 ++++++++++++++++++++++++++++------------
 3 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d4befc96..38ab8044 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -388,6 +388,7 @@ name = "helix-core"
 version = "0.6.0"
 dependencies = [
  "arc-swap",
+ "bitflags",
  "chrono",
  "encoding_rs",
  "etcetera",
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index d7ab89ba..4eaadd1e 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -29,6 +29,7 @@ tree-sitter = "0.20"
 once_cell = "1.15"
 arc-swap = "1"
 regex = "1"
+bitflags = "1.3"
 
 log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index e0a984d2..8c51d5eb 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -8,13 +8,15 @@ use crate::{
 };
 
 use arc_swap::{ArcSwap, Guard};
+use bitflags::bitflags;
 use slotmap::{DefaultKey as LayerId, HopSlotMap};
 
 use std::{
     borrow::Cow,
     cell::RefCell,
-    collections::{HashMap, HashSet, VecDeque},
+    collections::{HashMap, VecDeque},
     fmt,
+    mem::replace,
     path::Path,
     str::FromStr,
     sync::Arc,
@@ -594,6 +596,7 @@ impl Syntax {
             tree: None,
             config,
             depth: 0,
+            flags: LayerUpdateFlags::empty(),
             ranges: vec![Range {
                 start_byte: 0,
                 end_byte: usize::MAX,
@@ -656,9 +659,10 @@ impl Syntax {
                 }
             }
 
-            for layer in &mut self.layers.values_mut() {
+            for layer in self.layers.values_mut() {
                 // The root layer always covers the whole range (0..usize::MAX)
                 if layer.depth == 0 {
+                    layer.flags = LayerUpdateFlags::MODIFIED;
                     continue;
                 }
 
@@ -689,6 +693,8 @@ impl Syntax {
                                 edit.new_end_position,
                                 point_sub(range.end_point, edit.old_end_position),
                             );
+
+                            layer.flags |= LayerUpdateFlags::MOVED;
                         }
                         // if the edit starts in the space before and extends into the range
                         else if edit.start_byte < range.start_byte {
@@ -703,11 +709,13 @@ impl Syntax {
                                 edit.new_end_position,
                                 point_sub(range.end_point, edit.old_end_position),
                             );
+                            layer.flags = LayerUpdateFlags::MODIFIED;
                         }
                         // If the edit is an insertion at the start of the tree, shift
                         else if edit.start_byte == range.start_byte && is_pure_insertion {
                             range.start_byte = edit.new_end_byte;
                             range.start_point = edit.new_end_position;
+                            layer.flags |= LayerUpdateFlags::MOVED;
                         } else {
                             range.end_byte = range
                                 .end_byte
@@ -717,6 +725,7 @@ impl Syntax {
                                 edit.new_end_position,
                                 point_sub(range.end_point, edit.old_end_position),
                             );
+                            layer.flags = LayerUpdateFlags::MODIFIED;
                         }
                     }
                 }
@@ -731,27 +740,33 @@ impl Syntax {
 
             let source_slice = source.slice(..);
 
-            let mut touched = HashSet::new();
-
-            // TODO: we should be able to avoid editing & parsing layers with ranges earlier in the document before the edit
-
             while let Some(layer_id) = queue.pop_front() {
-                // Mark the layer as touched
-                touched.insert(layer_id);
-
                 let layer = &mut self.layers[layer_id];
 
+                // Mark the layer as touched
+                layer.flags |= LayerUpdateFlags::TOUCHED;
+
                 // If a tree already exists, notify it of changes.
                 if let Some(tree) = &mut layer.tree {
-                    for edit in edits.iter().rev() {
-                        // Apply the edits in reverse.
-                        // If we applied them in order then edit 1 would disrupt the positioning of edit 2.
-                        tree.edit(edit);
+                    if layer
+                        .flags
+                        .intersects(LayerUpdateFlags::MODIFIED | LayerUpdateFlags::MOVED)
+                    {
+                        for edit in edits.iter().rev() {
+                            // Apply the edits in reverse.
+                            // If we applied them in order then edit 1 would disrupt the positioning of edit 2.
+                            tree.edit(edit);
+                        }
                     }
-                }
 
-                // Re-parse the tree.
-                layer.parse(&mut ts_parser.parser, source)?;
+                    if layer.flags.contains(LayerUpdateFlags::MODIFIED) {
+                        // Re-parse the tree.
+                        layer.parse(&mut ts_parser.parser, source)?;
+                    }
+                } else {
+                    // always parse if this layer has never been parsed before
+                    layer.parse(&mut ts_parser.parser, source)?;
+                }
 
                 // Switch to an immutable borrow.
                 let layer = &self.layers[layer_id];
@@ -855,6 +870,8 @@ impl Syntax {
                             config,
                             depth,
                             ranges,
+                            // set the modified flag to ensure the layer is parsed
+                            flags: LayerUpdateFlags::empty(),
                         })
                     });
 
@@ -868,8 +885,11 @@ impl Syntax {
             // Return the cursor back in the pool.
             ts_parser.cursors.push(cursor);
 
-            // Remove all untouched layers
-            self.layers.retain(|id, _| touched.contains(&id));
+            // Reset all `LayerUpdateFlags` and remove all untouched layers
+            self.layers.retain(|_, layer| {
+                replace(&mut layer.flags, LayerUpdateFlags::empty())
+                    .contains(LayerUpdateFlags::TOUCHED)
+            });
 
             Ok(())
         })
@@ -968,6 +988,16 @@ impl Syntax {
     // TODO: Folding
 }
 
+bitflags! {
+    /// Flags that track the status of a layer
+    /// in the `Sytaxn::update` function
+    struct LayerUpdateFlags : u32{
+        const MODIFIED = 0b001;
+        const MOVED = 0b010;
+        const TOUCHED = 0b100;
+    }
+}
+
 #[derive(Debug)]
 pub struct LanguageLayer {
     // mode
@@ -975,7 +1005,8 @@ pub struct LanguageLayer {
     pub config: Arc<HighlightConfiguration>,
     pub(crate) tree: Option<Tree>,
     pub ranges: Vec<Range>,
-    pub depth: usize,
+    pub depth: u32,
+    flags: LayerUpdateFlags,
 }
 
 impl LanguageLayer {
@@ -1191,7 +1222,7 @@ struct HighlightIter<'a> {
     layers: Vec<HighlightIterLayer<'a>>,
     iter_count: usize,
     next_event: Option<HighlightEvent>,
-    last_highlight_range: Option<(usize, usize, usize)>,
+    last_highlight_range: Option<(usize, usize, u32)>,
 }
 
 // Adapter to convert rope chunks to bytes
@@ -1224,7 +1255,7 @@ struct HighlightIterLayer<'a> {
     config: &'a HighlightConfiguration,
     highlight_end_stack: Vec<usize>,
     scope_stack: Vec<LocalScope<'a>>,
-    depth: usize,
+    depth: u32,
     ranges: &'a [Range],
 }
 

From ce2a5b6d9f6caaebf3405f2d281d40ee119d1580 Mon Sep 17 00:00:00 2001
From: Stuart Baker <smbkr@users.noreply.github.com>
Date: Tue, 11 Oct 2022 07:48:55 +0100
Subject: [PATCH 250/884] Add colours "color-modes" to ayu_light theme (#4109)

* Rename "dark gray" to "light gray"

* Add colours for statusline modes

* Use UI background for inactive panes
---
 runtime/themes/ayu_light.toml | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/runtime/themes/ayu_light.toml b/runtime/themes/ayu_light.toml
index 7ea4ef58..80943613 100644
--- a/runtime/themes/ayu_light.toml
+++ b/runtime/themes/ayu_light.toml
@@ -34,23 +34,22 @@
 
 # Interface
 "ui.background"= { bg = "background" }
-"ui.cursor" = { bg = "yellow", fg = "dark_gray" }
+"ui.cursor" = { bg = "yellow", fg = "light_gray" }
 "ui.cursor.match" = { fg = "orange" }
-"ui.linenr" = { fg = "dark_gray" }
+"ui.linenr" = { fg = "light_gray" }
 "ui.linenr.selected" = { fg = "orange" }
 "ui.cursorline" = { bg = "black" }
-"ui.statusline" = { fg = "foreground", bg = "black" }
 "ui.popup" = { bg = "black" }
-"ui.window" = { fg = "dark_gray" }
+"ui.window" = { fg = "light_gray" }
 "ui.help" = { fg  = "foreground", bg = "black" }
 "ui.text" = { fg = "foreground" }
-"ui.text.focus" = { bg = "dark_gray", fg = "foreground" }
+"ui.text.focus" = { bg = "light_gray", fg = "foreground" }
 "ui.text.info" = { fg = "foreground" }
-"ui.virtual.whitespace" = { fg = "dark_gray" }
+"ui.virtual.whitespace" = { fg = "light_gray" }
 "ui.virtual.ruler" = { bg = "black" }
 "ui.menu" = { fg = "foreground", bg = "black" }
 "ui.menu.selected" = { bg = "orange", fg = "background" }
-"ui.selection" = { bg = "dark_gray" }
+"ui.selection" = { bg = "light_gray" }
 "warning" = { fg = "yellow" }
 "error" = { fg = "red", modifiers = ["bold"] }
 "info" = { fg = "blue", modifiers = ["bold"] }
@@ -59,8 +58,13 @@
 "diagnostic.info"= { fg = "blue", modifiers = ["underlined"] }
 "diagnostic.warning"= { fg = "yellow", modifiers = ["underlined"] }
 "diagnostic.error"= { fg = "red", modifiers = ["underlined"] }
-"ui.bufferline" = { fg = "gray", bg = "dark_gray" }
-"ui.bufferline.active" = { fg = "dark", bg = "background" }
+"ui.bufferline" = { fg = "ui_foreground", bg = "ui_background" }
+"ui.bufferline.active" = { fg = "ui_background", bg = "ui_foreground" }
+"ui.statusline" = { fg = "ui_foreground", bg = "ui_background" }
+"ui.statusline.inactive" = { fg = "ui_foreground", bg = "ui_background" }
+"ui.statusline.normal" = { fg = "white", bg = "light_blue" }
+"ui.statusline.insert" = { fg = "white", bg = "orange" }
+"ui.statusline.select" = { fg = "white", bg = "magenta" }
 
 "special" = { fg = "orange" }
 
@@ -68,14 +72,18 @@
 background = "#fcfcfc"
 foreground = "#5c6166"
 
+ui_foreground = "#8a9199"
+ui_background = "#f8f9fa"
+
 black = "#e7eaed"
+white = "#fcfcfc"
 blue = "#399ee6"
+light_blue = "#55b4d4"
 cyan = "#478acc"
-dark_gray = "#e7eaed"
+light_gray = "#e7eaed"
 gray = "#787b8099"
 green = "#86b300"
 magenta = "#a37acc"
 orange = "#fa8d3e"
 red = "#f07171"
 yellow = "#ffaa33"
-dark = "#131721"

From 8c4ae4df1ccc9465508d48d1407616515974e830 Mon Sep 17 00:00:00 2001
From: Alex <3957610+CptPotato@users.noreply.github.com>
Date: Tue, 11 Oct 2022 09:43:52 +0200
Subject: [PATCH 251/884] update everforest theme (#3998)

---
 runtime/themes/everforest_dark.toml  | 31 ++++++++++++++++++----------
 runtime/themes/everforest_light.toml | 31 ++++++++++++++++++----------
 2 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/runtime/themes/everforest_dark.toml b/runtime/themes/everforest_dark.toml
index 625e7df9..63997c9c 100644
--- a/runtime/themes/everforest_dark.toml
+++ b/runtime/themes/everforest_dark.toml
@@ -8,11 +8,12 @@
 # Email: sainnhe@gmail.com
 # License: MIT License
 
-"constant.character.escape" = "orange"
 "type" = "yellow"
 "constant" = "purple"
 "constant.numeric" = "purple"
+"constant.character.escape" = "orange"
 "string" = "green"
+"string.regexp" = "blue"
 "comment" = "grey0"
 "variable" = "fg"
 "variable.builtin" = "blue"
@@ -23,6 +24,7 @@
 "punctuation.delimiter" = "grey2"
 "punctuation.bracket" = "fg"
 "keyword" = "red"
+"keyword.directive" = "aqua"
 "operator" = "orange"
 "function" = "green"
 "function.builtin" = "blue"
@@ -54,25 +56,33 @@
 "diff.minus" = "red"
 
 "ui.background" = { bg = "bg0" }
+"ui.background.separator" = "grey0"
 "ui.cursor" = { fg = "bg0", bg = "fg" }
 "ui.cursor.match" = { fg = "orange", bg = "bg_yellow" }
 "ui.cursor.insert" = { fg = "bg0", bg = "grey1" }
 "ui.cursor.select" = { fg = "bg0", bg = "blue" }
+"ui.cursorline.primary" = { bg = "bg1" }
+"ui.cursorline.secondary" = { bg = "bg1" }
+"ui.selection" = { bg = "bg3" }
 "ui.linenr" = "grey0"
 "ui.linenr.selected" = "fg"
-"ui.cursorline" = { bg = "bg1" }
-"ui.statusline" = { fg = "grey2", bg = "bg2" }
+"ui.statusline" = { fg = "grey2", bg = "bg3" }
 "ui.statusline.inactive" = { fg = "grey0", bg = "bg1" }
-"ui.popup" = { fg = "grey2", bg = "bg1" }
-"ui.window" = { fg = "grey2", bg = "bg1" }
-"ui.help" = { fg = "fg", bg = "bg1" }
+"ui.statusline.normal" = { fg = "bg0", bg = "grey2", modifiers = ["bold"] }
+"ui.statusline.insert" = { fg = "bg0", bg = "yellow", modifiers = ["bold"] }
+"ui.statusline.select" = { fg = "bg0", bg = "blue", modifiers = ["bold"] }
+"ui.bufferline" = { fg = "grey0", bg = "bg1" }
+"ui.bufferline.active" = { fg = "fg", bg = "bg3", modifiers = ["bold"] }
+"ui.popup" = { fg = "grey2", bg = "bg2" }
+"ui.window" = { fg = "grey0", bg = "bg0" }
+"ui.help" = { fg = "fg", bg = "bg2" }
 "ui.text" = "fg"
 "ui.text.focus" = "fg"
-"ui.menu" = { fg = "fg", bg = "bg2" }
+"ui.menu" = { fg = "fg", bg = "bg3" }
 "ui.menu.selected" = { fg = "bg0", bg = "green" }
-"ui.selection" = { bg = "bg3" }
-"ui.virtual.whitespace" = "grey0"
-"ui.virtual.ruler" = { bg = "bg1" }
+"ui.virtual.whitespace" = { fg = "bg4" }
+"ui.virtual.indent-guide" = { fg = "bg4" }
+"ui.virtual.ruler" = { bg = "bg3" }
 
 "hint" = "blue"
 "info" = "aqua"
@@ -80,7 +90,6 @@
 "error" = "red"
 "diagnostic" = { modifiers = ["underlined"] }
 
-
 [palette]
 
 bg0 = "#2b3339"
diff --git a/runtime/themes/everforest_light.toml b/runtime/themes/everforest_light.toml
index 43f94618..08876c0c 100644
--- a/runtime/themes/everforest_light.toml
+++ b/runtime/themes/everforest_light.toml
@@ -8,11 +8,12 @@
 # Email: sainnhe@gmail.com
 # License: MIT License
 
-"constant.character.escape" = "orange"
 "type" = "yellow"
 "constant" = "purple"
 "constant.numeric" = "purple"
+"constant.character.escape" = "orange"
 "string" = "green"
+"string.regexp" = "blue"
 "comment" = "grey0"
 "variable" = "fg"
 "variable.builtin" = "blue"
@@ -23,6 +24,7 @@
 "punctuation.delimiter" = "grey2"
 "punctuation.bracket" = "fg"
 "keyword" = "red"
+"keyword.directive" = "aqua"
 "operator" = "orange"
 "function" = "green"
 "function.builtin" = "blue"
@@ -54,25 +56,33 @@
 "diff.minus" = "red"
 
 "ui.background" = { bg = "bg0" }
+"ui.background.separator" = "grey0"
 "ui.cursor" = { fg = "bg0", bg = "fg" }
 "ui.cursor.match" = { fg = "orange", bg = "bg_yellow" }
 "ui.cursor.insert" = { fg = "bg0", bg = "grey1" }
 "ui.cursor.select" = { fg = "bg0", bg = "blue" }
+"ui.cursorline.primary" = { bg = "bg1" }
+"ui.cursorline.secondary" = { bg = "bg1" }
+"ui.selection" = { bg = "bg3" }
 "ui.linenr" = "grey0"
 "ui.linenr.selected" = "fg"
-"ui.cursorline" = { bg = "bg1" }
-"ui.statusline" = { fg = "grey2", bg = "bg2" }
+"ui.statusline" = { fg = "grey2", bg = "bg3" }
 "ui.statusline.inactive" = { fg = "grey0", bg = "bg1" }
-"ui.popup" = { fg = "grey2", bg = "bg1" }
-"ui.window" = { fg = "grey2", bg = "bg1" }
-"ui.help" = { fg = "fg", bg = "bg1" }
+"ui.statusline.normal" = { fg = "bg0", bg = "grey2", modifiers = ["bold"] }
+"ui.statusline.insert" = { fg = "bg0", bg = "yellow", modifiers = ["bold"] }
+"ui.statusline.select" = { fg = "bg0", bg = "blue", modifiers = ["bold"] }
+"ui.bufferline" = { fg = "grey0", bg = "bg1" }
+"ui.bufferline.active" = { fg = "fg", bg = "bg3", modifiers = ["bold"] }
+"ui.popup" = { fg = "grey2", bg = "bg2" }
+"ui.window" = { fg = "grey0", bg = "bg0" }
+"ui.help" = { fg = "fg", bg = "bg2" }
 "ui.text" = "fg"
 "ui.text.focus" = "fg"
-"ui.menu" = { fg = "fg", bg = "bg2" }
+"ui.menu" = { fg = "fg", bg = "bg3" }
 "ui.menu.selected" = { fg = "bg0", bg = "green" }
-"ui.selection" = { bg = "bg3" }
-"ui.virtual.whitespace" = "grey0"
-"ui.virtual.ruler" = { bg = "bg1" }
+"ui.virtual.whitespace" = { fg = "bg4" }
+"ui.virtual.indent-guide" = { fg = "bg4" }
+"ui.virtual.ruler" = { bg = "bg3" }
 
 "hint" = "blue"
 "info" = "aqua"
@@ -80,7 +90,6 @@
 "error" = "red"
 "diagnostic" = { modifiers = ["underlined"] }
 
-
 [palette]
 
 bg0 = "#fff9e8"

From 3ab9abb64283aed54f5ea7e8157629c2a2be3b33 Mon Sep 17 00:00:00 2001
From: Triton171 <triton0171@gmail.com>
Date: Tue, 9 Aug 2022 22:32:13 +0200
Subject: [PATCH 252/884] Add `extend-indented` and `stop-extend` captures for
 indent queries. Improve and re-enable python indent queries.

---
 helix-core/src/indent.rs                      | 150 +++++++++++++++---
 helix-core/tests/indent.rs                    |   1 +
 .../python/{indents.scm_ => indents.scm}      |  26 ++-
 3 files changed, 155 insertions(+), 22 deletions(-)
 rename runtime/queries/python/{indents.scm_ => indents.scm} (65%)

diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index ad079c25..ac67bce2 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -192,13 +192,15 @@ pub fn indent_level_for_line(line: RopeSlice, tab_width: usize) -> usize {
 
 /// Computes for node and all ancestors whether they are the first node on their line.
 /// The first entry in the return value represents the root node, the last one the node itself
-fn get_first_in_line(mut node: Node, byte_pos: usize, new_line: bool) -> Vec<bool> {
+fn get_first_in_line(mut node: Node, new_line_byte_pos: Option<usize>) -> Vec<bool> {
     let mut first_in_line = Vec::new();
     loop {
         if let Some(prev) = node.prev_sibling() {
             // If we insert a new line, the first node at/after the cursor is considered to be the first in its line
             let first = prev.end_position().row != node.start_position().row
-                || (new_line && node.start_byte() >= byte_pos && prev.start_byte() < byte_pos);
+                || new_line_byte_pos.map_or(false, |byte_pos| {
+                    node.start_byte() >= byte_pos && prev.start_byte() < byte_pos
+                });
             first_in_line.push(Some(first));
         } else {
             // Nodes that have no previous siblings are first in their line if and only if their parent is
@@ -298,8 +300,21 @@ enum IndentScope {
     Tail,
 }
 
-/// Execute the indent query.
-/// Returns for each node (identified by its id) a list of indent captures for that node.
+/// A capture from the indent query which does not define an indent but extends
+/// the range of a node. This is used before the indent is calculated.
+enum ExtendCapture {
+    ExtendIndented,
+    StopExtend,
+}
+
+/// The result of running a tree-sitter indent query. This stores for
+/// each node (identified by its ID) the relevant captures (already filtered
+/// by predicates).
+struct IndentQueryResult {
+    indent_captures: HashMap<usize, Vec<IndentCapture>>,
+    extend_captures: HashMap<usize, Vec<ExtendCapture>>,
+}
+
 fn query_indents(
     query: &Query,
     syntax: &Syntax,
@@ -309,8 +324,9 @@ fn query_indents(
     // Position of the (optional) newly inserted line break.
     // Given as (line, byte_pos)
     new_line_break: Option<(usize, usize)>,
-) -> HashMap<usize, Vec<IndentCapture>> {
+) -> IndentQueryResult {
     let mut indent_captures: HashMap<usize, Vec<IndentCapture>> = HashMap::new();
+    let mut extend_captures: HashMap<usize, Vec<ExtendCapture>> = HashMap::new();
     cursor.set_byte_range(range);
     // Iterate over all captures from the query
     for m in cursor.matches(query, syntax.tree().root_node(), RopeProvider(text)) {
@@ -374,10 +390,24 @@ fn query_indents(
             continue;
         }
         for capture in m.captures {
-            let capture_type = query.capture_names()[capture.index as usize].as_str();
-            let capture_type = match capture_type {
+            let capture_name = query.capture_names()[capture.index as usize].as_str();
+            let capture_type = match capture_name {
                 "indent" => IndentCaptureType::Indent,
                 "outdent" => IndentCaptureType::Outdent,
+                "extend-indented" => {
+                    extend_captures
+                        .entry(capture.node.id())
+                        .or_insert_with(|| Vec::with_capacity(1))
+                        .push(ExtendCapture::ExtendIndented);
+                    continue;
+                }
+                "stop-extend" => {
+                    extend_captures
+                        .entry(capture.node.id())
+                        .or_insert_with(|| Vec::with_capacity(1))
+                        .push(ExtendCapture::StopExtend);
+                    continue;
+                }
                 _ => {
                     // Ignore any unknown captures (these may be needed for predicates such as #match?)
                     continue;
@@ -420,7 +450,10 @@ fn query_indents(
                 .push(indent_capture);
         }
     }
-    indent_captures
+    IndentQueryResult {
+        indent_captures,
+        extend_captures,
+    }
 }
 
 /// Use the syntax tree to determine the indentation for a given position.
@@ -463,36 +496,114 @@ pub fn treesitter_indent_for_pos(
     query: &Query,
     syntax: &Syntax,
     indent_style: &IndentStyle,
+    tab_width: usize,
     text: RopeSlice,
     line: usize,
     pos: usize,
     new_line: bool,
 ) -> Option<String> {
     let byte_pos = text.char_to_byte(pos);
+    // The innermost tree-sitter node which is considered for the indent
+    // computation. It may change if some predeceding node is extended
     let mut node = syntax
         .tree()
         .root_node()
         .descendant_for_byte_range(byte_pos, byte_pos)?;
-    let mut first_in_line = get_first_in_line(node, byte_pos, new_line);
-    let new_line_break = if new_line {
-        Some((line, byte_pos))
-    } else {
-        None
-    };
-    let query_result = crate::syntax::PARSER.with(|ts_parser| {
+    let (query_result, prev_child) = crate::syntax::PARSER.with(|ts_parser| {
         let mut ts_parser = ts_parser.borrow_mut();
         let mut cursor = ts_parser.cursors.pop().unwrap_or_else(QueryCursor::new);
+        // The query range should intersect with all nodes directly preceding
+        // the cursor in case one of them is extended.
+        // prev_child is the deepest such node.
+        let (query_range, prev_child) = {
+            // TODO Is there some way we can reuse this cursor?
+            let mut tree_cursor = node.walk();
+            let mut prev_child = None;
+            for child in node.children(&mut tree_cursor) {
+                if child.byte_range().end <= byte_pos {
+                    prev_child = Some(child);
+                }
+            }
+            match prev_child {
+                Some(mut prev_child) => {
+                    // Get the deepest directly preceding node
+                    while prev_child.child_count() > 0 {
+                        prev_child = prev_child.child(prev_child.child_count() - 1).unwrap();
+                    }
+                    (
+                        prev_child.byte_range().end - 1..byte_pos + 1,
+                        Some(prev_child),
+                    )
+                }
+                None => (byte_pos..byte_pos + 1, None),
+            }
+        };
         let query_result = query_indents(
             query,
             syntax,
             &mut cursor,
             text,
-            byte_pos..byte_pos + 1,
-            new_line_break,
+            query_range,
+            new_line.then(|| (line, byte_pos)),
         );
         ts_parser.cursors.push(cursor);
-        query_result
+        (query_result, prev_child)
     });
+    let indent_captures = query_result.indent_captures;
+    let extend_captures = query_result.extend_captures;
+
+    // Check for extend captures (starting with the deepest
+    // candidate node and then going up the syntax tree).
+    if let Some(mut prev_child) = prev_child {
+        let mut stop_extend = false;
+        while prev_child != node {
+            let mut extend_node = false;
+            if let Some(captures) = extend_captures.get(&prev_child.id()) {
+                for capture in captures {
+                    match capture {
+                        ExtendCapture::StopExtend => {
+                            stop_extend = true;
+                        }
+                        ExtendCapture::ExtendIndented => {
+                            // We extend the node if
+                            // - the cursor is on the same line as the end of the node OR
+                            // - the line that the cursor is on is more indented than the
+                            //   first line of the node
+                            if prev_child.end_position().row == line {
+                                extend_node = true;
+                            } else {
+                                let cursor_indent =
+                                    indent_level_for_line(text.line(line), tab_width);
+                                let node_indent = indent_level_for_line(
+                                    text.line(prev_child.start_position().row),
+                                    tab_width,
+                                );
+                                if cursor_indent > node_indent {
+                                    extend_node = true;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            // If we encountered some `StopExtend` capture before, we don't
+            // extend the node even if we otherwise would
+            match (extend_node, stop_extend) {
+                (true, true) => {
+                    stop_extend = false;
+                }
+                (true, false) => {
+                    node = prev_child;
+                    break;
+                }
+                _ => {}
+            };
+            // This parent always exists since node is an ancestor of prev_child
+            prev_child = prev_child.parent().unwrap();
+        }
+    }
+
+    let mut first_in_line = get_first_in_line(node, new_line.then(|| byte_pos));
 
     let mut result = Indentation::default();
     // We always keep track of all the indent changes on one line, in order to only indent once
@@ -504,7 +615,7 @@ pub fn treesitter_indent_for_pos(
         // one entry for each ancestor of the node (which is what we iterate over)
         let is_first = *first_in_line.last().unwrap();
         // Apply all indent definitions for this node
-        if let Some(definitions) = query_result.get(&node.id()) {
+        if let Some(definitions) = indent_captures.get(&node.id()) {
             for definition in definitions {
                 match definition.scope {
                     IndentScope::All => {
@@ -579,6 +690,7 @@ pub fn indent_for_newline(
             query,
             syntax,
             indent_style,
+            tab_width,
             text,
             line_before,
             line_before_end_pos,
diff --git a/helix-core/tests/indent.rs b/helix-core/tests/indent.rs
index ff04d05f..e1114f4a 100644
--- a/helix-core/tests/indent.rs
+++ b/helix-core/tests/indent.rs
@@ -50,6 +50,7 @@ fn test_treesitter_indent(file_name: &str, lang_scope: &str) {
                 indent_query,
                 &syntax,
                 &IndentStyle::Spaces(4),
+                4,
                 text,
                 i,
                 text.line_to_char(i) + pos,
diff --git a/runtime/queries/python/indents.scm_ b/runtime/queries/python/indents.scm
similarity index 65%
rename from runtime/queries/python/indents.scm_
rename to runtime/queries/python/indents.scm
index 810ff52f..c648aebc 100644
--- a/runtime/queries/python/indents.scm_
+++ b/runtime/queries/python/indents.scm
@@ -27,12 +27,32 @@
   (class_definition)
 ] @indent
 
+[
+  (if_statement)
+  (for_statement)
+  (while_statement)
+  (with_statement)
+  (try_statement)
+
+  (function_definition)
+  (class_definition)
+] @extend-indented
+
+[
+  (return_statement)
+  (break_statement)
+  (continue_statement)
+  (raise_statement)
+  (pass_statement)
+] @stop-extend
+
 [
   ")"
   "]"
   "}"
-  (return_statement)
-  (pass_statement)
-  (raise_statement)
 ] @outdent
+(elif_clause
+  "elif" @outdent)
+(else_clause
+  "else" @outdent)
 

From 8f19956218ebb561a7e4de86b67df130a5ed997b Mon Sep 17 00:00:00 2001
From: Triton171 <triton0171@gmail.com>
Date: Wed, 10 Aug 2022 14:11:15 +0200
Subject: [PATCH 253/884] Add python indentation support to docs. Document
 @extend-indented and @stop-extend captures for indent queries.

---
 book/src/generated/lang-support.md |  2 +-
 book/src/guides/indent.md          | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 5c64d097..deeef34f 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -86,7 +86,7 @@
 | prisma | ✓ |  |  | `prisma-language-server` |
 | prolog |  |  |  | `swipl` |
 | protobuf | ✓ |  | ✓ |  |
-| python | ✓ | ✓ |  | `pylsp` |
+| python | ✓ | ✓ | ✓ | `pylsp` |
 | r | ✓ |  |  | `R` |
 | racket |  |  |  | `racket` |
 | regex | ✓ |  |  |  |
diff --git a/book/src/guides/indent.md b/book/src/guides/indent.md
index f4d916b2..c9306a10 100644
--- a/book/src/guides/indent.md
+++ b/book/src/guides/indent.md
@@ -46,6 +46,19 @@ capture on the same line, the indent level isn't changed at all.
 - `@outdent` (default scope `all`):
 Decrease the indent level by 1. The same rules as for `@indent` apply.
 
+- `@extend-indented`:
+Extend the range of this node to the end of the line and to lines that
+are indented more than the line that this node starts on. This is useful
+for languages like Python, where for the purpose of indentation some nodes
+(like functions or classes) should also contain indented lines that follow them.
+
+- `@stop-extend`:
+Prevents the first extension of an ancestor of this node. For example, in Python
+a return expression always ends the block that it is in. Note that this only prevents
+the next extension of one ancestor: If multiple ancestors can be extended (for example
+multiple nested conditional blocks in python), only the extension of the innermost
+ancestor is prevented.
+
 ## Predicates
 
 In some cases, an S-expression cannot express exactly what pattern should be matched.

From 1ceecbd06246efeb3d56f778bc786958bf3f90f7 Mon Sep 17 00:00:00 2001
From: Triton171 <triton0171@gmail.com>
Date: Wed, 10 Aug 2022 15:04:09 +0200
Subject: [PATCH 254/884] Fix clippy warning.

---
 helix-core/src/indent.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index ac67bce2..df69eb73 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -492,6 +492,7 @@ fn query_indents(
 ///     },
 /// );
 /// ```
+#[allow(clippy::too_many_arguments)]
 pub fn treesitter_indent_for_pos(
     query: &Query,
     syntax: &Syntax,

From 05832f90cbff18a8d8f0ccb6680cd74e19c75378 Mon Sep 17 00:00:00 2001
From: Triton171 <triton0171@gmail.com>
Date: Thu, 11 Aug 2022 10:56:19 +0200
Subject: [PATCH 255/884] Fix a bug that caused the indent for the line below
 to also be added in rare cases at the beginning of a file.

---
 helix-core/src/indent.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index df69eb73..97fe00cd 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -662,7 +662,13 @@ pub fn treesitter_indent_for_pos(
             node = parent;
             first_in_line.pop();
         } else {
-            result.add_line(&indent_for_line_below);
+            // Only add the indentation for the line below if that line
+            // is not after the line that the indentation is calculated for.
+            if (node.start_position().row < line)
+                || (new_line && node.start_position().row == line && node.start_byte() < byte_pos)
+            {
+                result.add_line(&indent_for_line_below);
+            }
             result.add_line(&indent_for_line);
             break;
         }

From 2b02785f19cd98d1e943f311377d76ae2dd58cff Mon Sep 17 00:00:00 2001
From: Daniel Ebert <daniel.ebert@protonmail.com>
Date: Sat, 17 Sep 2022 14:03:45 +0200
Subject: [PATCH 256/884] Improve code style for tree-sitter indentation. Split
 extend logic into a separate file.

---
 helix-core/src/indent.rs | 189 +++++++++++++++++++++------------------
 1 file changed, 102 insertions(+), 87 deletions(-)

diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index 97fe00cd..7556c169 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -456,6 +456,67 @@ fn query_indents(
     }
 }
 
+/// Handle extend queries. deepest_preceding is the deepest descendant of node that directly precedes the cursor position.
+/// Any ancestor of deepest_preceding which is also a descendant of node may be "extended". In that case, node will be updated,
+/// so that the indent computation starts with the correct syntax node.
+fn extend_nodes<'a>(
+    node: &mut Node<'a>,
+    deepest_preceding: Option<Node<'a>>,
+    extend_captures: &HashMap<usize, Vec<ExtendCapture>>,
+    text: RopeSlice,
+    line: usize,
+    tab_width: usize,
+) {
+    if let Some(mut deepest_preceding) = deepest_preceding {
+        let mut stop_extend = false;
+        while deepest_preceding != *node {
+            let mut extend_node = false;
+            if let Some(captures) = extend_captures.get(&deepest_preceding.id()) {
+                for capture in captures {
+                    match capture {
+                        ExtendCapture::StopExtend => {
+                            stop_extend = true;
+                        }
+                        ExtendCapture::ExtendIndented => {
+                            // We extend the node if
+                            // - the cursor is on the same line as the end of the node OR
+                            // - the line that the cursor is on is more indented than the
+                            //   first line of the node
+                            if deepest_preceding.end_position().row == line {
+                                extend_node = true;
+                            } else {
+                                let cursor_indent =
+                                    indent_level_for_line(text.line(line), tab_width);
+                                let node_indent = indent_level_for_line(
+                                    text.line(deepest_preceding.start_position().row),
+                                    tab_width,
+                                );
+                                if cursor_indent > node_indent {
+                                    extend_node = true;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            // If we encountered some `StopExtend` capture before, we don't
+            // extend the node even if we otherwise would
+            match (extend_node, stop_extend) {
+                (true, true) => {
+                    stop_extend = false;
+                }
+                (true, false) => {
+                    *node = deepest_preceding;
+                    break;
+                }
+                _ => {}
+            };
+            // This parent always exists since node is an ancestor of deepest_preceding
+            deepest_preceding = deepest_preceding.parent().unwrap();
+        }
+    }
+}
+
 /// Use the syntax tree to determine the indentation for a given position.
 /// This can be used in 2 ways:
 ///
@@ -510,100 +571,54 @@ pub fn treesitter_indent_for_pos(
         .tree()
         .root_node()
         .descendant_for_byte_range(byte_pos, byte_pos)?;
-    let (query_result, prev_child) = crate::syntax::PARSER.with(|ts_parser| {
-        let mut ts_parser = ts_parser.borrow_mut();
-        let mut cursor = ts_parser.cursors.pop().unwrap_or_else(QueryCursor::new);
+    let (query_result, deepest_preceding) = {
         // The query range should intersect with all nodes directly preceding
         // the cursor in case one of them is extended.
-        // prev_child is the deepest such node.
-        let (query_range, prev_child) = {
-            // TODO Is there some way we can reuse this cursor?
-            let mut tree_cursor = node.walk();
-            let mut prev_child = None;
-            for child in node.children(&mut tree_cursor) {
-                if child.byte_range().end <= byte_pos {
-                    prev_child = Some(child);
-                }
+        let mut deepest_preceding = None; // The deepest node preceding the cursor
+        let mut tree_cursor = node.walk();
+        for child in node.children(&mut tree_cursor) {
+            if child.byte_range().end <= byte_pos {
+                deepest_preceding = Some(child);
             }
-            match prev_child {
-                Some(mut prev_child) => {
-                    // Get the deepest directly preceding node
-                    while prev_child.child_count() > 0 {
-                        prev_child = prev_child.child(prev_child.child_count() - 1).unwrap();
-                    }
-                    (
-                        prev_child.byte_range().end - 1..byte_pos + 1,
-                        Some(prev_child),
-                    )
-                }
-                None => (byte_pos..byte_pos + 1, None),
+        }
+        deepest_preceding = deepest_preceding.map(|mut prec| {
+            // Get the deepest directly preceding node
+            while prec.child_count() > 0 {
+                prec = prec.child(prec.child_count() - 1).unwrap();
             }
-        };
-        let query_result = query_indents(
-            query,
-            syntax,
-            &mut cursor,
-            text,
-            query_range,
-            new_line.then(|| (line, byte_pos)),
-        );
-        ts_parser.cursors.push(cursor);
-        (query_result, prev_child)
-    });
+            prec
+        });
+        let query_range = deepest_preceding
+            .map(|prec| prec.byte_range().end - 1..byte_pos + 1)
+            .unwrap_or(byte_pos..byte_pos + 1);
+
+        crate::syntax::PARSER.with(|ts_parser| {
+            let mut ts_parser = ts_parser.borrow_mut();
+            let mut cursor = ts_parser.cursors.pop().unwrap_or_else(QueryCursor::new);
+            let query_result = query_indents(
+                query,
+                syntax,
+                &mut cursor,
+                text,
+                query_range,
+                new_line.then(|| (line, byte_pos)),
+            );
+            ts_parser.cursors.push(cursor);
+            (query_result, deepest_preceding)
+        })
+    };
     let indent_captures = query_result.indent_captures;
     let extend_captures = query_result.extend_captures;
 
-    // Check for extend captures (starting with the deepest
-    // candidate node and then going up the syntax tree).
-    if let Some(mut prev_child) = prev_child {
-        let mut stop_extend = false;
-        while prev_child != node {
-            let mut extend_node = false;
-            if let Some(captures) = extend_captures.get(&prev_child.id()) {
-                for capture in captures {
-                    match capture {
-                        ExtendCapture::StopExtend => {
-                            stop_extend = true;
-                        }
-                        ExtendCapture::ExtendIndented => {
-                            // We extend the node if
-                            // - the cursor is on the same line as the end of the node OR
-                            // - the line that the cursor is on is more indented than the
-                            //   first line of the node
-                            if prev_child.end_position().row == line {
-                                extend_node = true;
-                            } else {
-                                let cursor_indent =
-                                    indent_level_for_line(text.line(line), tab_width);
-                                let node_indent = indent_level_for_line(
-                                    text.line(prev_child.start_position().row),
-                                    tab_width,
-                                );
-                                if cursor_indent > node_indent {
-                                    extend_node = true;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            // If we encountered some `StopExtend` capture before, we don't
-            // extend the node even if we otherwise would
-            match (extend_node, stop_extend) {
-                (true, true) => {
-                    stop_extend = false;
-                }
-                (true, false) => {
-                    node = prev_child;
-                    break;
-                }
-                _ => {}
-            };
-            // This parent always exists since node is an ancestor of prev_child
-            prev_child = prev_child.parent().unwrap();
-        }
-    }
-
+    // Check for extend captures, potentially changing the node that the indent calculation starts with
+    extend_nodes(
+        &mut node,
+        deepest_preceding,
+        &extend_captures,
+        text,
+        line,
+        tab_width,
+    );
     let mut first_in_line = get_first_in_line(node, new_line.then(|| byte_pos));
 
     let mut result = Indentation::default();

From dc443487d4be520efb667f9f93b6c3cbd22e81fd Mon Sep 17 00:00:00 2001
From: Daniel Ebert <daniel.ebert@protonmail.com>
Date: Sat, 17 Sep 2022 15:03:39 +0200
Subject: [PATCH 257/884] Slightly change the behavior of the `@stop-extend`
 capture. This improves the behavior in case of multiple nested extensions.

---
 book/src/guides/indent.md |  9 +++++----
 helix-core/src/indent.rs  | 21 +++++++++++----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/book/src/guides/indent.md b/book/src/guides/indent.md
index c9306a10..13550846 100644
--- a/book/src/guides/indent.md
+++ b/book/src/guides/indent.md
@@ -54,10 +54,11 @@ for languages like Python, where for the purpose of indentation some nodes
 
 - `@stop-extend`:
 Prevents the first extension of an ancestor of this node. For example, in Python
-a return expression always ends the block that it is in. Note that this only prevents
-the next extension of one ancestor: If multiple ancestors can be extended (for example
-multiple nested conditional blocks in python), only the extension of the innermost
-ancestor is prevented.
+a return expression always ends the block that it is in. Note that this only stops the
+extension of the next `@extend-indented` capture. If multiple ancestors are captured,
+only the extension of the innermost one is prevented. All other ancestors are unaffected
+(regardless of whether the innermost ancestor would actually have been extended).
+
 
 ## Predicates
 
diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index 7556c169..1ea8f18b 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -471,6 +471,10 @@ fn extend_nodes<'a>(
         let mut stop_extend = false;
         while deepest_preceding != *node {
             let mut extend_node = false;
+            // This will be set to true if this node is captured, regardless of whether
+            // it actually will be extended (e.g. because the cursor isn't indented
+            // more than the node).
+            let mut node_captured = false;
             if let Some(captures) = extend_captures.get(&deepest_preceding.id()) {
                 for capture in captures {
                     match capture {
@@ -478,6 +482,7 @@ fn extend_nodes<'a>(
                             stop_extend = true;
                         }
                         ExtendCapture::ExtendIndented => {
+                            node_captured = true;
                             // We extend the node if
                             // - the cursor is on the same line as the end of the node OR
                             // - the line that the cursor is on is more indented than the
@@ -501,16 +506,12 @@ fn extend_nodes<'a>(
             }
             // If we encountered some `StopExtend` capture before, we don't
             // extend the node even if we otherwise would
-            match (extend_node, stop_extend) {
-                (true, true) => {
-                    stop_extend = false;
-                }
-                (true, false) => {
-                    *node = deepest_preceding;
-                    break;
-                }
-                _ => {}
-            };
+            if node_captured && stop_extend {
+                stop_extend = false;
+            } else if extend_node && !stop_extend {
+                *node = deepest_preceding;
+                break;
+            }
             // This parent always exists since node is an ancestor of deepest_preceding
             deepest_preceding = deepest_preceding.parent().unwrap();
         }

From 081327695f7d4740f8a66bf2da75905656f70a58 Mon Sep 17 00:00:00 2001
From: Daniel Ebert <daniel.ebert@protonmail.com>
Date: Sat, 8 Oct 2022 11:04:11 +0200
Subject: [PATCH 258/884] Rename extend indent captures. Clarify comments in
 indent code.

---
 book/src/guides/indent.md          |  6 +++---
 helix-core/src/indent.rs           | 20 ++++++++++----------
 runtime/queries/python/indents.scm |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/book/src/guides/indent.md b/book/src/guides/indent.md
index 13550846..0e259289 100644
--- a/book/src/guides/indent.md
+++ b/book/src/guides/indent.md
@@ -46,16 +46,16 @@ capture on the same line, the indent level isn't changed at all.
 - `@outdent` (default scope `all`):
 Decrease the indent level by 1. The same rules as for `@indent` apply.
 
-- `@extend-indented`:
+- `@extend`:
 Extend the range of this node to the end of the line and to lines that
 are indented more than the line that this node starts on. This is useful
 for languages like Python, where for the purpose of indentation some nodes
 (like functions or classes) should also contain indented lines that follow them.
 
-- `@stop-extend`:
+- `@extend.prevent-once`:
 Prevents the first extension of an ancestor of this node. For example, in Python
 a return expression always ends the block that it is in. Note that this only stops the
-extension of the next `@extend-indented` capture. If multiple ancestors are captured,
+extension of the next `@extend` capture. If multiple ancestors are captured,
 only the extension of the innermost one is prevented. All other ancestors are unaffected
 (regardless of whether the innermost ancestor would actually have been extended).
 
diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index 1ea8f18b..9526fc8a 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -303,8 +303,8 @@ enum IndentScope {
 /// A capture from the indent query which does not define an indent but extends
 /// the range of a node. This is used before the indent is calculated.
 enum ExtendCapture {
-    ExtendIndented,
-    StopExtend,
+    Extend,
+    PreventOnce,
 }
 
 /// The result of running a tree-sitter indent query. This stores for
@@ -394,18 +394,18 @@ fn query_indents(
             let capture_type = match capture_name {
                 "indent" => IndentCaptureType::Indent,
                 "outdent" => IndentCaptureType::Outdent,
-                "extend-indented" => {
+                "extend" => {
                     extend_captures
                         .entry(capture.node.id())
                         .or_insert_with(|| Vec::with_capacity(1))
-                        .push(ExtendCapture::ExtendIndented);
+                        .push(ExtendCapture::Extend);
                     continue;
                 }
-                "stop-extend" => {
+                "extend.prevent-once" => {
                     extend_captures
                         .entry(capture.node.id())
                         .or_insert_with(|| Vec::with_capacity(1))
-                        .push(ExtendCapture::StopExtend);
+                        .push(ExtendCapture::PreventOnce);
                     continue;
                 }
                 _ => {
@@ -478,10 +478,10 @@ fn extend_nodes<'a>(
             if let Some(captures) = extend_captures.get(&deepest_preceding.id()) {
                 for capture in captures {
                     match capture {
-                        ExtendCapture::StopExtend => {
+                        ExtendCapture::PreventOnce => {
                             stop_extend = true;
                         }
-                        ExtendCapture::ExtendIndented => {
+                        ExtendCapture::Extend => {
                             node_captured = true;
                             // We extend the node if
                             // - the cursor is on the same line as the end of the node OR
@@ -574,8 +574,8 @@ pub fn treesitter_indent_for_pos(
         .descendant_for_byte_range(byte_pos, byte_pos)?;
     let (query_result, deepest_preceding) = {
         // The query range should intersect with all nodes directly preceding
-        // the cursor in case one of them is extended.
-        let mut deepest_preceding = None; // The deepest node preceding the cursor
+        // the position of the indent query in case one of them is extended.
+        let mut deepest_preceding = None; // The deepest node preceding the indent query position
         let mut tree_cursor = node.walk();
         for child in node.children(&mut tree_cursor) {
             if child.byte_range().end <= byte_pos {
diff --git a/runtime/queries/python/indents.scm b/runtime/queries/python/indents.scm
index c648aebc..b7b499c0 100644
--- a/runtime/queries/python/indents.scm
+++ b/runtime/queries/python/indents.scm
@@ -36,7 +36,7 @@
 
   (function_definition)
   (class_definition)
-] @extend-indented
+] @extend
 
 [
   (return_statement)
@@ -44,7 +44,7 @@
   (continue_statement)
   (raise_statement)
   (pass_statement)
-] @stop-extend
+] @extend.prevent-once
 
 [
   ")"

From 328c4d002f5eaef2b79c73a48ce5011e89425b54 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Tue, 11 Oct 2022 12:11:33 +0200
Subject: [PATCH 259/884] adress review comments

---
 book/src/themes.md         |  2 +-
 helix-view/src/graphics.rs | 18 +++++++++---------
 helix-view/src/theme.rs    |  3 +--
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/book/src/themes.md b/book/src/themes.md
index e84f8705..66ad380e 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -16,7 +16,7 @@ Each line in the theme file is specified as below:
 key = { fg = "#ffffff", bg = "#000000", underline-color = "#ff0000", underline-style = "curl", modifiers = ["bold", "italic"] }
 ```
 
-where `key` represents what you want to style, `fg` specifies the foreground color, `bg` the background color, `underline_style` the underline style, `underline_color` the underline color (only meaningful if an underline style is enabled), and `modifiers` is a list of style modifiers. `bg`, `underline` and `modifiers` can be omitted to defer to the defaults.
+where `key` represents what you want to style, `fg` specifies the foreground color, `bg` the background color, `underline-style` the underline style, `underline-color` the underline color (only meaningful if an underline style is enabled), and `modifiers` is a list of style modifiers. `bg`, `underline` and `modifiers` can be omitted to defer to the defaults.
 
 To specify only the foreground color:
 
diff --git a/helix-view/src/graphics.rs b/helix-view/src/graphics.rs
index 01344748..4374a537 100644
--- a/helix-view/src/graphics.rs
+++ b/helix-view/src/graphics.rs
@@ -365,16 +365,16 @@ bitflags! {
     ///
     /// let m = Modifier::BOLD | Modifier::ITALIC;
     /// ```
-    #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize), serde(rename_all = "kebab-case"))]
+    #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
     pub struct Modifier: u16 {
-        const BOLD              = 0b0000_0000_0000_0001;
-        const DIM               = 0b0000_0000_0000_0010;
-        const ITALIC            = 0b0000_0000_0000_0100;
-        const SLOW_BLINK        = 0b0000_0000_0001_0000;
-        const RAPID_BLINK       = 0b0000_0000_0010_0000;
-        const REVERSED          = 0b0000_0000_0100_0000;
-        const HIDDEN            = 0b0000_0000_1000_0000;
-        const CROSSED_OUT       = 0b0000_0001_0000_0000;
+        const BOLD              = 0b0000_0000_0001;
+        const DIM               = 0b0000_0000_0010;
+        const ITALIC            = 0b0000_0000_0100;
+        const SLOW_BLINK        = 0b0000_0001_0000;
+        const RAPID_BLINK       = 0b0000_0010_0000;
+        const REVERSED          = 0b0000_0100_0000;
+        const HIDDEN            = 0b0000_1000_0000;
+        const CROSSED_OUT       = 0b0001_0000_0000;
     }
 }
 
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index b1c96f94..c32b3edf 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -268,7 +268,7 @@ impl ThemePalette {
         value
             .as_str()
             .and_then(|s| s.parse().ok())
-            .ok_or(format!("Theme: invalid underline_style: {}", value))
+            .ok_or(format!("Theme: invalid underline-style: {}", value))
     }
 
     pub fn parse_style(&self, style: &mut Style, value: Value) -> Result<(), String> {
@@ -279,7 +279,6 @@ impl ThemePalette {
                     "bg" => *style = style.bg(self.parse_color(value)?),
                     "underline-color" => *style = style.underline_color(self.parse_color(value)?),
                     "underline-style" => {
-                        warn!("found style");
                         *style = style.underline_style(Self::parse_underline_style(&value)?)
                     }
                     "modifiers" => {

From f4d96b2ca335977ea9b9031e35994b7f15f05c25 Mon Sep 17 00:00:00 2001
From: Brian Orwe <Brian.orwe@gmail.com>
Date: Tue, 11 Oct 2022 16:25:42 +0300
Subject: [PATCH 260/884] Fix confusion with using --hsplit --vsplit on startup
 at same time (#4202)

---
 helix-term/src/args.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/args.rs b/helix-term/src/args.rs
index 48c86633..dd787f1f 100644
--- a/helix-term/src/args.rs
+++ b/helix-term/src/args.rs
@@ -32,8 +32,14 @@ impl Args {
                 "--version" => args.display_version = true,
                 "--help" => args.display_help = true,
                 "--tutor" => args.load_tutor = true,
-                "--vsplit" => args.split = Some(Layout::Vertical),
-                "--hsplit" => args.split = Some(Layout::Horizontal),
+                "--vsplit" => match args.split {
+                    Some(_) => anyhow::bail!("can only set a split once of a specific type"),
+                    None => args.split = Some(Layout::Vertical),
+                },
+                "--hsplit" => match args.split {
+                    Some(_) => anyhow::bail!("can only set a split once of a specific type"),
+                    None => args.split = Some(Layout::Horizontal),
+                },
                 "--health" => {
                     args.health = true;
                     args.health_arg = argv.next_if(|opt| !opt.starts_with('-'));

From c54a0363bb59300290efa8ba86e291d94f938673 Mon Sep 17 00:00:00 2001
From: Jacob Kiesel <kieseljake@live.com>
Date: Tue, 11 Oct 2022 17:54:18 -0600
Subject: [PATCH 261/884] Rearrange README.md slightly (#4206)

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1e12ef2d..85f80b65 100644
--- a/README.md
+++ b/README.md
@@ -42,10 +42,8 @@ cargo install --path helix-term
 ```
 
 This will install the `hx` binary to `$HOME/.cargo/bin` and build tree-sitter grammars.
-If you want to customize your `languages.toml` config,
-tree-sitter grammars may be manually fetched and built with `hx --grammar fetch` and `hx --grammar build`.
 
-Helix also needs its runtime files so make sure to copy/symlink the `runtime/` directory into the
+Helix needs its runtime files so make sure to copy/symlink the `runtime/` directory into the
 config directory (for example `~/.config/helix/runtime` on Linux/macOS, or `%AppData%/helix/runtime` on Windows).
 
 | OS                   | Command                                          |
@@ -62,6 +60,9 @@ that sets the variable to the install dir.
 > NOTE: running via cargo also doesn't require setting explicit `HELIX_RUNTIME` path, it will automatically
 > detect the `runtime` directory in the project root.
 
+If you want to customize your `languages.toml` config,
+tree-sitter grammars may be manually fetched and built with `hx --grammar fetch` and `hx --grammar build`.
+
 In order to use LSP features like auto-complete, you will need to
 [install the appropriate Language Server](https://github.com/helix-editor/helix/wiki/How-to-install-the-default-language-servers)
 for a language.

From 963a0ac0bbc43e2b26a9662bc67dd226582ad12a Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Wed, 12 Oct 2022 11:33:48 +0200
Subject: [PATCH 262/884] fix terminfo detection

---
 Cargo.lock                         |  4 ++--
 helix-tui/src/backend/crossterm.rs | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 03b3a6d4..6af26d37 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1101,9 +1101,9 @@ dependencies = [
 
 [[package]]
 name = "termini"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00733d628ac0a8bd4fd3171a28eb6c09759ae1b43d8b587eadebaccee01d01a3"
+checksum = "394766021ef3dae8077f080518cdf5360831990f77f5708d5e3594c9b3efa2f9"
 dependencies = [
  "dirs-next",
 ]
diff --git a/helix-tui/src/backend/crossterm.rs b/helix-tui/src/backend/crossterm.rs
index 7b3b0817..7c7250fa 100644
--- a/helix-tui/src/backend/crossterm.rs
+++ b/helix-tui/src/backend/crossterm.rs
@@ -113,21 +113,21 @@ where
             }
 
             let mut new_underline_style = cell.underline_style;
-            if !self.capabilities.has_extended_underlines {
-                match new_underline_style {
-                    UnderlineStyle::Reset | UnderlineStyle::Line => (),
-                    _ => new_underline_style = UnderlineStyle::Line,
-                }
-
+            if self.capabilities.has_extended_underlines {
                 if cell.underline_color != underline_color {
                     let color = CColor::from(cell.underline_color);
                     map_error(queue!(self.buffer, SetUnderlineColor(color)))?;
                     underline_color = cell.underline_color;
                 }
+            } else {
+                match new_underline_style {
+                    UnderlineStyle::Reset | UnderlineStyle::Line => (),
+                    _ => new_underline_style = UnderlineStyle::Line,
+                }
             }
 
             if new_underline_style != underline_style {
-                let attr = CAttribute::from(cell.underline_style);
+                let attr = CAttribute::from(new_underline_style);
                 map_error(queue!(self.buffer, SetAttribute(attr)))?;
                 underline_style = new_underline_style;
             }

From 68909dcef46c7b68f1a92cdc7fd04eb89549b6fb Mon Sep 17 00:00:00 2001
From: Graic <33105645+Graicc@users.noreply.github.com>
Date: Wed, 12 Oct 2022 09:34:35 -0400
Subject: [PATCH 263/884] Fix append cursor location when selection anchor is
 at end of document (#4147)

---
 helix-term/src/commands.rs        |  2 +-
 helix-term/tests/test/movement.rs | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index ad84c85c..474006e3 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2222,7 +2222,7 @@ fn append_mode(cx: &mut Context) {
         .iter()
         .last()
         .expect("selection should always have at least one range");
-    if !last_range.is_empty() && last_range.head == end {
+    if !last_range.is_empty() && last_range.to() == end {
         let transaction = Transaction::change(
             doc.text(),
             [(end, end, Some(doc.line_ending.as_str().into()))].into_iter(),
diff --git a/helix-term/tests/test/movement.rs b/helix-term/tests/test/movement.rs
index e5abb0b0..45aae39e 100644
--- a/helix-term/tests/test/movement.rs
+++ b/helix-term/tests/test/movement.rs
@@ -86,6 +86,27 @@ async fn cursor_position_newly_opened_file() -> anyhow::Result<()> {
     Ok(())
 }
 
+#[tokio::test]
+async fn cursor_position_append_eof() -> anyhow::Result<()> {
+    // Selection is fowards
+    test((
+        "#[foo|]#",
+        "abar<esc>",
+        helpers::platform_line("#[foobar|]#\n").as_ref(),
+    ))
+    .await?;
+
+    // Selection is backwards
+    test((
+        "#[|foo]#",
+        "abar<esc>",
+        helpers::platform_line("#[foobar|]#\n").as_ref(),
+    ))
+    .await?;
+
+    Ok(())
+}
+
 #[tokio::test]
 async fn select_mode_tree_sitter_next_function_is_union_of_objects() -> anyhow::Result<()> {
     test_with_config(

From a24fae3b3cca81a4716bc92915005cd424ccf23b Mon Sep 17 00:00:00 2001
From: Lennard Hofmann <lennard.hofmann@web.de>
Date: Wed, 12 Oct 2022 15:45:56 +0200
Subject: [PATCH 264/884] Update tree-sitter-lua and add textobjects for Lua
 (#3552)

---
 book/src/generated/lang-support.md  |  2 +-
 languages.toml                      |  2 +-
 runtime/queries/lua/folds.scm       | 10 ++++
 runtime/queries/lua/highlights.scm  | 77 +++++++++++++++--------------
 runtime/queries/lua/indents.scm     | 10 ++--
 runtime/queries/lua/injections.scm  |  3 +-
 runtime/queries/lua/textobjects.scm | 15 ++++++
 7 files changed, 72 insertions(+), 47 deletions(-)
 create mode 100644 runtime/queries/lua/folds.scm
 create mode 100644 runtime/queries/lua/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index deeef34f..74e63796 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -66,7 +66,7 @@
 | llvm | ✓ | ✓ | ✓ |  |
 | llvm-mir | ✓ | ✓ | ✓ |  |
 | llvm-mir-yaml | ✓ |  | ✓ |  |
-| lua | ✓ |  | ✓ | `lua-language-server` |
+| lua | ✓ | ✓ | ✓ | `lua-language-server` |
 | make | ✓ |  |  |  |
 | markdown | ✓ |  |  | `marksman` |
 | markdown.inline | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 08645af8..892f3117 100644
--- a/languages.toml
+++ b/languages.toml
@@ -667,7 +667,7 @@ language-server = { command = "lua-language-server", args = [] }
 
 [[grammar]]
 name = "lua"
-source = { git = "https://github.com/nvim-treesitter/tree-sitter-lua", rev = "6f5d40190ec8a0aa8c8410699353d820f4f7d7a6" }
+source = { git = "https://github.com/MunifTanjim/tree-sitter-lua", rev = "887dfd4e83c469300c279314ff1619b1d0b85b91" }
 
 [[language]]
 name = "svelte"
diff --git a/runtime/queries/lua/folds.scm b/runtime/queries/lua/folds.scm
new file mode 100644
index 00000000..d8f0b42d
--- /dev/null
+++ b/runtime/queries/lua/folds.scm
@@ -0,0 +1,10 @@
+[
+ (do_statement)
+ (while_statement)
+ (repeat_statement)
+ (if_statement)
+ (for_statement)
+ (function_declaration)
+ (function_definition)
+ (table_constructor)
+] @fold
diff --git a/runtime/queries/lua/highlights.scm b/runtime/queries/lua/highlights.scm
index e73b32d6..f48e607c 100644
--- a/runtime/queries/lua/highlights.scm
+++ b/runtime/queries/lua/highlights.scm
@@ -1,7 +1,8 @@
 ;;; Highlighting for lua
 
 ;;; Builtins
-(self) @variable.builtin
+((identifier) @variable.builtin
+ (#eq? @variable.builtin "self"))
 
 ;; Keywords
 
@@ -12,20 +13,20 @@
   "end"
 ] @keyword.control.conditional)
 
+(elseif_statement
 [
-  "else"
   "elseif"
   "then"
-] @keyword.control.conditional
+  "end"
+] @keyword.control.conditional)
 
-(for_statement
+(else_statement
 [
-  "for"
-  "do"
+  "else"
   "end"
-] @keyword.control.repeat)
+] @keyword.control.conditional)
 
-(for_in_statement
+(for_statement
 [
   "for"
   "do"
@@ -51,21 +52,34 @@
   "end"
 ] @keyword)
 
+"return" @keyword.control.return
+
 [
  "in"
  "local"
  (break_statement)
  "goto"
- "return"
 ] @keyword
 
+(function_declaration
+[
+  "function"
+  "end"
+] @keyword.function)
+
+(function_definition
+[
+  "function"
+  "end"
+] @keyword.function)
+
 ;; Operators
 
 [
  "not"
  "and"
  "or"
-] @operator
+] @keyword.operator
 
 [
 "="
@@ -95,6 +109,7 @@
 ["," "." ":" ";"] @punctuation.delimiter
 
 ;; Brackets
+
 [
  "("
  ")"
@@ -110,7 +125,8 @@
 (true)
 ] @constant.builtin.boolean
 (nil) @constant.builtin
-(spread) @constant ;; "..."
+(vararg_expression) @constant
+
 ((identifier) @constant
  (#match? @constant "^[A-Z][A-Z_0-9]*$"))
 
@@ -119,45 +135,32 @@
   (identifier) @variable.parameter)
 
 ; ;; Functions
-(function [(function_name) (identifier)] @function)
-(function ["function" "end"] @keyword.function)
-
-(function
-  (function_name
-   (function_name_field
-    (property_identifier) @function .)))
-
-(local_function (identifier) @function)
-(local_function ["function" "end"] @keyword.function)
+(function_declaration name: (identifier) @function)
+(function_call name: (identifier) @function.call)
 
-(variable_declaration
- (variable_declarator (identifier) @function) (function_definition))
-(local_variable_declaration
- (variable_declarator (identifier) @function) (function_definition))
+(function_declaration name: (dot_index_expression field: (identifier) @function))
+(function_call name: (dot_index_expression field: (identifier) @function.call))
 
-(function_definition ["function" "end"] @keyword.function)
+; TODO: incorrectly highlights variable N in `N, nop = 42, function() end`
+(assignment_statement
+    (variable_list
+      name: (identifier) @function)
+    (expression_list
+      value: (function_definition)))
 
-(function_call
-  [
-   ((identifier) @variable (method) @function.method)
-   ((_) (method) @function.method)
-   (identifier) @function
-   (field_expression (property_identifier) @function)
-  ]
-  . (arguments))
+(method_index_expression method: (identifier) @function.method)
 
 ;; Nodes
-(table ["{" "}"] @constructor)
 (comment) @comment
 (string) @string
 (number) @constant.numeric.integer
 (label_statement) @label
 ; A bit of a tricky one, this will only match field names
 (field . (identifier) @variable.other.member (_))
-(shebang) @comment
+(hash_bang_line) @comment
 
 ;; Property
-(property_identifier) @variable.other.member
+(dot_index_expression field: (identifier) @variable.other.member)
 
 ;; Variable
 (identifier) @variable
diff --git a/runtime/queries/lua/indents.scm b/runtime/queries/lua/indents.scm
index 55a812c5..2e5a108e 100644
--- a/runtime/queries/lua/indents.scm
+++ b/runtime/queries/lua/indents.scm
@@ -1,17 +1,13 @@
 [
   (function_definition)
-  (variable_declaration)
-  (local_variable_declaration)
+  (function_declaration)
+  (method_index_expression)
   (field)
-  (local_function)
-  (function)
   (if_statement)
   (for_statement)
-  (for_in_statement)
   (repeat_statement)
-  (return_statement)
   (while_statement)
-  (table)
+  (table_constructor)
   (arguments)
   (do_statement)
 ] @indent
diff --git a/runtime/queries/lua/injections.scm b/runtime/queries/lua/injections.scm
index 321c90ad..fca94d58 100644
--- a/runtime/queries/lua/injections.scm
+++ b/runtime/queries/lua/injections.scm
@@ -1,2 +1,3 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+ (#set! injection.language "comment")
+ (#set! injection.include-children))
diff --git a/runtime/queries/lua/textobjects.scm b/runtime/queries/lua/textobjects.scm
new file mode 100644
index 00000000..6fb2000d
--- /dev/null
+++ b/runtime/queries/lua/textobjects.scm
@@ -0,0 +1,15 @@
+(function_definition
+  body: (_) @function.inside) @function.around
+
+(function_declaration
+  body: (_) @function.inside) @function.around
+
+(parameters
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(arguments
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(comment) @comment.inside
+
+(comment)+ @comment.around

From 7f75458e6f29f2dc0717557a1072b70deee27acb Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Wed, 12 Oct 2022 16:02:10 +0200
Subject: [PATCH 265/884] Fix some commands not showing names in palette
 (#4223)

---
 helix-term/src/commands.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 474006e3..dcaab222 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2426,11 +2426,11 @@ impl ui::menu::Item for MappableCommand {
         match self {
             MappableCommand::Typable { doc, name, .. } => match keymap.get(name as &String) {
                 Some(bindings) => format!("{} ({}) [{}]", doc, fmt_binding(bindings), name).into(),
-                None => doc.as_str().into(),
+                None => format!("{} [{}]", doc, name).into(),
             },
             MappableCommand::Static { doc, name, .. } => match keymap.get(*name) {
                 Some(bindings) => format!("{} ({}) [{}]", doc, fmt_binding(bindings), name).into(),
-                None => (*doc).into(),
+                None => format!("{} [{}]", doc, name).into(),
             },
         }
     }

From e16c63276082f1cf79c57ff2ed2d301fe3333a0e Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 12 Oct 2022 10:57:40 -0500
Subject: [PATCH 266/884] Apply transactions to the jumplist for undo/redo
 (#4227)

Undo/redo/earlier/later call `Document::apply_impl` which applies
transactions to the document. These transactions also need to be
applied to the view as in 0aedef0.
---
 helix-term/src/commands.rs       |  8 ++++----
 helix-term/src/commands/typed.rs |  4 ++--
 helix-view/src/document.rs       | 24 ++++++++++++------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index dcaab222..93e82b84 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3258,7 +3258,7 @@ fn undo(cx: &mut Context) {
     let count = cx.count();
     let (view, doc) = current!(cx.editor);
     for _ in 0..count {
-        if !doc.undo(view.id) {
+        if !doc.undo(view) {
             cx.editor.set_status("Already at oldest change");
             break;
         }
@@ -3269,7 +3269,7 @@ fn redo(cx: &mut Context) {
     let count = cx.count();
     let (view, doc) = current!(cx.editor);
     for _ in 0..count {
-        if !doc.redo(view.id) {
+        if !doc.redo(view) {
             cx.editor.set_status("Already at newest change");
             break;
         }
@@ -3281,7 +3281,7 @@ fn earlier(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
     for _ in 0..count {
         // rather than doing in batch we do this so get error halfway
-        if !doc.earlier(view.id, UndoKind::Steps(1)) {
+        if !doc.earlier(view, UndoKind::Steps(1)) {
             cx.editor.set_status("Already at oldest change");
             break;
         }
@@ -3293,7 +3293,7 @@ fn later(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
     for _ in 0..count {
         // rather than doing in batch we do this so get error halfway
-        if !doc.later(view.id, UndoKind::Steps(1)) {
+        if !doc.later(view, UndoKind::Steps(1)) {
             cx.editor.set_status("Already at newest change");
             break;
         }
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 726c7456..78d25c1a 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -483,7 +483,7 @@ fn earlier(
     let uk = args.join(" ").parse::<UndoKind>().map_err(|s| anyhow!(s))?;
 
     let (view, doc) = current!(cx.editor);
-    let success = doc.earlier(view.id, uk);
+    let success = doc.earlier(view, uk);
     if !success {
         cx.editor.set_status("Already at oldest change");
     }
@@ -502,7 +502,7 @@ fn later(
 
     let uk = args.join(" ").parse::<UndoKind>().map_err(|s| anyhow!(s))?;
     let (view, doc) = current!(cx.editor);
-    let success = doc.later(view.id, uk);
+    let success = doc.later(view, uk);
     if !success {
         cx.editor.set_status("Already at newest change");
     }
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 93708339..0daa983f 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -834,11 +834,11 @@ impl Document {
         success
     }
 
-    fn undo_redo_impl(&mut self, view_id: ViewId, undo: bool) -> bool {
+    fn undo_redo_impl(&mut self, view: &mut View, undo: bool) -> bool {
         let mut history = self.history.take();
         let txn = if undo { history.undo() } else { history.redo() };
         let success = if let Some(txn) = txn {
-            self.apply_impl(txn, view_id)
+            self.apply_impl(txn, view.id) && view.apply(txn, self)
         } else {
             false
         };
@@ -852,13 +852,13 @@ impl Document {
     }
 
     /// Undo the last modification to the [`Document`]. Returns whether the undo was successful.
-    pub fn undo(&mut self, view_id: ViewId) -> bool {
-        self.undo_redo_impl(view_id, true)
+    pub fn undo(&mut self, view: &mut View) -> bool {
+        self.undo_redo_impl(view, true)
     }
 
     /// Redo the last modification to the [`Document`]. Returns whether the redo was successful.
-    pub fn redo(&mut self, view_id: ViewId) -> bool {
-        self.undo_redo_impl(view_id, false)
+    pub fn redo(&mut self, view: &mut View) -> bool {
+        self.undo_redo_impl(view, false)
     }
 
     pub fn savepoint(&mut self) {
@@ -871,7 +871,7 @@ impl Document {
         }
     }
 
-    fn earlier_later_impl(&mut self, view_id: ViewId, uk: UndoKind, earlier: bool) -> bool {
+    fn earlier_later_impl(&mut self, view: &mut View, uk: UndoKind, earlier: bool) -> bool {
         let txns = if earlier {
             self.history.get_mut().earlier(uk)
         } else {
@@ -879,7 +879,7 @@ impl Document {
         };
         let mut success = false;
         for txn in txns {
-            if self.apply_impl(&txn, view_id) {
+            if self.apply_impl(&txn, view.id) && view.apply(&txn, self) {
                 success = true;
             }
         }
@@ -891,13 +891,13 @@ impl Document {
     }
 
     /// Undo modifications to the [`Document`] according to `uk`.
-    pub fn earlier(&mut self, view_id: ViewId, uk: UndoKind) -> bool {
-        self.earlier_later_impl(view_id, uk, true)
+    pub fn earlier(&mut self, view: &mut View, uk: UndoKind) -> bool {
+        self.earlier_later_impl(view, uk, true)
     }
 
     /// Redo modifications to the [`Document`] according to `uk`.
-    pub fn later(&mut self, view_id: ViewId, uk: UndoKind) -> bool {
-        self.earlier_later_impl(view_id, uk, false)
+    pub fn later(&mut self, view: &mut View, uk: UndoKind) -> bool {
+        self.earlier_later_impl(view, uk, false)
     }
 
     /// Commit pending changes to history

From 6db39eacd35af488808607028b423c6ab2bee94e Mon Sep 17 00:00:00 2001
From: Tim Siegel <siegeltr@gmail.com>
Date: Mon, 10 Oct 2022 09:59:15 -0400
Subject: [PATCH 267/884] tutor: Clarify forward reference to "select command"

The phrase "Like the select command" suggests that the reader has been
introduced to select already. That doesn't happen until the next
chapter.
---
 runtime/tutor | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/runtime/tutor b/runtime/tutor
index f006d6dc..6e1ec075 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -450,7 +450,9 @@ _________________________________________________________________
  2. Type enter to confirm the search.
  3. Use n and N to cycle through the matches.
 
- Like the select command, searching also uses regex.
+ Searching uses regular expressions, allowing you to target more
+ complex expressions, which you'll learn about in the lesson on
+ the select command.
 
  Note: To search backwards, type ? (shift-/).
  Note: Unlike Vim, ? doesn't change the search direction.
@@ -530,8 +532,8 @@ _________________________________________________________________
 =                    5.3 SELECTING VIA REGEX                    =
 =================================================================
 
- The select command selects regular expressions, not just exact
- matches, allowing you to target more complex patterns.
+ Like searching, the select command selects regular expressions,
+ not just exact matches.
 
  1. Move the cursor to the line marked '-->' below.
  2. Select the line with x and then type s.

From 0571fa4d56a7905da669d637195490dc0f4eacc1 Mon Sep 17 00:00:00 2001
From: Tim Siegel <siegeltr@gmail.com>
Date: Mon, 10 Oct 2022 10:32:23 -0400
Subject: [PATCH 268/884] tutor: Clarify first multi-cursor example

If the reader is unfortunate enough to place the cursor at the beginning
of the line on step #1, subsequent steps will fail.
---
 runtime/tutor | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/runtime/tutor b/runtime/tutor
index 6e1ec075..e0e2436b 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -490,7 +490,8 @@ _________________________________________________________________
 
  Type C to duplicate the cursor to the next suitable line.
 
- 1. Move the cursor to the first line marked '-->' below.
+ 1. Move the cursor to the first line below marked -->. Place
+    the cursor on the first word.
  2. Type C to duplicate the cursor to the next suitable line.
     Notice how it skips the line in the middle. Keys you type
     will now affect both cursors.

From f5f4d3dc2a2a3fe6779f4331970fd1c1c0378ced Mon Sep 17 00:00:00 2001
From: Tim Siegel <siegeltr@gmail.com>
Date: Mon, 10 Oct 2022 11:53:05 -0400
Subject: [PATCH 269/884] tutor: Clarify forward reference to "primary
 selection"

---
 runtime/tutor | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/runtime/tutor b/runtime/tutor
index e0e2436b..7aa072ce 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -889,8 +889,9 @@ lines.
  n and N both refer to register /, this means we can set that
  register without having to type in a search.
 
- Type * to copy the primary selection into register /, setting
- the search term to the selection.
+ Type * to copy the selection into register /, setting the search
+ term to the selection. This copies the primary selection, which
+ you will learn about in the section on cycling selections.
 
  1. Move the cursor to the line marked '-->' below.
  2. Select "horse" with e and type *.

From e542f2e08f143ef2fd59ca2957842ba82338b63f Mon Sep 17 00:00:00 2001
From: Tim Siegel <siegeltr@gmail.com>
Date: Mon, 10 Oct 2022 13:29:18 -0400
Subject: [PATCH 270/884] tutor: Minor grammar fix

No need to say additionally, as well, also, etc. One is enough.
---
 runtime/tutor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/tutor b/runtime/tutor
index 7aa072ce..4cd3f3c8 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -990,7 +990,7 @@ lines.
  --> if a wouldchuck could chuck would?
 
  Note: Additionally, A-( and A-) cycle the *contents* of the
-       selections as well.
+       selections.
 
 =================================================================
 =                     10.2 CHANGING CASE                        =

From 425df93fb88ecfd0f87025705de348051cd40ccf Mon Sep 17 00:00:00 2001
From: Tim Siegel <siegeltr@gmail.com>
Date: Mon, 10 Oct 2022 14:32:05 -0400
Subject: [PATCH 271/884] book: Refer to keys by key names, not representations

This is an attempt to clean up the inconsistent way that keys are
written in various places. These rules require the fewest changes to the
existing text.

Use the "Key name", as defined in remapping.md, which uses
"Some-Modifiers-PascalCaseKey". The "Representation", which uses
"S-M-lowercasekey", is only used for configuration entries.

For key combinations which do not present a popup, just present the keys
one after the other, with no intervening space, like `]p`.

For key combinations which present a popup, separate them with ` + `,
like `Space + f`.

The Ctrl modifier is called Ctrl, not Control.
---
 book/src/keymap.md    | 12 ++++++------
 book/src/remapping.md |  8 ++++----
 book/src/themes.md    |  4 ++--
 book/src/usage.md     | 12 ++++++------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 9bc1c31e..7fd146a6 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -129,7 +129,7 @@
 | `X`                   | Extend selection to line bounds (line-wise selection)             | `extend_to_line_bounds`              |
 | `Alt-x`               | Shrink selection to line bounds (line-wise selection)             | `shrink_to_line_bounds`              |
 | `J`                   | Join lines inside selection                                       | `join_selections`                    |
-| `A-J`                 | Join lines inside selection and select space                      | `join_selections_space`              |
+| `Alt-J`               | Join lines inside selection and select space                      | `join_selections_space`              |
 | `K`                   | Keep selections matching the regex                                | `keep_selections`                    |
 | `Alt-K`               | Remove selections matching the regex                              | `remove_selections`                  |
 | `Ctrl-c`              | Comment/uncomment the selections                                  | `toggle_comments`                    |
@@ -278,7 +278,7 @@ This layer is a kludge of mappings, mostly pickers.
 | `/`     | Global search in workspace folder                                       | `global_search`                     |
 | `?`     | Open command palette                                                    | `command_palette`                   |
 
-> TIP: Global search displays results in a fuzzy picker, use `space + '` to bring it back up after opening a file.
+> TIP: Global search displays results in a fuzzy picker, use `Space + '` to bring it back up after opening a file.
 
 ##### Popup
 
@@ -311,8 +311,8 @@ Mappings in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaire
 | `]t`     | Go to previous test (**TS**)                 | `goto_prev_test`      |
 | `]p`     | Go to next paragraph                         | `goto_next_paragraph` |
 | `[p`     | Go to previous paragraph                     | `goto_prev_paragraph` |
-| `[space` | Add newline above                            | `add_newline_above`   |
-| `]space` | Add newline below                            | `add_newline_below`   |
+| `[Space` | Add newline above                            | `add_newline_above`   |
+| `]Space` | Add newline below                            | `add_newline_below`   |
 
 ## Insert mode
 
@@ -414,8 +414,8 @@ Keys to use within prompt, Remapping currently not supported.
 | `Alt-d`, `Alt-Delete`, `Ctrl-Delete`        | Delete next word                                                        |
 | `Ctrl-u`                                    | Delete to start of line                                                 |
 | `Ctrl-k`                                    | Delete to end of line                                                   |
-| `backspace`, `Ctrl-h`                       | Delete previous char                                                    |
-| `delete`, `Ctrl-d`                          | Delete next char                                                        |
+| `Backspace`, `Ctrl-h`                       | Delete previous char                                                    |
+| `Delete`, `Ctrl-d`                          | Delete next char                                                        |
 | `Ctrl-s`                                    | Insert a word under doc cursor, may be changed to Ctrl-r Ctrl-w later   |
 | `Ctrl-p`, `Up`                              | Select previous history                                                 |
 | `Ctrl-n`, `Down`                            | Select next history                                                     |
diff --git a/book/src/remapping.md b/book/src/remapping.md
index bd4ac7f8..e89c6611 100644
--- a/book/src/remapping.md
+++ b/book/src/remapping.md
@@ -11,11 +11,11 @@ this:
 ```toml
 # At most one section each of 'keys.normal', 'keys.insert' and 'keys.select'
 [keys.normal]
-C-s = ":w" # Maps the Control-s to the typable command :w which is an alias for :write (save file)
-C-o = ":open ~/.config/helix/config.toml" # Maps the Control-o to opening of the helix config file
+C-s = ":w" # Maps the Ctrl-s to the typable command :w which is an alias for :write (save file)
+C-o = ":open ~/.config/helix/config.toml" # Maps the Ctrl-o to opening of the helix config file
 a = "move_char_left" # Maps the 'a' key to the move_char_left command
 w = "move_line_up" # Maps the 'w' key move_line_up
-"C-S-esc" = "extend_line" # Maps Control-Shift-Escape to extend_line
+"C-S-esc" = "extend_line" # Maps Ctrl-Shift-Escape to extend_line
 g = { a = "code_action" } # Maps `ga` to show possible code actions
 "ret" = ["open_below", "normal_mode"] # Maps the enter key to open_below then re-enter normal mode
 
@@ -25,7 +25,7 @@ j = { k = "normal_mode" } # Maps `jk` to exit insert mode
 ```
 > NOTE: Typable commands can also be remapped, remember to keep the `:` prefix to indicate it's a typable command.
 
-Control, Shift and Alt modifiers are encoded respectively with the prefixes
+Ctrl, Shift and Alt modifiers are encoded respectively with the prefixes
 `C-`, `S-` and `A-`. Special keys are encoded as follows:
 
 | Key name     | Representation |
diff --git a/book/src/themes.md b/book/src/themes.md
index 2563bb85..d1244596 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -244,7 +244,7 @@ These scopes are used for theming the editor interface.
 | `ui.statusline.insert`      | Statusline mode during insert mode ([only if `editor.color-modes` is enabled][editor-section]) |
 | `ui.statusline.select`      | Statusline mode during select mode ([only if `editor.color-modes` is enabled][editor-section]) |
 | `ui.statusline.separator`   | Separator character in statusline                                                              |
-| `ui.popup`                  | Documentation popups (e.g space-k)                                                             |
+| `ui.popup`                  | Documentation popups (e.g Space + k)                                                             |
 | `ui.popup.info`             | Prompt for multiple key options                                                                |
 | `ui.window`                 | Border lines separating splits                                                                 |
 | `ui.help`                   | Description box for commands                                                                   |
@@ -252,7 +252,7 @@ These scopes are used for theming the editor interface.
 | `ui.text.focus`             |                                                                                                |
 | `ui.text.info`              | The key: command text in `ui.popup.info` boxes                                                 |
 | `ui.virtual.ruler`          | Ruler columns (see the [`editor.rulers` config][editor-section])                               |
-| `ui.virtual.whitespace`     | Visible white-space characters                                                                 |
+| `ui.virtual.whitespace`     | Visible whitespace characters                                                                 |
 | `ui.virtual.indent-guide`   | Vertical indent width guides                                                                   |
 | `ui.menu`                   | Code and command completion menus                                                              |
 | `ui.menu.selected`          | Selected autocomplete item                                                                     |
diff --git a/book/src/usage.md b/book/src/usage.md
index fc3a83ee..646bf926 100644
--- a/book/src/usage.md
+++ b/book/src/usage.md
@@ -53,7 +53,7 @@ Multiple characters are currently not supported, but planned.
 
 ## Syntax-tree Motions
 
-`A-p`, `A-o`, `A-i`, and `A-n` (or `Alt` and arrow keys) move the primary
+`Alt-p`, `Alt-o`, `Alt-i`, and `Alt-n` (or `Alt` and arrow keys) move the primary
 selection according to the selection's place in the syntax tree. Let's walk
 through an example to get familiar with them. Many languages have a syntax like
 so for function calls:
@@ -100,13 +100,13 @@ in the tree above.
 func([arg1], arg2, arg3)
 ```
 
-Using `A-n` would select the next sibling in the syntax tree: `arg2`.
+Using `Alt-n` would select the next sibling in the syntax tree: `arg2`.
 
 ```
 func(arg1, [arg2], arg3)
 ```
 
-While `A-o` would expand the selection to the parent node. In the tree above we
+While `Alt-o` would expand the selection to the parent node. In the tree above we
 can see that we would select the `arguments` node.
 
 ```
@@ -114,10 +114,10 @@ func[(arg1, arg2, arg3)]
 ```
 
 There is also some nuanced behavior that prevents you from getting stuck on a
-node with no sibling. If we have a selection on `arg1`, `A-p` would bring us
+node with no sibling. If we have a selection on `arg1`, `Alt-p` would bring us
 to the previous child node. Since `arg1` doesn't have a sibling to its left,
-though, we climb the syntax tree and then take the previous selection. So `A-p`
-will move the selection over to the "func" `identifier`.
+though, we climb the syntax tree and then take the previous selection. So
+`Alt-p` will move the selection over to the "func" `identifier`.
 
 ```
 [func](arg1, arg2, arg3)

From 5077ce76b3d767ca4c11f8149d4fa4ad60fbb57d Mon Sep 17 00:00:00 2001
From: Tim Siegel <siegeltr@gmail.com>
Date: Mon, 10 Oct 2022 15:36:36 -0400
Subject: [PATCH 272/884] tutor: Normalize key names, capitalization, etc.

---
 runtime/tutor | 140 ++++++++++++++++++++++++--------------------------
 1 file changed, 68 insertions(+), 72 deletions(-)

diff --git a/runtime/tutor b/runtime/tutor
index 4cd3f3c8..43edb360 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -16,7 +16,7 @@ _________________________________________________________________
  perform various actions with the text. This allows for more
  efficient editing. This tutor will teach you how you can make
  use of Helix's modal editing features. To begin, ensure your
- caps-lock key is not pressed and hold the j key until you reach
+ CapsLock key is not pressed and hold the j key until you reach
  the first lesson.
 
 
@@ -31,7 +31,7 @@ _________________________________________________________________
           ↓
 
  The cursor can be moved using the h, j, k, l keys, as shown
- above. The cursor/arrow keys will also work, but it is faster
+ above. The cursor / arrow keys will also work, but it is faster
  to use the hjkl keys as they are closer to the other keys you
  will be using. Try moving around to get a feel for hjkl.
  Once you're ready, hold j to continue to the next lesson.
@@ -48,13 +48,13 @@ _________________________________________________________________
 
  1. Type : to enter Command mode. Your cursor will
     move to the bottom of the screen.
- 2. Type q or quit and type <ENTER> to exit Helix.
+ 2. Type q or quit and type Enter to exit Helix.
 
  Note: The quit command will fail if there are unsaved changes.
        To force quit and DISCARD these changes, type q! or quit!.
        You will learn how to save files later.
 
- To exit Command mode without entering a command, type <ESC>.
+ To exit Command mode without entering a command, type Escape.
 
  Now, move on to the next lesson.
 
@@ -96,7 +96,7 @@ _________________________________________________________________
  2. Move to a place in the line which is missing text and type
     i to enter Insert mode. Keys you type will now type text.
  3. Enter the missing text.
- 4. type <ESC> to exit Insert mode and return to Normal mode.
+ 4. type Escape to exit Insert mode and return to Normal mode.
  5. Repeat until the line matches the line below it.
 
  --> Th stce misg so.
@@ -112,18 +112,18 @@ _________________________________________________________________
 =                      1.5 SAVING A FILE                        =
 =================================================================
 
- Type :w/:write to save a file.
+ Type :w / :write to save a file.
 
  1. Exit Helix using :q! as explained before, or open a new
     terminal.
  2. Open a file in Helix by running: hx FILENAME
  3. Make some edits to the file.
  4. Type : to enter Command mode.
- 5. Type w or write, and type <ENTER> to save the file.
+ 5. Type w or write, and type Enter to save the file.
 
  You can also type wq or write-quit to save and exit.
 
- Note: You can optionally enter a filepath after the w/write
+ Note: You can optionally enter a filepath after the w / write
        command in order to save to that path.
  Note: If there are any unsaved changes to a file, a plus [+]
        will appear next to the file name in the status bar.
@@ -137,15 +137,15 @@ _________________________________________________________________
  * Use the h,j,k,l keys to move the cursor.
 
  * Type : to enter Command mode.
-   * The q/quit and q!/quit! commands will exit Helix. The
+   * The q / quit and q! / quit! commands will exit Helix. The
      former fails when there are unsaved changes. The latter
      discards them.
-   * The w/write command will save the file.
-   * The wq/write-quit command will do both.
+   * The w / write command will save the file.
+   * The wq / write-quit command will do both.
 
  * Type d to delete the character at the cursor.
 
- * Type i to enter Insert mode and type text. Type <ESC> to
+ * Type i to enter Insert mode and type text. Type Escape to
    return to Normal mode.
 
 
@@ -167,7 +167,7 @@ _________________________________________________________________
    A - Insert at the end of the line.
 
  1. Move to anywhere in the line marked '-->' below.
- 2. Type A (<SHIFT> + a), your cursor will move to the end of
+ 2. Type A (Shift-a), your cursor will move to the end of
     the line and you will be able to type.
  3. Type the text necessary to match the line below.
 
@@ -207,7 +207,7 @@ _________________________________________________________________
 
  * Type A to enter Insert mode at the end of a line.
 
- * Use o and O to open lines below/above the cursor respectively.
+ * Use o and O to open lines below and above the cursor respectively.
 
 
 
@@ -307,11 +307,11 @@ _________________________________________________________________
 
 
 =================================================================
-=                    3.5 SELECT/EXTEND MODE                     =
+=                    3.5 SELECT / EXTEND MODE                   =
 =================================================================
 
  Type v to enter Select mode.
- Type v again or <ESC> to return to Normal mode
+ Type v again or Escape to return to Normal mode
  In Select mode every movement will extend the selection, as
  opposed to replacing it.
 
@@ -366,8 +366,8 @@ _________________________________________________________________
 
  --> This is an error-free line with words to move around in.
 
- Note: This works the same in select mode.
- Note: Another related command is A-; which flips selections.
+ Note: This works the same in Select mode.
+ Note: Another related command is Alt-; which flips selections.
 
 
 
@@ -405,7 +405,7 @@ _________________________________________________________________
  3. Type u to undo your deletion.
  4. Fix all the errors on the line.
  5. Type u several times to undo your fixes.
- 6. Type U (<SHIFT> + u) several times to redo your fixes.
+ 6. Type U (Shift-u) several times to redo your fixes.
 
  --> Fiix the errors on thhis line and reeplace them witth undo.
 
@@ -434,34 +434,32 @@ _________________________________________________________________
      1 banana 2 banana 3 banana 4
 
  Note: Whenever you delete or change text, Helix will copy the
-       altered text. Use alt-d/c instead to avoid this.
+       altered text. Use Alt-d / Alt-c instead to avoid this.
  Note: Helix doesn't share the system clipboard by default. Type
-       space-y/p to yank/paste on your computer's main clipboard.
+       Space + y / p to yank / paste on the system's clipboard.
 
 =================================================================
 =                     4.3 SEARCHING IN FILE                     =
 =================================================================
 
- Type / to search forward in file, enter to confirm search.
+ Type / to search forward in file, Enter to confirm search.
  Type n to go to the next search match.
  Type N to go to the previous search match.
 
  1. Type / and type in a common word, like 'banana'.
- 2. Type enter to confirm the search.
+ 2. Type Enter to confirm the search.
  3. Use n and N to cycle through the matches.
 
  Searching uses regular expressions, allowing you to target more
  complex expressions, which you'll learn about in the lesson on
  the select command.
 
- Note: To search backwards, type ? (shift-/).
+ Note: To search backwards, type ? (Shift-/).
  Note: Unlike Vim, ? doesn't change the search direction.
        N always goes backwards and n always goes forwards.
 
 
 
-
-
 =================================================================
 =                        CHAPTER 4 RECAP                        =
 =================================================================
@@ -469,7 +467,7 @@ _________________________________________________________________
  * Type u to undo. Type U to redo.
 
  * Type y to yank (copy) text and p to paste.
-   * Use space-Y and space-P to yank/paste on the system
+   * Use Space + y and Space + p to yank / paste on the system
      clipboard.
 
  * Type / to search forward in file, and ? to search backwards.
@@ -490,8 +488,8 @@ _________________________________________________________________
 
  Type C to duplicate the cursor to the next suitable line.
 
- 1. Move the cursor to the first line below marked -->. Place
-    the cursor on the first word.
+ 1. Move the cursor to the first line marked '-->' below. Place
+    the cursor somewhere past the '-->'.
  2. Type C to duplicate the cursor to the next suitable line.
     Notice how it skips the line in the middle. Keys you type
     will now affect both cursors.
@@ -502,10 +500,9 @@ _________________________________________________________________
  --> Fix th two nes at same ime.
  -->
  --> Fix th two nes at same ime.
-
      Fix these two lines at the same time.
 
- Note: Type alt-C to do the same above the cursor.
+ Note: Type Alt-C to do the same above the cursor.
 
 =================================================================
 =                    5.2 THE SELECT COMMAND                     =
@@ -516,11 +513,11 @@ _________________________________________________________________
  1. Move the cursor to the line marked '-->' below.
  2. Type x to select the line.
  3. Type s. A prompt will appear.
- 4. Type 'apples' and type <ENTER>. Both occurrences of
+ 4. Type 'apples' and type Enter. Both occurrences of
     'apples' in the line will be selected.
  5. You can now type c and change 'apples' to something else,
     like 'oranges'.
- 6. Type <ESC> to exit Insert mode.
+ 6. Type Escape to exit Insert mode.
  7. Type , to remove the second cursor.
 
  --> I like to eat apples since my favorite fruit is apples.
@@ -577,11 +574,11 @@ _________________________________________________________________
 =                 5.5 SPLIT SELECTION INTO LINES                =
 =================================================================
 
- Type A-s (Alt-s) to split the selection(s) on newlines.
+ Type Alt-s to split the selection(s) on newlines.
 
  1. Move the cursor to the first row of the table below.
  2. Select the entire table with 6x.
- 3. Type A-s to split into selections at each line.
+ 3. Type Alt-s to split into selections at each line.
  4. Align the table with &.
 
     | FRUIT   | AMOUNT |
@@ -607,7 +604,7 @@ _________________________________________________________________
 
  * Type & to align selections.
 
- * Type A-s to split the selection into lines.
+ * Type Alt-s to split the selection into lines.
 
 
 
@@ -630,7 +627,7 @@ _________________________________________________________________
  2. Type f[ to select to the square bracket.
  3. Type d to delete your selection.
  4. Go to the end of the line and repeat with F].
- 5. Move to the second line marked -->, just after the arrow.
+ 5. Move to the second line marked '-->', just after the arrow.
  6. Use t and T to delete the dashes around the sentence.
 
  --> -----[Free this sentence of its brackets!]-----
@@ -666,16 +663,16 @@ _________________________________________________________________
 =================================================================
 
  Type . to repeat the last insert command.
- Type A-. to repeat the last f / t selection.
+ Type Alt-. to repeat the last f / t selection.
 
  1. Move the cursor to the line marked '-->' below.
  2. Make a change, insertion or appendage and repeat it with . .
- 3. Try using A-. with f and t, to select multiple sentences for
-    instance.
+ 3. Try using Alt-. with f and t, to select multiple sentences
+    for instance.
 
  --> This is some text for you to repeat things. You can repeat
-     insertions like changing words, or repeat selections like f/t.
-
+     insertions like changing words, or repeat selections like
+     f / t.
 
 
 
@@ -693,7 +690,7 @@ _________________________________________________________________
  * Type r to replace selected characters.
 
  * Type . to repeat the last insertion.
-   * Type A-. to repeat the last f / t selection.
+   * Type Alt-. to repeat the last f / t selection.
 
 
 
@@ -775,13 +772,13 @@ lines.
 =               7.4 INCREMENTING AND DECREMENTING               =
 =================================================================
 
- Type C-a to increment the number under selection.
- Type C-x to decrement the number under selection.
+ Type Ctrl-a to increment the number under selection.
+ Type Ctrl-x to decrement the number under selection.
 
  1. Move the cursor to the third line marked '-->' below.
- 2. Type C-a to increment the second point marked 2.
+ 2. Type Ctrl-a to increment the second point marked 2.
  3. Repeat for the point marked 3.
- 4. Move to the last point and type C-x to decrement the 6.
+ 4. Move to the last point and type Ctrl-x to decrement the 6.
 
  --> 1) First point.
  --> 2) Added point.
@@ -803,8 +800,8 @@ lines.
 
  * Type < and > to indent / outdent lines.
 
- * Type C-a to increment the selected number.
-   * Type C-x to decrement the selected number.
+ * Type Ctrl-a to increment the selected number.
+   * Type Ctrl-x to decrement the selected number.
 
 
 
@@ -903,18 +900,17 @@ lines.
  Note: * is like a shorthand for "/ y as all it really does is
        copy the selection into the / register.
 
-
 =================================================================
 =           9.2 ADDING SELECTION ON NEXT SEARCH MATCH           =
 =================================================================
 
- A property of select mode (v) when using n and N is that instead
+ A property of Select mode (v) when using n and N is that instead
  of moving the selection to the next match, it adds a new
  selection on each match.
 
  1. Move the cursor to the line marked '-->' below.
  2. Select the first "bat" and type * to set it to search.
- 3. Type v to enter select mode.
+ 3. Type v to enter Select mode.
  4. Type n to select the other "bat".
  5. Use c or r to change the "bat"s to "cat".
 
@@ -934,15 +930,15 @@ lines.
  searching or jumping to the definition of a function in code. It
  stores these in what's called the jumplist.
 
- Type C-s (ctrl-s) to manually save your current position to
+ Type Ctrl-s to manually save your current position to
  the jumplist.
 
- Type C-i ("in") and C-o ("out") to move forward and backwards in
- the jumplist respectively.
+ Type Ctrl-i ("in") and Ctrl-o ("out") to move forward and
+ backwards in the jumplist respectively.
 
- 1. Type C-s somewhere.
+ 1. Type Ctrl-s somewhere.
  2. Move far away in the file.
- 3. Type C-o (just once!) to come back to where you saved.
+ 3. Type Ctrl-o (just once!) to come back to where you saved.
 
 
 
@@ -954,12 +950,12 @@ lines.
 
  * Type * to set the search register to the primary selection.
 
- * Type n / N in visual mode to add selections on each search
+ * Type n / N in Visual mode to add selections on each search
    match.
 
- * Type C-s to save position to the jumplist.
-   * Type C-i and C-o to go forward and backward in the jumplist.
-
+ * Type Ctrl-s to save position to the jumplist.
+   * Type Ctrl-i and Ctrl-o to go forward and backward in the
+     jumplist.
 
 
 
@@ -977,20 +973,20 @@ lines.
  Type ) and ( to cycle the primary selection forward and backward
  through selections respectively.
 
- Type A-, to remove the primary selection.
+ Type Alt-, to remove the primary selection.
 
  1. Move the cursor to the line marked '-->' below.
  2. Select both lines with xx or 2x.
  3. Type s to select, type "would" and enter.
  4. Use ( and ) to cycle the primary selection and remove the
-    very second "would" with A-, .
+    very second "would" with Alt-, .
  5. Type c "wood" to change the remaining "would"s to "wood".
 
  --> How much would would a wouldchuck chuck
  --> if a wouldchuck could chuck would?
 
- Note: Additionally, A-( and A-) cycle the *contents* of the
-       selections.
+ Note: Additionally, Alt-( and Alt-) cycle the *contents* of the
+       selections as well.
 
 =================================================================
 =                     10.2 CHANGING CASE                        =
@@ -1003,10 +999,10 @@ lines.
  1. Move the cursor to the first line marked '-->' below.
  2. Select each wrongly capitalised or lowercase letter
     and type ~ over them.
- 3. Move to the second line marked -->.
+ 3. Move to the second line marked '-->'.
  4. Type x to select the line.
  5. Type ` to change the line to lowercase.
- 6. Move to the third line marked -->.
+ 6. Move to the third line marked '-->'.
  7. Type x to select the line.
  8. Type Alt-` to change the line to uppercase.
 
@@ -1022,13 +1018,13 @@ lines.
 
  1. Move the cursor to the line under ---.
  2. Type xx / 2x to select the lines.
- 3. Type S then \. |! <enter> (note the spaces after . and !).
+ 3. Type S then \. |! Enter (note the spaces after . and !).
     This effectively splits the selection into sentences at each
     dot or exclamation mark.
- 4. Type A-; to reverse the selections.
+ 4. Type Alt-; to reverse the selections.
  5. Type ; to reduce selections to a single character - the first
     letter of each sentence.
- 6. Type A-` to convert all selected letters to uppercase.
+ 6. Type Alt-` to convert all selected letters to uppercase.
 
 ---
 these are sentences. some sentences don't start with uppercase
@@ -1042,10 +1038,10 @@ letters! that is not good grammar. you can fix this.
 
  * Use ) and ( to cycle the primary selection back and forward
    through selections respectively.
-   * Type A-, to remove the primary selection.
+   * Type Alt-, to remove the primary selection.
 
  * Type ~ to alternate case of selected letters.
-   * Use ` and A-` to set the case of selected letters to
+   * Use ` and Alt-` to set the case of selected letters to
      upper and lower respectively.
 
  * Type S to split selections on regex.

From 66a49080bc7e492c37f9cd10ed36a696de1787a3 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Thu, 13 Oct 2022 19:03:58 +0200
Subject: [PATCH 273/884] merge underline-style and underline-color into a
 single table

---
 book/src/themes.md            | 10 +++++-----
 helix-view/src/theme.rs       | 21 ++++++++++++++++-----
 runtime/themes/dark_plus.toml |  4 ++--
 runtime/themes/onedark.toml   |  8 ++++----
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/book/src/themes.md b/book/src/themes.md
index 66ad380e..9738912c 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -13,10 +13,10 @@ The default theme.toml can be found [here](https://github.com/helix-editor/helix
 Each line in the theme file is specified as below:
 
 ```toml
-key = { fg = "#ffffff", bg = "#000000", underline-color = "#ff0000", underline-style = "curl", modifiers = ["bold", "italic"] }
+key = { fg = "#ffffff", bg = "#000000", underline = { color = "#ff0000", style = "curl"}, modifiers = ["bold", "italic"] }
 ```
 
-where `key` represents what you want to style, `fg` specifies the foreground color, `bg` the background color, `underline-style` the underline style, `underline-color` the underline color (only meaningful if an underline style is enabled), and `modifiers` is a list of style modifiers. `bg`, `underline` and `modifiers` can be omitted to defer to the defaults.
+where `key` represents what you want to style, `fg` specifies the foreground color, `bg` the background color, `underline` the underline `style`/`color`, and `modifiers` is a list of style modifiers. `bg`, `underline` and `modifiers` can be omitted to defer to the defaults.
 
 To specify only the foreground color:
 
@@ -89,12 +89,12 @@ Less common modifiers might not be supported by your terminal emulator.
 | `hidden`             |
 | `crossed_out`        |
 
-> Note: The `underlined` modifier is deprecated and only available for backwards compatability.
-> Its behaviour is equivalent to `underline-style="line"`.
+> Note: The `underlined` modifier is deprecated and only available for backwards compatibility.
+> Its behavior is equivalent to setting `underline.style="line"`.
 
 ### Underline Style
 
-One of the following values may be used as an `underline-style`. 
+One of the following values may be used as a value for `underline.style`. 
 
 Some styles might not be supported by your terminal emulator.
 
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index c32b3edf..aaef28b2 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -268,18 +268,29 @@ impl ThemePalette {
         value
             .as_str()
             .and_then(|s| s.parse().ok())
-            .ok_or(format!("Theme: invalid underline-style: {}", value))
+            .ok_or(format!("Theme: invalid underline style: {}", value))
     }
 
     pub fn parse_style(&self, style: &mut Style, value: Value) -> Result<(), String> {
         if let Value::Table(entries) = value {
-            for (name, value) in entries {
+            for (name, mut value) in entries {
                 match name.as_str() {
                     "fg" => *style = style.fg(self.parse_color(value)?),
                     "bg" => *style = style.bg(self.parse_color(value)?),
-                    "underline-color" => *style = style.underline_color(self.parse_color(value)?),
-                    "underline-style" => {
-                        *style = style.underline_style(Self::parse_underline_style(&value)?)
+                    "underline" => {
+                        let table = value
+                            .as_table_mut()
+                            .ok_or("Theme: underline must be table")?;
+                        if let Some(value) = table.remove("color") {
+                            *style = style.underline_color(self.parse_color(value)?);
+                        }
+                        if let Some(value) = table.remove("style") {
+                            *style = style.underline_style(Self::parse_underline_style(&value)?);
+                        }
+
+                        if let Some(attr) = table.keys().next() {
+                            return Err(format!("Theme: invalid underline attribute: {attr}"));
+                        }
                     }
                     "modifiers" => {
                         let modifiers = value
diff --git a/runtime/themes/dark_plus.toml b/runtime/themes/dark_plus.toml
index afbd1b71..fbb58e64 100644
--- a/runtime/themes/dark_plus.toml
+++ b/runtime/themes/dark_plus.toml
@@ -92,8 +92,8 @@
 "info" = { fg = "light_blue" }
 "hint" = { fg = "light_gray3" }
 
-"diagnostic.error" = {underline-color = "red", underline-style = "curl"}
-"diagnostic" = {underline-color = "gold", underline-style = "curl" }
+"diagnostic.error".underline = { color = "red", style = "curl" }
+"diagnostic".underline = { color = "gold", style = "curl" }
 
 [palette]
 white = "#ffffff"
diff --git a/runtime/themes/onedark.toml b/runtime/themes/onedark.toml
index cce0474f..c4a56b90 100644
--- a/runtime/themes/onedark.toml
+++ b/runtime/themes/onedark.toml
@@ -39,10 +39,10 @@
 "diff.delta" = "gold"
 "diff.minus" = "red"
 
-"diagnostic.info" = { underline-color = "blue", underline-style = "curl" }
-"diagnostic.hint" = { underline-color = "green", underline-style = "curl" }
-"diagnostic.warning" = { underline-color = "yellow", underline-style = "curl" }
-"diagnostic.error" = { underline-color = "red", underline-style = "curl" }
+"diagnostic.info".underline = { color = "blue", style = "curl" } 
+"diagnostic.hint".underline = { color = "green", style = "curl" } 
+"diagnostic.warning".underline = { color = "yellow", style = "curl" } 
+"diagnostic.error".underline = { color = "red", style = "curl" } 
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "green", modifiers = ["bold"] }
 "warning" = { fg = "yellow", modifiers = ["bold"] }

From cf4a5cca96aa6a35182ce336e066e9aec34b38d2 Mon Sep 17 00:00:00 2001
From: Ben Lee-Cohen <ben@bencohen.net>
Date: Thu, 13 Oct 2022 21:26:03 -0400
Subject: [PATCH 274/884] Monokai Pro Octagon statusline modes (#4247)

---
 runtime/themes/monokai_pro_octagon.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtime/themes/monokai_pro_octagon.toml b/runtime/themes/monokai_pro_octagon.toml
index c6feae8c..8bcaeebc 100644
--- a/runtime/themes/monokai_pro_octagon.toml
+++ b/runtime/themes/monokai_pro_octagon.toml
@@ -18,6 +18,9 @@
 
 # status bars, panels, modals, autocompletion
 "ui.statusline" = { fg = "base8", bg = "base4" }
+"ui.statusline.normal" = { fg = "base4", bg = "blue" }
+"ui.statusline.insert" = { fg = "base4", bg = "green" }
+"ui.statusline.select" = { fg = "base4", bg = "purple" }
 "ui.popup" = { bg = "base3" }
 "ui.window" = { bg = "base3" }
 "ui.help" = { fg = "base8", bg = "base3" }

From b4e795d70430d28ecd37f8e1564cbd568d17e0b9 Mon Sep 17 00:00:00 2001
From: Chickenkeeper <chrism.chickenkeeper24@gmail.com>
Date: Fri, 14 Oct 2022 02:31:32 +0100
Subject: [PATCH 275/884] Fix C++ syntax highlighting, and improve C & WGSL
 highlighting (#4079)

---
 languages.toml                      |   4 +-
 runtime/queries/c/highlights.scm    | 162 ++++++++++++++++---------
 runtime/queries/cpp/highlights.scm  | 108 ++++++++++++-----
 runtime/queries/wgsl/highlights.scm | 175 ++++++++++++++--------------
 4 files changed, 274 insertions(+), 175 deletions(-)

diff --git a/languages.toml b/languages.toml
index 892f3117..24110865 100644
--- a/languages.toml
+++ b/languages.toml
@@ -184,7 +184,7 @@ args = { console = "internalConsole", attachCommands = [ "platform select remote
 
 [[grammar]]
 name = "c"
-source = { git = "https://github.com/tree-sitter/tree-sitter-c", rev = "f05e279aedde06a25801c3f2b2cc8ac17fac52ae" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-c", rev = "7175a6dd5fc1cee660dce6fe23f6043d75af424a" }
 
 [[language]]
 name = "cpp"
@@ -221,7 +221,7 @@ args = { console = "internalConsole", attachCommands = [ "platform select remote
 
 [[grammar]]
 name = "cpp"
-source = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "e8dcc9d2b404c542fd236ea5f7208f90be8a6e89" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "d5e90fba898f320db48d81ddedd78d52c67c1fed" }
 
 [[language]]
 name = "c-sharp"
diff --git a/runtime/queries/c/highlights.scm b/runtime/queries/c/highlights.scm
index 647df05d..c0f5763a 100644
--- a/runtime/queries/c/highlights.scm
+++ b/runtime/queries/c/highlights.scm
@@ -1,65 +1,104 @@
-(storage_class_specifier) @keyword.storage
-
-"goto" @keyword
-"register" @keyword
-"break" @keyword
-"case" @keyword
-"continue" @keyword
-"default" @keyword
-"do" @keyword
-"else" @keyword
-"enum" @keyword
-"extern" @keyword
-"for" @keyword
-"if" @keyword
-"inline" @keyword
-"return" @keyword
 "sizeof" @keyword
-"struct" @keyword
-"switch" @keyword
-"typedef" @keyword
-"union" @keyword
-"volatile" @keyword
-"while" @keyword
-"const" @keyword
 
 [
- "#define"
- "#elif"
- "#else"
- "#endif"
- "#if"
- "#ifdef"
- "#ifndef"
- "#include"
- (preproc_directive)
+  "enum"
+  "struct"
+  "typedef"
+  "union"
+] @keyword.storage.type
+
+[
+  "const"
+  "extern"
+  "inline"
+  "register"
+  "volatile"
+  (storage_class_specifier)
+] @keyword.storage.modifier
+
+[
+  "goto"
+  "break"
+  "continue"
+] @keyword.control
+
+[
+  "do"
+  "for"
+  "while"
+] @keyword.control.repeat
+
+[
+  "if"
+  "else"
+  "switch"
+  "case"
+  "default"
+] @keyword.control.conditional
+
+"return" @keyword.control.return
+
+[
+  "defined"
+  "#define"
+  "#elif"
+  "#else"
+  "#endif"
+  "#if"
+  "#ifdef"
+  "#ifndef"
+  "#include"
+  (preproc_directive)
 ] @keyword.directive
 
-"--" @operator
-"-" @operator
-"-=" @operator
-"->" @operator
-"=" @operator
-"!=" @operator
-"*" @operator
-"&" @operator
-"&&" @operator
-"+" @operator
-"++" @operator
-"+=" @operator
-"<" @operator
-"==" @operator
-">" @operator
-"||" @operator
-">=" @operator
-"<=" @operator
-
-"." @punctuation.delimiter
-";" @punctuation.delimiter
+[
+  "+"
+  "-"
+  "*"
+  "/"
+  "++"
+  "--"
+  "%"
+  "=="
+  "!="
+  ">"
+  "<"
+  ">="
+  "<="
+  "&&"
+  "||"
+  "!"
+  "&"
+  "|"
+  "^"
+  "~"
+  "<<"
+  ">>"
+  "="
+  "+="
+  "-="
+  "*="
+  "/="
+  "%="
+  "<<="
+  ">>="
+  "&="
+  "^="
+  "|="
+  "?"
+] @operator
+
+(conditional_expression ":" @operator)
+
+"..." @punctuation
+
+["," "." ":" ";" "->" "::"] @punctuation.delimiter
+
+["(" ")" "[" "]" "{" "}"] @punctuation.bracket
 
 [(true) (false)] @constant.builtin.boolean
 
-(enumerator) @type.enum.variant
+(enumerator name: (identifier) @type.enum.variant)
 
 (string_literal) @string
 (system_lib_string) @string
@@ -73,19 +112,28 @@
 (call_expression
   function: (field_expression
     field: (field_identifier) @function))
+(call_expression (argument_list (identifier) @variable))
 (function_declarator
-  declarator: (identifier) @function)
+  declarator: [(identifier) (field_identifier)] @function)
+(parameter_declaration
+  declarator: (identifier) @variable.parameter)
+(parameter_declaration
+  (pointer_declarator
+    declarator: (identifier) @variable.parameter))
 (preproc_function_def
   name: (identifier) @function.special)
 
+(attribute
+  name: (identifier) @attribute)
+
 (field_identifier) @variable.other.member
 (statement_identifier) @label
 (type_identifier) @type
-(primitive_type) @type
+(primitive_type) @type.builtin
 (sized_type_specifier) @type
 
 ((identifier) @constant
- (#match? @constant "^[A-Z][A-Z\\d_]*$"))
+  (#match? @constant "^[A-Z][A-Z\\d_]*$"))
 
 (identifier) @variable
 
diff --git a/runtime/queries/cpp/highlights.scm b/runtime/queries/cpp/highlights.scm
index 3348ef3c..11877a76 100644
--- a/runtime/queries/cpp/highlights.scm
+++ b/runtime/queries/cpp/highlights.scm
@@ -1,5 +1,3 @@
-; inherits: c
-
 ; Functions
 
 (call_expression
@@ -12,56 +10,106 @@
 (template_method
   name: (field_identifier) @function)
 
-(template_function
-  name: (identifier) @function)
-
 (function_declarator
   declarator: (qualified_identifier
     name: (identifier) @function))
 
 (function_declarator
   declarator: (qualified_identifier
-    name: (identifier) @function))
+    name: (qualified_identifier
+      name: (identifier) @function)))
 
 (function_declarator
   declarator: (field_identifier) @function)
 
 ; Types
 
-((namespace_identifier) @type
- (#match? @type "^[A-Z]"))
+(using_declaration ("using" "namespace" (identifier) @namespace))
+(using_declaration ("using" "namespace" (qualified_identifier name: (identifier) @namespace)))
+(namespace_definition name: (identifier) @namespace)
+(namespace_identifier) @namespace
+
+(qualified_identifier name: (identifier) @type.enum.variant)
 
 (auto) @type
+"decltype" @type
 
 ; Constants
 
 (this) @variable.builtin
-(nullptr) @constant
+(nullptr) @constant.builtin
 
 ; Keywords
 
-"catch" @keyword
-"class" @keyword
-"constexpr" @keyword
-"delete" @keyword
-"explicit" @keyword
-"final" @keyword
-"friend" @keyword
-"mutable" @keyword
-"namespace" @keyword
-"noexcept" @keyword
-"new" @keyword
-"override" @keyword
-"private" @keyword
-"protected" @keyword
-"public" @keyword
-"template" @keyword
-"throw" @keyword
-"try" @keyword
-"typename" @keyword
-"using" @keyword
-"virtual" @keyword
+(template_argument_list (["<" ">"] @punctuation.bracket))
+(template_parameter_list (["<" ">"] @punctuation.bracket))
+(default_method_clause "default" @keyword)
+
+"static_assert" @function.special
+
+[
+  "<=>"
+  "[]"
+  "()"
+] @operator
+
+[
+  "co_await"
+  "co_return"
+  "co_yield"
+  "concept"
+  "delete"
+  "final"
+  "new"
+  "operator"
+  "requires"
+  "using"
+] @keyword
+
+[
+  "catch"
+  "noexcept"
+  "throw"
+  "try"
+] @keyword.control.exception
+
+
+[
+  "and"
+  "and_eq"
+  "bitor"
+  "bitand"
+  "not"
+  "not_eq"
+  "or"
+  "or_eq"
+  "xor"
+  "xor_eq"
+] @keyword.operator
+
+[
+  "class"  
+  "namespace"
+  "typename"
+] @keyword.storage.type
+
+[
+  "constexpr"
+  "constinit"
+  "consteval"
+  "explicit"
+  "friend"
+  "mutable"
+  "private"
+  "protected"
+  "public"
+  "override"
+  "template"
+  "virtual"
+] @keyword.storage.modifier
 
 ; Strings
 
 (raw_string_literal) @string
+
+; inherits: c
diff --git a/runtime/queries/wgsl/highlights.scm b/runtime/queries/wgsl/highlights.scm
index baf9dd8f..2817ea3a 100644
--- a/runtime/queries/wgsl/highlights.scm
+++ b/runtime/queries/wgsl/highlights.scm
@@ -2,57 +2,26 @@
 (float_literal) @constant.numeric.float
 (bool_literal) @constant.builtin.boolean
 
-(global_constant_declaration) @variable
-(global_variable_declaration) @variable
-(compound_statement) @variable
-(const_expression) @function
-
-(variable_identifier_declaration
-    (identifier) @variable
-    (type_declaration) @type)
-
-(function_declaration
-    (identifier) @function
-    (function_return_type_declaration
-        (type_declaration) @type))
-
-(parameter
-    (variable_identifier_declaration
-        (identifier) @variable.parameter
-        (type_declaration) @type))
-
-(struct_declaration
-    (identifier) @type)
-        
-(struct_declaration
-    (struct_member
-        (variable_identifier_declaration
-            (identifier) @variable.other.member
-            (type_declaration) @type)))
+[
+  "bitcast"
+  "discard"
+  "enable"
+  "fallthrough"
+] @keyword
 
-(type_constructor_or_function_call_expression
-    (type_declaration) @function)
+[
+  "let"
+  "override"
+  "struct"
+  "type"
+  "var"
+  (texel_format)
+] @keyword.storage.type
 
 [
-    "struct"
-    "bitcast"
-    "discard"
-    "enable"
-    "fallthrough"
-    "fn"
-    "let"
-    "private"
-    "read"
-    "read_write"
-    "storage"
-    "type"
-    "uniform"
-    "var"
-    "workgroup"
-    "write"
-    "override"
-    (texel_format)
-] @keyword
+  (access_mode)
+  (address_space)
+] @keyword.storage.modifier
 
 "fn" @keyword.function
 
@@ -62,53 +31,87 @@
 
 ["(" ")" "[" "]" "{" "}"] @punctuation.bracket
 
+(type_declaration ["<" ">"] @punctuation.bracket)
+
 [
-    "loop"
-    "for"
-    "while"
-    "break"
-    "continue"
-    "continuing"
+  "break"
+  "continue"
+  "continuing"
+] @keyword.control
+
+[
+  "loop"
+  "for"
+  "while"
 ] @keyword.control.repeat
 
 [
-    "if"
-    "else"
-    "switch"
-    "case"
-    "default"
+  "if"
+  "else"
+  "switch"
+  "case"
+  "default"
 ] @keyword.control.conditional
 
 [
-    "&"
-    "&&"
-    "/"
-    "!"
-    "="
-    "=="
-    "!="
-    ">"
-    ">="
-    ">>"
-    "<"
-    "<="
-    "<<"
-    "%"
-    "-"
-    "+"
-    "|"
-    "||"
-    "*"
-    "~"
-    "^"
-    "@"
-    "++"
-    "--"
+  "!"
+  "!="
+  "%"
+  "%="
+  "&"
+  "&&"
+  "&="
+  "*"
+  "*="
+  "+"
+  "++"
+  "+="
+  "-"
+  "--"
+  "-="
+  "->"
+  "/"
+  "/="
+  "<"
+  "<<"
+  "<="
+  "="
+  "=="
+  ">"
+  ">="
+  ">>"
+  "@"
+  "^"
+  "^="
+  "|"
+  "|="
+  "||"
+  "~"
 ] @operator
 
+(function_declaration
+  (identifier) @function)
+
+(parameter
+  (variable_identifier_declaration
+    (identifier) @variable.parameter))
+
+(struct_declaration
+  (identifier) @type)
+
+(struct_declaration
+  (struct_member
+    (variable_identifier_declaration
+      (identifier) @variable.other.member)))
+
+(type_constructor_or_function_call_expression
+  (type_declaration (identifier) @function))
+
+(type_declaration _ @type)
+
 (attribute
-    (identifier) @attribute)
+  (identifier) @attribute)
 
-(comment) @comment
+(identifier) @variable
 
-(ERROR) @error
+(comment) @comment

From 13d81b74787b58c01b56fdac8e3515470b2ed127 Mon Sep 17 00:00:00 2001
From: IrishMaestro <70972101+IrishMaestro@users.noreply.github.com>
Date: Thu, 13 Oct 2022 20:35:02 -0500
Subject: [PATCH 276/884] Created heisenberg theme for helix editor (#4209)

---
 runtime/themes/heisenberg.toml | 86 ++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 runtime/themes/heisenberg.toml

diff --git a/runtime/themes/heisenberg.toml b/runtime/themes/heisenberg.toml
new file mode 100644
index 00000000..b20d3e9c
--- /dev/null
+++ b/runtime/themes/heisenberg.toml
@@ -0,0 +1,86 @@
+# Author: IrishMaestro <github.com/irishmaestro>
+
+# Syntax highlighting
+"type" = { fg = "crystal_blue" }
+"type.builtin" = { fg = "crystal_blue" }
+"constructor" = { fg = "barium_green" }
+"constant" = { fg = "hazmat_yellow" }
+"string" = { fg = "crystal_blue" }
+"string.regexp" = { fg = "orange" }
+"string.special" = { fg = "vapor_yellow" }
+"comment" = { fg = "teddy_bear_pink", modifiers = ["slow_blink", "italic"] }
+"variable" = { fg = "element_green" }
+"variable.parameter" = { fg = "hazmat_yellow" }
+"label" = { fg = "vapor_yellow" }
+"punctuation" = { fg = "barium_green" }
+"keyword" = { fg = "barium_green" }
+"keyword.control" = { fg = "barium_green" }
+"keyword.directive" = { fg = "teddy_bear_pink" }
+"operator" = { fg = "hazmat_yellow" }
+"function" = { fg = "cash_green", modifiers = ["bold"] }
+"tag" = { fg = "crystal_blue" }
+"namespace" = { fg = "hazmat_yellow" }
+"markup.heading" = { fg = "hazmat_yellow" }
+"markup.list" = { fg = "vapor_yellow" }
+"markup.raw.block" = { bg = "background", fg = "orange" }
+"markup.link.url" = { fg = "crystal_blue" }
+"markup.link.text" = { fg = "vapor_yellow" }
+"markup.link.label" = { fg = "barium_green" }
+"markup.quote" = { fg = "vapor_yellow" }
+"diff.plus" = { fg = "cash_green" }
+"diff.minus" = { fg = "chili_powder_red" }
+"diff.delta" = { fg = "orange" }
+
+# Interface
+"ui.background" = { bg = "background" }
+"ui.cursor" = { bg = "crystal_blue", fg = "background" }
+"ui.cursor.match" = { fg = "hazmat_yellow" }
+"ui.linenr" = { fg = "crystal_blue" }
+"ui.linenr.selected" = { fg = "barium_green" }
+"ui.statusline" = { fg = "crystal_blue", bg = "black" }
+"ui.statusline.normal" = { fg = "crystal_blue", bg = "black" }
+"ui.statusline.insert" = { fg = "barium_green", bg = "black"} 
+"ui.statusline.select" = { fg = "hazmat_yellow", bg = "black" }
+"ui.cursorline.primary" = { bg = "#041B0E" }
+"ui.popup" = { fg = "crystal_blue", bg = "background" }
+"ui.window" = { fg = "barium_green" }
+"ui.help" = { fg = "crystal_blue", bg = "background"}
+"ui.text" = { fg = "crystal_blue" }
+"ui.text.focus" = { bg = "background", fg = "barium_green" }
+"ui.text.info" = { fg = "crystal_blue" }
+"ui.virtual.whitespace" = { fg = "#08341B" }
+"ui.virtual.ruler" = { bg = "#041B0E" }
+"ui.virtual.indent-guide" = { fg = "#08341B" }
+"ui.menu" = { fg = "crystal_blue", bg = "background" }
+"ui.menu.selected" = { bg = "hazmat_yellow", fg = "background" }
+"ui.selection" = { bg = "#1B0334" }
+"ui.selection.primary" = { bg = "desert_maroon" }
+"warning" = { fg = "vapor_yellow" }
+"error" = { fg = "chili_powder_red", modifiers = ["bold"] }
+"info" = { fg = "crystal_blue", modifiers = ["bold"] }
+"hint" = { fg = "crystal_blue", modifiers = ["bold"] }
+"diagnostic"= { fg = "chili_powder_red", modifiers = ["underlined"] }
+"diagnostic.info"= { fg = "crystal_blue", modifiers = ["underlined"] }
+"diagnostic.warning"= { fg = "vapor_yellow", modifiers = ["underlined"] }
+"diagnostic.error"= { fg = "chili_powder_red", modifiers = ["underlined"] }
+"ui.bufferline" = { fg = "gray", bg = "background" }
+"ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
+
+"special" = { fg = "cash_green" }
+
+[palette]
+background = "#000000"   
+foreground = "#cccccc"
+black = "#121212"
+dark_gray = "#2d3640"
+gray = "#5c6773"
+orange = "#ff8f40"
+barium_green = "#009669"
+hazmat_yellow = "#f7b90c"
+vapor_yellow = "#cecd19"
+teddy_bear_pink = "#bd5173"
+crystal_blue = "#32c9fa"
+cash_green = "#00ff80"
+element_green = "#186800"
+desert_maroon = "#2B0C02"
+chili_powder_red = "#c32101"

From 2d958d6c50b10318e29f6dacc291d8fcafd66de9 Mon Sep 17 00:00:00 2001
From: Dario Oddenino <branch13@gmail.com>
Date: Fri, 14 Oct 2022 18:57:52 +0200
Subject: [PATCH 277/884] Add support for Purescript language (#4242)

---
 book/src/generated/lang-support.md        |  1 +
 languages.toml                            | 13 +++++++++++++
 runtime/queries/purescript/highlights.scm |  1 +
 runtime/queries/purescript/injections.scm |  1 +
 runtime/queries/purescript/locals.scm     |  1 +
 5 files changed, 17 insertions(+)
 create mode 100644 runtime/queries/purescript/highlights.scm
 create mode 100644 runtime/queries/purescript/injections.scm
 create mode 100644 runtime/queries/purescript/locals.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 74e63796..3fe9ef70 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -86,6 +86,7 @@
 | prisma | ✓ |  |  | `prisma-language-server` |
 | prolog |  |  |  | `swipl` |
 | protobuf | ✓ |  | ✓ |  |
+| purescript | ✓ |  |  | `purescript-language-server` |
 | python | ✓ | ✓ | ✓ | `pylsp` |
 | r | ✓ |  |  | `R` |
 | racket |  |  |  | `racket` |
diff --git a/languages.toml b/languages.toml
index 24110865..7eb45d8b 100644
--- a/languages.toml
+++ b/languages.toml
@@ -723,6 +723,19 @@ indent = { tab-width = 2, unit = "  " }
 name = "haskell"
 source = { git = "https://github.com/tree-sitter/tree-sitter-haskell", rev = "b6ec26f181dd059eedd506fa5fbeae1b8e5556c8" }
 
+[[language]]
+name = "purescript"
+scope = "source.purescript"
+injection-regex = "purescript"
+file-types = ["purs"]
+roots = ["spago.dhall", "bower.json"]
+comment-token = "--"
+language-server = { command = "purescript-language-server", args = ["--stdio"] }
+indent = { tab-width = 2, unit = "  " }
+auto-format = true
+formatter = { command = "purs-tidy", args = ["format"] }
+grammar = "haskell"
+
 [[language]]
 name = "zig"
 scope = "source.zig"
diff --git a/runtime/queries/purescript/highlights.scm b/runtime/queries/purescript/highlights.scm
new file mode 100644
index 00000000..ef073eb2
--- /dev/null
+++ b/runtime/queries/purescript/highlights.scm
@@ -0,0 +1 @@
+; inherits: haskell
diff --git a/runtime/queries/purescript/injections.scm b/runtime/queries/purescript/injections.scm
new file mode 100644
index 00000000..ef073eb2
--- /dev/null
+++ b/runtime/queries/purescript/injections.scm
@@ -0,0 +1 @@
+; inherits: haskell
diff --git a/runtime/queries/purescript/locals.scm b/runtime/queries/purescript/locals.scm
new file mode 100644
index 00000000..ef073eb2
--- /dev/null
+++ b/runtime/queries/purescript/locals.scm
@@ -0,0 +1 @@
+; inherits: haskell

From e80beaa7b09a9852c17563b31fc8b10df2a7742f Mon Sep 17 00:00:00 2001
From: Nathaniel Graham <nathaniel.graham@protonmail.com>
Date: Fri, 14 Oct 2022 11:51:15 -0600
Subject: [PATCH 278/884] Changed Selection Yank Message (#4275)

Co-authored-by: Nathaniel Graham <ngraham@protonmail.com>
---
 helix-term/src/commands.rs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 93e82b84..d5fc1ad9 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3345,9 +3345,15 @@ fn yank_joined_to_clipboard_impl(
         .map(Cow::into_owned)
         .collect();
 
+    let clipboard_text = match clipboard_type {
+        ClipboardType::Clipboard => "system clipboard",
+        ClipboardType::Selection => "primary clipboard",
+    };
+
     let msg = format!(
-        "joined and yanked {} selection(s) to system clipboard",
+        "joined and yanked {} selection(s) to {}",
         values.len(),
+        clipboard_text,
     );
 
     let joined = values.join(separator);
@@ -3376,6 +3382,11 @@ fn yank_main_selection_to_clipboard_impl(
     let (view, doc) = current!(editor);
     let text = doc.text().slice(..);
 
+    let message_text = match clipboard_type {
+        ClipboardType::Clipboard => "yanked main selection to system clipboard",
+        ClipboardType::Selection => "yanked main selection to primary clipboard",
+    };
+
     let value = doc.selection(view.id).primary().fragment(text);
 
     if let Err(e) = editor
@@ -3385,7 +3396,7 @@ fn yank_main_selection_to_clipboard_impl(
         bail!("Couldn't set system clipboard content: {}", e);
     }
 
-    editor.set_status("yanked main selection to system clipboard");
+    editor.set_status(message_text);
     Ok(())
 }
 

From 45e038f4d5be367388b451a5d182b5643c04621d Mon Sep 17 00:00:00 2001
From: Poliorcetics <poliorcetics@users.noreply.github.com>
Date: Sat, 15 Oct 2022 00:35:00 +0200
Subject: [PATCH 279/884] nit: remove a String allocation that is immediately
 used as an &str (#4277)

---
 helix-term/src/ui/menu.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index 1d247b1a..f77f5e80 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -105,7 +105,7 @@ impl<T: Item> Menu<T> {
                 .iter()
                 .enumerate()
                 .filter_map(|(index, option)| {
-                    let text: String = option.filter_text(&self.editor_data).into();
+                    let text = option.filter_text(&self.editor_data);
                     // TODO: using fuzzy_indices could give us the char idx for match highlighting
                     self.matcher
                         .fuzzy_match(&text, pattern)

From a3ed9169df8d0a56ab4f698d2c90e7e6b4404633 Mon Sep 17 00:00:00 2001
From: Sam McCall <sam.mccall@gmail.com>
Date: Sat, 15 Oct 2022 03:05:39 +0200
Subject: [PATCH 280/884] c/c++ highlights: *& are @type or @operator based on
 context (#4278)

---
 runtime/queries/c/highlights.scm   | 3 +++
 runtime/queries/cpp/highlights.scm | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/runtime/queries/c/highlights.scm b/runtime/queries/c/highlights.scm
index c0f5763a..fe5dacaf 100644
--- a/runtime/queries/c/highlights.scm
+++ b/runtime/queries/c/highlights.scm
@@ -51,6 +51,9 @@
   (preproc_directive)
 ] @keyword.directive
 
+(pointer_declarator "*" @type.builtin)
+(abstract_pointer_declarator "*" @type.builtin)
+
 [
   "+"
   "-"
diff --git a/runtime/queries/cpp/highlights.scm b/runtime/queries/cpp/highlights.scm
index 11877a76..7bfccf72 100644
--- a/runtime/queries/cpp/highlights.scm
+++ b/runtime/queries/cpp/highlights.scm
@@ -34,6 +34,10 @@
 (auto) @type
 "decltype" @type
 
+(ref_qualifier ["&" "&&"] @type.builtin)
+(reference_declarator ["&" "&&"] @type.builtin)
+(abstract_reference_declarator ["&" "&&"] @type.builtin)
+
 ; Constants
 
 (this) @variable.builtin

From aef37d43d7a943fdf58ade7df4d8defbef9a7ce0 Mon Sep 17 00:00:00 2001
From: Sam McCall <sam.mccall@gmail.com>
Date: Sat, 15 Oct 2022 01:01:11 +0200
Subject: [PATCH 281/884] c/c++ highlighting: various tweaks

- treat `restrict`/`_Atomic` like `const`/`volatile` => @keyword.storage.modifier
- highlight `unsigned int` as builtin => @type.builtin
- recognize `static_cast` and friends => @keyword
- `template` is a kind of entity like `typename` => @keyword.storage.type
- many declaration modifiers have nothing to do with storage/types
  (explicit, friend, access specifiers, inline in C++) => @keyword
- fix floats highlighted as integer => @constant.numeric
---
 runtime/queries/c/highlights.scm   |  8 +++-----
 runtime/queries/cpp/highlights.scm | 22 ++++++++++++++++------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/runtime/queries/c/highlights.scm b/runtime/queries/c/highlights.scm
index fe5dacaf..8122216d 100644
--- a/runtime/queries/c/highlights.scm
+++ b/runtime/queries/c/highlights.scm
@@ -8,11 +8,9 @@
 ] @keyword.storage.type
 
 [
-  "const"
   "extern"
-  "inline"
   "register"
-  "volatile"
+  (type_qualifier)
   (storage_class_specifier)
 ] @keyword.storage.modifier
 
@@ -107,7 +105,7 @@
 (system_lib_string) @string
 
 (null) @constant
-(number_literal) @constant.numeric.integer
+(number_literal) @constant.numeric
 (char_literal) @constant.character
 
 (call_expression
@@ -133,7 +131,7 @@
 (statement_identifier) @label
 (type_identifier) @type
 (primitive_type) @type.builtin
-(sized_type_specifier) @type
+(sized_type_specifier) @type.builtin
 
 ((identifier) @constant
   (#match? @constant "^[A-Z][A-Z\\d_]*$"))
diff --git a/runtime/queries/cpp/highlights.scm b/runtime/queries/cpp/highlights.scm
index 7bfccf72..8637489e 100644
--- a/runtime/queries/cpp/highlights.scm
+++ b/runtime/queries/cpp/highlights.scm
@@ -1,5 +1,11 @@
 ; Functions
 
+; These casts are parsed as function calls, but are not.
+((identifier) @keyword (#eq? @keyword "static_cast"))
+((identifier) @keyword (#eq? @keyword "dynamic_cast"))
+((identifier) @keyword (#eq? @keyword "reinterpret_cast"))
+((identifier) @keyword (#eq? @keyword "const_cast"))
+
 (call_expression
   function: (qualified_identifier
     name: (identifier) @function))
@@ -63,7 +69,6 @@
   "co_yield"
   "concept"
   "delete"
-  "final"
   "new"
   "operator"
   "requires"
@@ -95,22 +100,27 @@
   "class"  
   "namespace"
   "typename"
+  "template"
 ] @keyword.storage.type
 
 [
   "constexpr"
   "constinit"
   "consteval"
+  "mutable"
+] @keyword.storage.modifier
+
+; Modifiers that aren't plausibly type/storage related.
+[
   "explicit"
   "friend"
-  "mutable"
+  "virtual"
+  (virtual_specifier) ; override/final
   "private"
   "protected"
   "public"
-  "override"
-  "template"
-  "virtual"
-] @keyword.storage.modifier
+  "inline" ; C++ meaning differs from C!
+] @keyword
 
 ; Strings
 

From 0e8e7cae3b88be32098e533e78398314c1dc2012 Mon Sep 17 00:00:00 2001
From: ZJPzjp <jiping_zhou@foxmail.com>
Date: Sun, 16 Oct 2022 00:07:42 +0800
Subject: [PATCH 282/884] fix `:insert-output` doc: inserting output **before**
 each selection (#4286)

---
 book/src/generated/typable-cmd.md | 2 +-
 helix-term/src/commands/typed.rs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index 4cbff306..05a0985b 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -65,7 +65,7 @@
 | `:config-reload` | Refresh user config. |
 | `:config-open` | Open the user config.toml file. |
 | `:log-open` | Open the helix log file. |
-| `:insert-output` | Run shell command, inserting output after each selection. |
+| `:insert-output` | Run shell command, inserting output before each selection. |
 | `:append-output` | Run shell command, appending output after each selection. |
 | `:pipe` | Pipe each selection to the shell command. |
 | `:run-shell-command`, `:sh` | Run a shell command |
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 78d25c1a..8ab10da4 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -2071,7 +2071,7 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
         TypableCommand {
             name: "insert-output",
             aliases: &[],
-            doc: "Run shell command, inserting output after each selection.",
+            doc: "Run shell command, inserting output before each selection.",
             fun: insert_output,
             completer: None,
         },

From f444ba8bebb7f539ae54a4ef0661cb61f096066a Mon Sep 17 00:00:00 2001
From: Sora <dream@neoncity.dev>
Date: Sat, 15 Oct 2022 18:10:16 +0200
Subject: [PATCH 283/884] Fixup Zig Indent Queries (#4281)

---
 runtime/queries/zig/indents.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/runtime/queries/zig/indents.scm b/runtime/queries/zig/indents.scm
index af25a9c3..b177b165 100644
--- a/runtime/queries/zig/indents.scm
+++ b/runtime/queries/zig/indents.scm
@@ -1,12 +1,14 @@
 [
+  (AsmExpr)
+  (AssignExpr)
   (Block)
   (BlockExpr)
   (ContainerDecl)
-  (SwitchExpr)
-  (AssignExpr)
   (ErrorUnionExpr)
-  (Statement)
   (InitList)
+  (Statement)
+  (SwitchExpr)
+  (TestDecl)
 ] @indent
 
 [

From 1c08c80e4ff9af2c3dffc2f4d98d4b003cb5ed19 Mon Sep 17 00:00:00 2001
From: Chickenkeeper <chrism.chickenkeeper24@gmail.com>
Date: Sat, 15 Oct 2022 17:29:50 +0100
Subject: [PATCH 284/884] C# syntax highlight tweaks (#4285)

---
 runtime/queries/c-sharp/highlights.scm | 64 +++++++++++++-------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/runtime/queries/c-sharp/highlights.scm b/runtime/queries/c-sharp/highlights.scm
index e26a0877..38394862 100644
--- a/runtime/queries/c-sharp/highlights.scm
+++ b/runtime/queries/c-sharp/highlights.scm
@@ -109,6 +109,9 @@
 (comment) @comment
 
 ;; Tokens
+(type_argument_list ["<" ">"] @punctuation.bracket)
+(type_parameter_list ["<" ">"] @punctuation.bracket)
+
 [
   ";"
   "."
@@ -159,14 +162,7 @@
   "??="
 ] @operator
 
-[
-  "("
-  ")"
-  "["
-  "]"
-  "{"
-  "}"
-]  @punctuation.bracket
+["(" ")" "[" "]" "{" "}"] @punctuation.bracket
 
 ;; Keywords
 (modifier) @keyword.storage.modifier
@@ -175,36 +171,32 @@
 
 [
   "as"
+  "await"
   "base"
-  "catch"
   "checked"
-  "finally"
+  "from"
+  "get"
+  "in"
+  "init"
   "is"
+  "let"
   "lock"
+  "new"
   "operator"
+  "out"
   "params"
+  "ref"
+  "select"
+  "set"
   "sizeof"
   "stackalloc"
-  "throw"
-  "try"
   "typeof"
   "unchecked"
   "using"
-  "new"
-  "await"
-  "in"
-  "yield"
-  "get"
-  "set"
   "when"
-  "out"
-  "ref"
-  "from"
   "where"
-  "select"
-  "init"
   "with"
-  "let"
+  "yield"
 ] @keyword
 
 [
@@ -225,21 +217,31 @@
 ] @keyword.storage.modifier
 
 [
+  "break"
+  "continue"
+  "goto"
+] @keyword.control
+
+[
+  "catch"
+  "finally"
+  "throw"
+  "try"
+] @keyword.control.exception
+
+[
+  "do"
   "for"
   "foreach"
-  "do"
   "while"
-  "break"
-  "continue"
 ] @keyword.control.repeat
 
 [
-  "goto"
-  "if"
-  "else"
-  "switch"
   "case"
   "default"
+  "else"
+  "if"
+  "switch"
 ] @keyword.control.conditional
 
 "return" @keyword.control.return

From 05ca21cb1b7838528ce6b07cb003e15ccba2696d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20K=C4=99pka?= <wojciech@wkepka.dev>
Date: Sat, 15 Oct 2022 19:08:13 +0200
Subject: [PATCH 285/884] themes: Update bogster theme (#4264)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wojciech Kępka <wojciech.kepka@softax.pl>
---
 runtime/themes/bogster.toml | 163 ++++++++++++++++++------------------
 1 file changed, 81 insertions(+), 82 deletions(-)

diff --git a/runtime/themes/bogster.toml b/runtime/themes/bogster.toml
index d251edb2..eb6c4c50 100644
--- a/runtime/themes/bogster.toml
+++ b/runtime/themes/bogster.toml
@@ -1,97 +1,96 @@
 # Author : Wojciech Kępka <wojciech@wkepka.dev>
 
-"attribute" = "bogster0"
-"keyword" = { fg = "bogster1", modifiers = ["bold"] }
-"keyword.directive" = "bogster1"
-"namespace" = "bogster2"
-"punctuation" = "bogster0"
-"punctuation.delimiter" = "bogster0"
-"operator" = { fg = "bogster0", modifiers = ["bold"] }
-"special" = "bogster3"
-"variable.other.member" = "bogster4"
-"variable" = "bogster4"
-"variable.parameter" = "bogster4"
-"type" = "bogster5"
-"type.builtin" = { fg = "bogster2", modifiers = ["bold"] }
-"constructor" = "bogster5"
-"function" = "bogster6"
-"function.macro" = { fg = "bogster0", modifiers = ["bold"] }
-"function.builtin" = { fg = "bogster6", modifiers = ["bold"] }
-"comment" = "bogster7"
-"variable.builtin" = "bogster4"
-"constant" = "bogster8"
-"constant.builtin" = "bogster8"
-"string" = "bogster8"
-"constant.numeric" = "bogster9"
-"constant.character.escape" = { fg = "bogster3", modifiers = ["bold"] }
-"label" = "bogster9"
+"attribute" = "bogster-orange"
+"keyword" = { fg = "bogster-yellow", modifiers = ["bold"] }
+"keyword.directive" = "bogster-yellow"
+"namespace" = "bogster-red"
+"punctuation" = "bogster-orange"
+"punctuation.delimiter" = "bogster-orange"
+"operator" = { fg = "bogster-orange", modifiers = ["bold"] }
+"special" = "bogster-lgreen"
+"variable.other.member" = "bogster-fg0"
+"variable" = "bogster-fg0"
+"variable.parameter" = "bogster-fg0"
+"type" = "bogster-lred"
+"type.builtin" = { fg = "bogster-red", modifiers = ["bold"] }
+"constructor" = "bogster-lred"
+"function" = "bogster-lblue"
+"function.macro" = { fg = "bogster-orange", modifiers = ["bold"] }
+"function.builtin" = { fg = "bogster-lblue", modifiers = ["bold"] }
+"comment" = "bogster-base5"
+"variable.builtin" = "bogster-fg0"
+"constant" = "bogster-teal"
+"constant.builtin" = "bogster-teal"
+"string" = "bogster-teal"
+"constant.numeric" = "bogster-blue"
+"constant.character.escape" = { fg = "bogster-lgreen", modifiers = ["bold"] }
+"label" = "bogster-blue"
+"module" = "bogster-red"
 
-"module" = "bogster2"
+"markup.heading" = "bogster-blue"
+"markup.list" = "bogster-red"
+"markup.bold" = { fg = "bogster-yellow", modifiers = ["bold"] }
+"markup.italic" = { fg = "bogster-purp", modifiers = ["italic"] }
+"markup.link.url" = { fg = "bogster-yellow", modifiers = ["underlined"] }
+"markup.link.text" = "bogster-red"
+"markup.quote" = "bogster-teal"
+"markup.raw" = "bogster-lgreen"
 
-# TODO
-"markup.heading" = "blue"
-"markup.list" = "red"
-"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
-"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
-"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
-"markup.link.text" = "red"
-"markup.quote" = "cyan"
-"markup.raw" = "green"
+"diff.plus" = "bogster-teal"
+"diff.delta" = "bogster-orange"
+"diff.minus" = "bogster-lred"
 
-"diff.plus" = "bogster8"
-"diff.delta" = "bogster0"
-"diff.minus" = "bogster5"
+"ui.background" = { bg = "bogster-base1" }
+"ui.linenr" = { fg = "bogster-base4" }
+"ui.linenr.selected" = { fg = "bogster-fg1" }
+"ui.cursorline" = { bg = "bogster-base0" }
+"ui.statusline" = { fg = "bogster-fg1", bg = "bogster-base2" }
+"ui.statusline.inactive" = { fg = "bogster-fg0", bg = "bogster-base2" }
+"ui.popup" = { bg = "bogster-base2" }
+"ui.window" = { bg = "bogster-base2" }
+"ui.help" = { bg = "bogster-base2", fg = "bogster-fg1" }
 
-"ui.background" = { bg = "bogster10" }
-"ui.linenr" = { fg = "bogster11" }
-"ui.linenr.selected" = { fg = "bogster12" }  # TODO
-"ui.cursorline" = { bg = "bogster13" }
-"ui.statusline" = { fg = "bogster12", bg = "bogster14" }
-"ui.statusline.inactive" = { fg = "bogster4", bg = "bogster14" }
-"ui.popup" = { bg = "bogster14" }
-"ui.window" = { bg = "bogster14" }
-"ui.help" = { bg = "bogster14", fg = "bogster12" }
+"ui.statusline.normal" = { fg = "bogster-base1", bg = "bogster-blue", modifiers = [ "bold" ]}
+"ui.statusline.insert" = { fg = "bogster-base1", bg = "bogster-lgreen", modifiers = [ "bold" ]}
+"ui.statusline.select" = { fg = "bogster-base1", bg = "bogster-red", modifiers = [ "bold" ] }
 
-"ui.statusline.normal" = { fg = "bogster10", bg = "bogster9", modifiers = [ "bold" ]}
-"ui.statusline.insert" = { fg = "bogster10", bg = "bogster3", modifiers = [ "bold" ]}
-"ui.statusline.select" = { fg = "bogster10", bg = "bogster2", modifiers = [ "bold" ] }
+"ui.text" = { fg = "bogster-fg1" }
+"ui.text.focus" = { fg = "bogster-fg1", modifiers= ["bold"] }
+"ui.virtual.whitespace" = "bogster-base5"
+"ui.virtual.ruler" = { bg = "bogster-base0" }
 
-"ui.text" = { fg = "bogster12" }
-"ui.text.focus" = { fg = "bogster12", modifiers= ["bold"] }
-"ui.virtual.whitespace" = "bogster7"
-"ui.virtual.ruler" = { bg = "bogster13" }
+"ui.selection" = { bg = "bogster-base3" }
+"ui.cursor.match" = { fg = "bogster-base3", bg = "bogster-orange" }
+"ui.cursor" = { fg = "bogster-base5", modifiers = ["reversed"] }
 
-"ui.selection" = { bg = "bogster15" }
-# "ui.cursor.match"  # TODO might want to override this because dimmed is not widely supported
-"ui.cursor.match" = { fg = "bogster15", bg = "bogster0" }
-"ui.cursor" = { fg = "bogster16", modifiers = ["reversed"] }
+"ui.menu" = { fg = "bogster-fg1", bg = "bogster-base2" }
+"ui.menu.selected" = { bg = "bogster-base3" }
 
-"ui.menu" = { fg = "bogster12", bg = "bogster14" }
-"ui.menu.selected" = { bg = "bogster15" }
-
-"warning" = "bogster0"
-"error" = "bogster5"
-"info" = "bogster8"
-"hint" = "bogster9"
+"warning" = "bogster-orange"
+"error" = "bogster-lred"
+"info" = "bogster-teal"
+"hint" = "bogster-blue"
 
 # make diagnostic underlined, to distinguish with selection text.
 diagnostic = { modifiers = ["underlined"] }
 
 [palette]
-bogster0 = "#dc7759"
-bogster1 = "#dcb659"
-bogster2 = "#d32c5d"
-bogster3 = "#7fdc59"
-bogster4 = "#c6b8ad"
-bogster5 = "#dc597f"
-bogster6 = "#59dcd8"
-bogster7 = "#627d9d"
-bogster8 = "#59dcb7"
-bogster9 = "#59c0dc"
-bogster10 = "#161c23" 
-bogster11 = "#415367" 
-bogster12 = "#e5ded6"
-bogster13 = "#131920"
-bogster14 = "#232d38"
-bogster15 = "#313f4e" 
-bogster16 = "#ABB2BF"
+bogster-yellow = "#dcb659"
+bogster-lblue = "#59dcd8"
+bogster-teal = "#59dcb7"
+bogster-blue = "#36b2d4"
+bogster-orange = "#dc7759"
+bogster-red = "#d32c5d"
+bogster-lgreen = "#7fdc59"
+bogster-lred = "#dc597f"
+bogster-purp = "#b759dc"
+
+bogster-base0 = "#13181e"
+bogster-base1 = "#161c23" 
+bogster-base2 = "#232d38"
+bogster-base3 = "#313f4e" 
+bogster-base4 = "#415367" 
+bogster-base5 = "#abb2bf"
+
+bogster-fg0 = "#c6b8ad"
+bogster-fg1 = "#e5ded6"

From 661f48d62f9d6920f6929b5ae5a5365401459c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20K=C4=99pka?= <wojciech@wkepka.dev>
Date: Sat, 15 Oct 2022 19:12:14 +0200
Subject: [PATCH 286/884] themes: Add `bogster_light` theme (#4265)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wojciech Kępka <wojciech.kepka@softax.pl>
---
 runtime/themes/bogster_light.toml | 97 +++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 runtime/themes/bogster_light.toml

diff --git a/runtime/themes/bogster_light.toml b/runtime/themes/bogster_light.toml
new file mode 100644
index 00000000..25aa4c80
--- /dev/null
+++ b/runtime/themes/bogster_light.toml
@@ -0,0 +1,97 @@
+# Author : Wojciech Kępka <wojciech@wkepka.dev>
+
+"attribute" = "bogster-orange"
+"keyword" = { fg = "bogster-yellow", modifiers = ["bold"] }
+"keyword.directive" = "bogster-yellow"
+"namespace" = "bogster-red"
+"punctuation" = "bogster-orange"
+"punctuation.delimiter" = "bogster-orange"
+"operator" = { fg = "bogster-orange", modifiers = ["bold"] }
+"special" = "bogster-lgreen"
+"variable.other.member" = "bogster-fg0"
+"variable" = "bogster-fg0"
+"variable.parameter" = "bogster-fg0"
+"type" = "bogster-lred"
+"type.builtin" = { fg = "bogster-red", modifiers = ["bold"] }
+"constructor" = "bogster-lred"
+"function" = "bogster-lblue"
+"function.macro" = { fg = "bogster-orange", modifiers = ["bold"] }
+"function.builtin" = { fg = "bogster-lblue", modifiers = ["bold"] }
+"comment" = "bogster-base5"
+"variable.builtin" = "bogster-fg0"
+"constant" = "bogster-teal"
+"constant.builtin" = "bogster-teal"
+"string" = "bogster-teal"
+"constant.numeric" = "bogster-blue"
+"constant.character.escape" = { fg = "bogster-lgreen", modifiers = ["bold"] }
+"label" = "bogster-blue"
+"module" = "bogster-red"
+
+"markup.heading" = "bogster-blue"
+"markup.list" = "bogster-red"
+"markup.bold" = { fg = "bogster-yellow", modifiers = ["bold"] }
+"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
+"markup.link.url" = { fg = "bogster-yellow", modifiers = ["underlined"] }
+"markup.link.text" = "bogster-red"
+"markup.quote" = "bogster-lblue"
+"markup.raw" = "bogster-teal"
+
+"diff.plus" = "bogster-teal"
+"diff.delta" = "bogster-orange"
+"diff.minus" = "bogster-lred"
+
+"ui.background" = { bg = "bogster-base0" }
+"ui.linenr" = { fg = "bogster-base3" }
+"ui.linenr.selected" = { fg = "bogster-fg1" }
+"ui.cursorline" = { bg = "bogster-base00" }
+"ui.statusline" = { fg = "bogster-fg1", bg = "bogster-base1" }
+"ui.statusline.inactive" = { fg = "bogster-fg0", bg = "bogster-base1" }
+"ui.popup" = { bg = "bogster-base1" }
+"ui.window" = { bg = "bogster-base1" }
+"ui.help" = { bg = "bogster-base1", fg = "bogster-fg1" }
+
+"ui.statusline.normal" = { fg = "bogster-base0", bg = "bogster-blue", modifiers = [ "bold" ]}
+"ui.statusline.insert" = { fg = "bogster-base0", bg = "bogster-lgreen", modifiers = [ "bold" ]}
+"ui.statusline.select" = { fg = "bogster-base0", bg = "bogster-red", modifiers = [ "bold" ] }
+
+"ui.text" = { fg = "bogster-fg1" }
+"ui.text.focus" = { fg = "bogster-fg1", modifiers= ["bold"] }
+"ui.virtual.whitespace" = "bogster-base5"
+"ui.virtual.ruler" = { bg = "bogster-base00" }
+
+"ui.selection" = { bg = "bogster-base1" }
+"ui.cursor.match" = { fg = "bogster-base2", bg = "bogster-orange" }
+"ui.cursor" = { fg = "bogster-gray", modifiers = ["reversed"] }
+
+"ui.menu" = { fg = "bogster-fg1", bg = "bogster-base1" }
+"ui.menu.selected" = { bg = "bogster-base2" }
+
+"warning" = "bogster-orange"
+"error" = "bogster-lred"
+"info" = "bogster-teal"
+"hint" = "bogster-blue"
+
+# make diagnostic underlined, to distinguish with selection text.
+diagnostic = { modifiers = ["underlined"] }
+
+[palette]
+bogster-orange = "#dc7759"
+bogster-yellow = "#a58023"
+bogster-red = "#d32c5d"
+bogster-blue = "#59c0dc"
+bogster-gray = "#abb2bf"
+bogster-lgreen = "#7fdc59"
+bogster-lred = "#dc597f"
+bogster-lblue = "#289cbc"
+bogster-teal = "#23a580"
+
+bogster-fg1 = "#161c23" 
+bogster-fg0 = "#232d38"
+
+bogster-base00 = "#d7dbbb"
+bogster-base0 = "#f6fbd6"
+bogster-base1 = "#c7c7ba"
+bogster-base2 = "#aaaa97" 
+bogster-base3 = "#415367" 
+bogster-base5 = "#627d9d"
+

From 2457111bf074d4b5c1d45f76e2c7d593ceec5895 Mon Sep 17 00:00:00 2001
From: Filip Dutescu <filip.dutescu@gmail.com>
Date: Sat, 15 Oct 2022 23:33:57 +0300
Subject: [PATCH 287/884] feat(csharp,debug): add C# debugger support (#4213)

---
 helix-dap/src/types.rs         |  2 +-
 helix-view/src/handlers/dap.rs |  2 +-
 languages.toml                 | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/helix-dap/src/types.rs b/helix-dap/src/types.rs
index 45f45cca..51ecfe1b 100644
--- a/helix-dap/src/types.rs
+++ b/helix-dap/src/types.rs
@@ -726,7 +726,7 @@ pub mod events {
     #[serde(tag = "event", content = "body")]
     // seq is omitted as unused and is not sent by some implementations
     pub enum Event {
-        Initialized,
+        Initialized(Option<DebuggerCapabilities>),
         Stopped(Stopped),
         Continued(Continued),
         Exited(Exited),
diff --git a/helix-view/src/handlers/dap.rs b/helix-view/src/handlers/dap.rs
index e39584c3..2e86871b 100644
--- a/helix-view/src/handlers/dap.rs
+++ b/helix-view/src/handlers/dap.rs
@@ -262,7 +262,7 @@ impl Editor {
                     log::info!("{}", output);
                     self.set_status(format!("{} {}", prefix, output));
                 }
-                Event::Initialized => {
+                Event::Initialized(_) => {
                     // send existing breakpoints
                     for (path, breakpoints) in &mut self.breakpoints {
                         // TODO: call futures in parallel, await all
diff --git a/languages.toml b/languages.toml
index 7eb45d8b..08d02a49 100644
--- a/languages.toml
+++ b/languages.toml
@@ -233,6 +233,25 @@ comment-token = "//"
 indent = { tab-width = 4, unit = "\t" }
 language-server = { command = "OmniSharp", args = [ "--languageserver" ] }
 
+[language.debugger]
+name = "netcoredbg"
+transport = "tcp"
+command = "netcoredbg"
+args = [ "--interpreter=vscode" ]
+port-arg = "--server={}"
+
+[[language.debugger.templates]]
+name = "launch"
+request = "launch"
+completion = [ { name = "path to dll", completion = "filename" } ]
+args = { type = "coreclr", console = "internalConsole", internalConsoleOptions = "openOnSessionStart", program = "{0}" }
+
+[[language.debugger.templates]]
+name = "attach"
+request = "attach"
+completion = [ "pid" ]
+args = { processId = "{0}" }
+
 [[grammar]]
 name = "c-sharp"
 source = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "5b60f99545fea00a33bbfae5be956f684c4c69e2" }

From 63fe423710df3198293ea14a357b2884ae0445b3 Mon Sep 17 00:00:00 2001
From: Ben White-Horne <32932209+kneasle@users.noreply.github.com>
Date: Sun, 16 Oct 2022 17:58:18 +0100
Subject: [PATCH 288/884] Show keys required to enter each minor mode (#4302)

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/keymap.md | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 7fd146a6..0882381e 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -167,10 +167,13 @@ These sub-modes are accessible from normal mode and typically switch back to nor
 
 #### View mode
 
+Accessed by typing `z` in [normal mode](#normal-mode).
+
 View mode is intended for scrolling and manipulating the view without changing
-the selection. The "sticky" variant of this mode is persistent; use the Escape
-key to return to normal mode after usage (useful when you're simply looking
-over text and not actively editing it).
+the selection. The "sticky" variant of this mode (accessed by typing `Z` in
+normal mode) is persistent; use the Escape key to return to normal mode after
+usage (useful when you're simply looking over text and not actively editing
+it).
 
 
 | Key                  | Description                                               | Command             |
@@ -188,6 +191,8 @@ over text and not actively editing it).
 
 #### Goto mode
 
+Accessed by typing `g` in [normal mode](#normal-mode).
+
 Jumps to various locations.
 
 | Key   | Description                                      | Command                    |
@@ -213,9 +218,10 @@ Jumps to various locations.
 
 #### Match mode
 
-Enter this mode using `m` from normal mode. See the relevant section
-in [Usage](./usage.md) for an explanation about [surround](./usage.md#surround)
-and [textobject](./usage.md#textobject) usage.
+Accessed by typing `m` in [normal mode](#normal-mode).
+
+See the relevant section in [Usage](./usage.md) for an explanation about
+[surround](./usage.md#surround) and [textobject](./usage.md#textobject) usage.
 
 | Key              | Description                                     | Command                    |
 | -----            | -----------                                     | -------                    |
@@ -230,6 +236,8 @@ TODO: Mappings for selecting syntax nodes (a superset of `[`).
 
 #### Window mode
 
+Accessed by typing `Ctrl-w` in [normal mode](#normal-mode).
+
 This layer is similar to Vim keybindings as Kakoune does not support window.
 
 | Key                    | Description                                          | Command           |
@@ -252,8 +260,9 @@ This layer is similar to Vim keybindings as Kakoune does not support window.
 
 #### Space mode
 
-This layer is a kludge of mappings, mostly pickers.
+Accessed by typing `Space` in [normal mode](#normal-mode).
 
+This layer is a kludge of mappings, mostly pickers.
 
 | Key     | Description                                                             | Command                             |
 | -----   | -----------                                                             | -------                             |

From 5f4f171b73232e5ec5e4b7153084a93033ab5cf0 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 16 Oct 2022 14:52:04 -0500
Subject: [PATCH 289/884] Fix debug assertion for diagnostic sort order (#4319)

The debug assertion that document diagnostics are sorted incorrectly
panics for cases like `[161..164, 162..162]`. The merging behavior
in the following lines that relies on the assertion only needs the
input ranges to be sorted by `range.start`, so this change simplifies
the assertion to only catch violations of that assumption.
---
 helix-term/src/ui/editor.rs | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index fb70fa0f..8e9d8631 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -302,16 +302,7 @@ impl EditorView {
         let mut warning_vec = Vec::new();
         let mut error_vec = Vec::new();
 
-        let diagnostics = doc.diagnostics();
-
-        // Diagnostics must be sorted by range. Otherwise, the merge strategy
-        // below would not be accurate.
-        debug_assert!(diagnostics
-            .windows(2)
-            .all(|window| window[0].range.start <= window[1].range.start
-                && window[0].range.end <= window[1].range.end));
-
-        for diagnostic in diagnostics {
+        for diagnostic in doc.diagnostics() {
             // Separate diagnostics into different Vecs by severity.
             let (vec, scope) = match diagnostic.severity {
                 Some(Severity::Info) => (&mut info_vec, info),
@@ -325,6 +316,11 @@ impl EditorView {
             // merge the two together. Otherwise push a new span.
             match vec.last_mut() {
                 Some((_, range)) if diagnostic.range.start <= range.end => {
+                    // This branch merges overlapping diagnostics, assuming that the current
+                    // diagnostic starts on range.start or later. If this assertion fails,
+                    // we will discard some part of `diagnostic`. This implies that
+                    // `doc.diagnostics()` is not sorted by `diagnostic.range`.
+                    debug_assert!(range.start <= diagnostic.range.start);
                     range.end = diagnostic.range.end.max(range.end)
                 }
                 _ => vec.push((scope, diagnostic.range.start..diagnostic.range.end)),

From 50b191a7dff4a6c311437d3e5fcd1ce36b300643 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 16 Oct 2022 14:59:57 -0500
Subject: [PATCH 290/884] Log failures to load tree-sitter parsers as error
 (#4315)

Info logs don't show up in the log file by default, but this line
should: failures to load tree-sitter parser objects are useful errors.
A parser might fail to load it is misconfigured
(https://github.com/helix-editor/helix/pull/4303#discussion_r996448543)
or if the file does not exist.
---
 helix-core/src/syntax.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 8c51d5eb..61d382fd 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -368,7 +368,13 @@ impl LanguageConfiguration {
             None
         } else {
             let language = get_language(self.grammar.as_deref().unwrap_or(&self.language_id))
-                .map_err(|e| log::info!("{}", e))
+                .map_err(|err| {
+                    log::error!(
+                        "Failed to load tree-sitter parser for language {:?}: {}",
+                        self.language_id,
+                        err
+                    )
+                })
                 .ok()?;
             let config = HighlightConfiguration::new(
                 language,

From a330b5d224274d3ca01def99408ce9e614a97c94 Mon Sep 17 00:00:00 2001
From: Brandon Dong <brandondong604@hotmail.com>
Date: Sun, 16 Oct 2022 17:19:19 -0700
Subject: [PATCH 291/884] Fix selecting pop dark theme (#4323)

---
 runtime/themes/pop-dark.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/runtime/themes/pop-dark.toml b/runtime/themes/pop-dark.toml
index bac0d0f9..6ad0111b 100644
--- a/runtime/themes/pop-dark.toml
+++ b/runtime/themes/pop-dark.toml
@@ -43,7 +43,6 @@ module = { bg = 'orangeL' }
 special = { fg = 'orangeW' }
 operator = { fg = 'orangeY' }
 attribute = { fg = 'orangeL' }
-attribute = { fg = 'orangeL' }
 namespace = { fg = 'orangeL' }
 'type' = { fg = 'redH' }
 'type.builtin' = { fg = 'orangeL' }

From b29531ceab18625b3994f48937cf7bbef8f3ab89 Mon Sep 17 00:00:00 2001
From: echoriiku <42903366+echoriiku@users.noreply.github.com>
Date: Sun, 16 Oct 2022 22:34:38 -0300
Subject: [PATCH 292/884] Fix readability of highlighted text on the rose_pine
 themes using official palettes (#4221)

---
 runtime/themes/rose_pine.toml      | 6 +++---
 runtime/themes/rose_pine_dawn.toml | 6 +++---
 runtime/themes/rose_pine_moon.toml | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/runtime/themes/rose_pine.toml b/runtime/themes/rose_pine.toml
index 06be3083..14e240dd 100644
--- a/runtime/themes/rose_pine.toml
+++ b/runtime/themes/rose_pine.toml
@@ -79,6 +79,6 @@ rose     = "#ebbcba"
 pine     = "#31748f"
 foam     = "#9ccfd8"
 iris     = "#c4a7e7"
-highlight = "#2a2837"
-highlightInactive = "#211f2d"
-highlightOverlay = "#3a384a"
+highlight = "#403d52"
+highlightInactive = "#21202e"
+highlightOverlay = "#524f67"
diff --git a/runtime/themes/rose_pine_dawn.toml b/runtime/themes/rose_pine_dawn.toml
index 129ae9c7..c6609c21 100644
--- a/runtime/themes/rose_pine_dawn.toml
+++ b/runtime/themes/rose_pine_dawn.toml
@@ -76,6 +76,6 @@ rose     = "#d7827e"
 pine     = "#286983"
 foam     = "#56949f"
 iris     = "#907aa9"
-highlight = "#eee9e6"
-highlightInactive = "#f2ede9"
-highlightOverlay = "#e4dfde"
+highlight = "#dfdad9"
+highlightInactive = "#f4ede8"
+highlightOverlay = "#cecacd"
diff --git a/runtime/themes/rose_pine_moon.toml b/runtime/themes/rose_pine_moon.toml
index 4706bb17..fc27d2c0 100644
--- a/runtime/themes/rose_pine_moon.toml
+++ b/runtime/themes/rose_pine_moon.toml
@@ -83,6 +83,6 @@ rose     = "#ea9a97"
 pine     = "#3e8fb0"
 foam     = "#9ccfd8"
 iris     = "#c4a7e7"
-highlight = "#2a283e"
-highlightInactive = "#44415a"
+highlight = "#44415a"
+highlightInactive = "#2a283e"
 highlightOverlay = "#56526e"

From 17488f14d6d28361d3ae060492e2f31fde00f00c Mon Sep 17 00:00:00 2001
From: Jonathan LEI <me@xjonathan.dev>
Date: Fri, 14 Oct 2022 03:45:18 +0000
Subject: [PATCH 293/884] Fix Cairo comment token

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 08d02a49..da7b10bd 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1440,7 +1440,7 @@ scope = "source.cairo"
 injection-regex = "cairo"
 file-types = ["cairo"]
 roots = []
-comment-token = "#"
+comment-token = "//"
 indent = { tab-width = 4, unit = "    " }
 
 [[grammar]]

From 431f9c14f35868c6825a3e7e858148d1f2bcddbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Fri, 14 Oct 2022 16:25:33 +0900
Subject: [PATCH 294/884] Support Cairo 0.10 syntax

---
 languages.toml                       | 2 +-
 runtime/queries/cairo/highlights.scm | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/languages.toml b/languages.toml
index da7b10bd..d3528533 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1445,7 +1445,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[grammar]]
 name = "cairo"
-source = { git = "https://github.com/archseer/tree-sitter-cairo", rev = "5155c6eb40db6d437f4fa41b8bcd8890a1c91716" }
+source = { git = "https://github.com/archseer/tree-sitter-cairo", rev = "e2f9b3d75f483fcfda03cf07e4176869357bfb52" }
 
 [[language]]
 name = "cpon"
diff --git a/runtime/queries/cairo/highlights.scm b/runtime/queries/cairo/highlights.scm
index 3a30d188..c10ce5e0 100644
--- a/runtime/queries/cairo/highlights.scm
+++ b/runtime/queries/cairo/highlights.scm
@@ -36,7 +36,6 @@
 [
   "if"
   "else"
-  "end"
   "assert"
   "with"
   "with_attr"
@@ -54,7 +53,6 @@
   "const"
   "local"
   "struct"
-  "member"
   "alloc_locals"
   "tempvar"
 ] @keyword

From 09a6df199e535270f15901cdaec99cfffa0f4043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Fri, 14 Oct 2022 16:25:33 +0900
Subject: [PATCH 295/884] Support Cairo 0.10 syntax

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index d3528533..7fa3e211 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1445,7 +1445,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[grammar]]
 name = "cairo"
-source = { git = "https://github.com/archseer/tree-sitter-cairo", rev = "e2f9b3d75f483fcfda03cf07e4176869357bfb52" }
+source = { git = "https://github.com/archseer/tree-sitter-cairo", rev = "b249662a1eefeb4d71c9529cdd971e74fecc10fe" }
 
 [[language]]
 name = "cpon"

From 4e691d62470a4f92ee5bf2e2609a97d0e1ec832c Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Mon, 17 Oct 2022 13:15:42 +0530
Subject: [PATCH 296/884] Change diagnostic picker keybind to <space>d (#4229)

Also changes workspace diagnostic picker bindings to <space>D and
changes the debug menu keybind to <space>g, the previous diagnostic
picker keybind. This brings the diagnostic picker bindings more in
line with the jump to next/previous diagnostic bindings which are
currently on ]d and [d.
---
 book/src/keymap.md               | 4 ++--
 helix-term/src/keymap/default.rs | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 0882381e..5bdbdd29 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -273,8 +273,8 @@ This layer is a kludge of mappings, mostly pickers.
 | `k`     | Show documentation for item under cursor in a [popup](#popup) (**LSP**) | `hover`                             |
 | `s`     | Open document symbol picker (**LSP**)                                   | `symbol_picker`                     |
 | `S`     | Open workspace symbol picker (**LSP**)                                  | `workspace_symbol_picker`           |
-| `g`     | Open document diagnostics picker (**LSP**)                              | `diagnostics_picker`                |
-| `G`     | Open workspace diagnostics picker (**LSP**)                             | `workspace_diagnostics_picker`
+| `d`     | Open document diagnostics picker (**LSP**)                              | `diagnostics_picker`                |
+| `D`     | Open workspace diagnostics picker (**LSP**)                             | `workspace_diagnostics_picker`      |
 | `r`     | Rename symbol (**LSP**)                                                 | `rename_symbol`                     |
 | `a`     | Apply code action  (**LSP**)                                            | `code_action`                       |
 | `'`     | Open last fuzzy picker                                                  | `last_picker`                       |
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index 6c327ee6..118764d9 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -209,11 +209,11 @@ pub fn default() -> HashMap<Mode, Keymap> {
             "j" => jumplist_picker,
             "s" => symbol_picker,
             "S" => workspace_symbol_picker,
-            "g" => diagnostics_picker,
-            "G" => workspace_diagnostics_picker,
+            "d" => diagnostics_picker,
+            "D" => workspace_diagnostics_picker,
             "a" => code_action,
             "'" => last_picker,
-            "d" => { "Debug (experimental)" sticky=true
+            "g" => { "Debug (experimental)" sticky=true
                 "l" => dap_launch,
                 "b" => dap_toggle_breakpoint,
                 "c" => dap_continue,

From 3ba665d804c8d88bc3d59a52296f349acdb6d436 Mon Sep 17 00:00:00 2001
From: A-Walrus <ofek.r.guy@gmail.com>
Date: Mon, 10 Oct 2022 11:13:25 +0300
Subject: [PATCH 297/884] Fix rendering of lines longer than 2^16

Before things would be cast to u16 earlier than needed, which would
cause problems for insanely long lines (longer than 2^16 ~ 65 thousand)
---
 helix-term/src/ui/editor.rs | 19 +++++++++----------
 helix-view/src/editor.rs    |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 8e9d8631..c6a83546 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -428,7 +428,7 @@ impl EditorView {
         let characters = &whitespace.characters;
 
         let mut spans = Vec::new();
-        let mut visual_x = 0u16;
+        let mut visual_x = 0usize;
         let mut line = 0u16;
         let tab_width = doc.tab_width();
         let tab = if whitespace.render.tab() == WhitespaceRenderValue::All {
@@ -465,14 +465,13 @@ impl EditorView {
                 return;
             }
 
-            let starting_indent =
-                (offset.col / tab_width) as u16 + config.indent_guides.skip_levels;
+            let starting_indent = (offset.col / tab_width) + config.indent_guides.skip_levels;
             // TODO: limit to a max indent level too. It doesn't cause visual artifacts but it would avoid some
             // extra loops if the code is deeply nested.
 
-            for i in starting_indent..(indent_level / tab_width as u16) {
+            for i in starting_indent..(indent_level / tab_width) {
                 surface.set_string(
-                    viewport.x + (i * tab_width as u16) - offset.col as u16,
+                    (viewport.x as usize + (i * tab_width) - offset.col) as u16,
                     viewport.y + line,
                     &indent_guide_char,
                     indent_guide_style,
@@ -518,14 +517,14 @@ impl EditorView {
                     use helix_core::graphemes::{grapheme_width, RopeGraphemes};
 
                     for grapheme in RopeGraphemes::new(text) {
-                        let out_of_bounds = visual_x < offset.col as u16
-                            || visual_x >= viewport.width + offset.col as u16;
+                        let out_of_bounds = offset.col > (visual_x as usize)
+                            || (visual_x as usize) >= viewport.width as usize + offset.col;
 
                         if LineEnding::from_rope_slice(&grapheme).is_some() {
                             if !out_of_bounds {
                                 // we still want to render an empty cell with the style
                                 surface.set_string(
-                                    viewport.x + visual_x - offset.col as u16,
+                                    (viewport.x as usize + visual_x - offset.col) as u16,
                                     viewport.y + line,
                                     &newline,
                                     style.patch(whitespace_style),
@@ -573,7 +572,7 @@ impl EditorView {
                             if !out_of_bounds {
                                 // if we're offscreen just keep going until we hit a new line
                                 surface.set_string(
-                                    viewport.x + visual_x - offset.col as u16,
+                                    (viewport.x as usize + visual_x - offset.col) as u16,
                                     viewport.y + line,
                                     display_grapheme,
                                     if is_whitespace {
@@ -606,7 +605,7 @@ impl EditorView {
                                 last_line_indent_level = visual_x;
                             }
 
-                            visual_x = visual_x.saturating_add(width as u16);
+                            visual_x = visual_x.saturating_add(width);
                         }
                     }
                 }
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 60b3880c..dd1e30f9 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -558,7 +558,7 @@ impl Default for WhitespaceCharacters {
 pub struct IndentGuidesConfig {
     pub render: bool,
     pub character: char,
-    pub skip_levels: u16,
+    pub skip_levels: usize,
 }
 
 impl Default for IndentGuidesConfig {

From 2c36e33e0ac55d01baacb9714d9d77d7dd532d98 Mon Sep 17 00:00:00 2001
From: A-Walrus <ofek.r.guy@gmail.com>
Date: Tue, 11 Oct 2022 10:00:41 +0300
Subject: [PATCH 298/884] Make skip_levels a u8

---
 helix-term/src/ui/editor.rs | 3 ++-
 helix-view/src/editor.rs    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index c6a83546..e05136d0 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -465,7 +465,8 @@ impl EditorView {
                 return;
             }
 
-            let starting_indent = (offset.col / tab_width) + config.indent_guides.skip_levels;
+            let starting_indent =
+                (offset.col / tab_width) + config.indent_guides.skip_levels as usize;
             // TODO: limit to a max indent level too. It doesn't cause visual artifacts but it would avoid some
             // extra loops if the code is deeply nested.
 
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index dd1e30f9..e9a3c639 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -558,7 +558,7 @@ impl Default for WhitespaceCharacters {
 pub struct IndentGuidesConfig {
     pub render: bool,
     pub character: char,
-    pub skip_levels: usize,
+    pub skip_levels: u8,
 }
 
 impl Default for IndentGuidesConfig {

From 1de02a147c1738015aa26dea7c8fd313f3741d8e Mon Sep 17 00:00:00 2001
From: A-Walrus <ofek.r.guy@gmail.com>
Date: Tue, 11 Oct 2022 11:37:57 +0300
Subject: [PATCH 299/884] Only draw indent guides within bounds

Better performance, and otherwise very long lines with lots of tabs
will wrap around the u16 and come back on the other side, messing up
the beginning skip_levels.
---
 helix-term/src/ui/editor.rs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index e05136d0..4074534b 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -467,16 +467,14 @@ impl EditorView {
 
             let starting_indent =
                 (offset.col / tab_width) + config.indent_guides.skip_levels as usize;
-            // TODO: limit to a max indent level too. It doesn't cause visual artifacts but it would avoid some
-            // extra loops if the code is deeply nested.
 
             for i in starting_indent..(indent_level / tab_width) {
-                surface.set_string(
-                    (viewport.x as usize + (i * tab_width) - offset.col) as u16,
-                    viewport.y + line,
-                    &indent_guide_char,
-                    indent_guide_style,
-                );
+                let x = (viewport.x as usize + (i * tab_width) - offset.col) as u16;
+                let y = viewport.y + line;
+                if !surface.in_bounds(x, y) {
+                    break;
+                }
+                surface.set_string(x, y, &indent_guide_char, indent_guide_style);
             }
         };
 

From 8bbddf90ffda7c37f8a87f71227a185007ddfae0 Mon Sep 17 00:00:00 2001
From: A-Walrus <ofek.r.guy@gmail.com>
Date: Mon, 17 Oct 2022 14:23:50 +0300
Subject: [PATCH 300/884] Replace `in_bounds` with calculation of end_indent

Instead of repeatedly checking if it is in_bounds, calculate the
max_indent beforehand and just loop. I added a debug_assert to "prove"
that it never tries drawing out of bounds.
---
 helix-term/src/ui/editor.rs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 4074534b..3cd2130a 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -24,7 +24,7 @@ use helix_view::{
     keyboard::{KeyCode, KeyModifiers},
     Document, Editor, Theme, View,
 };
-use std::{borrow::Cow, path::PathBuf};
+use std::{borrow::Cow, cmp::min, path::PathBuf};
 
 use tui::buffer::Buffer as Surface;
 
@@ -468,12 +468,18 @@ impl EditorView {
             let starting_indent =
                 (offset.col / tab_width) + config.indent_guides.skip_levels as usize;
 
-            for i in starting_indent..(indent_level / tab_width) {
+            // Don't draw indent guides outside of view
+            let end_indent = min(
+                indent_level,
+                // Add tab_width - 1 to round up, since the first visible
+                // indent might be a bit after offset.col
+                offset.col + viewport.width as usize + (tab_width - 1),
+            ) / tab_width;
+
+            for i in starting_indent..end_indent {
                 let x = (viewport.x as usize + (i * tab_width) - offset.col) as u16;
                 let y = viewport.y + line;
-                if !surface.in_bounds(x, y) {
-                    break;
-                }
+                debug_assert!(surface.in_bounds(x, y));
                 surface.set_string(x, y, &indent_guide_char, indent_guide_style);
             }
         };

From b07ef6bec30e1c704a63579efa5cc433c22fcc19 Mon Sep 17 00:00:00 2001
From: Clay <connorlay@users.noreply.github.com>
Date: Mon, 17 Oct 2022 09:05:14 -0700
Subject: [PATCH 301/884] Bump tree-sitter-elixir (#4333)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 7fa3e211..3c324c78 100644
--- a/languages.toml
+++ b/languages.toml
@@ -107,7 +107,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "elixir"
-source = { git = "https://github.com/elixir-lang/tree-sitter-elixir", rev = "1dabc1c790e07115175057863808085ea60dd08a"  }
+source = { git = "https://github.com/elixir-lang/tree-sitter-elixir", rev = "b20eaa75565243c50be5e35e253d8beb58f45d56"  }
 
 [[language]]
 name = "fish"

From 38746b04b44bc792ddca5d798f750366e478d258 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Oct 2022 19:55:15 -0500
Subject: [PATCH 302/884] build(deps): bump cachix/cachix-action from 10 to 11
 (#4339)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cachix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index 2d37b36a..d4547e58 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -17,7 +17,7 @@ jobs:
       uses: cachix/install-nix-action@v17
 
     - name: Authenticate with Cachix
-      uses: cachix/cachix-action@v10
+      uses: cachix/cachix-action@v11
       with:
         name: helix
         authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}

From 414214f883c73d341db3b2638eed5e077de8eb53 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Oct 2022 19:56:29 -0500
Subject: [PATCH 303/884] build(deps): bump tokio-stream from 0.1.10 to 0.1.11
 (#4341)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock           | 4 ++--
 helix-lsp/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 38ab8044..c45d8739 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1197,9 +1197,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af"
+checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce"
 dependencies = [
  "futures-core",
  "pin-project-lite",
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 536a6ba6..ad432d96 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -23,5 +23,5 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
 tokio = { version = "1.21", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
-tokio-stream = "0.1.10"
+tokio-stream = "0.1.11"
 which = "4.2"

From fee5db161b67316f29254f29ce5eea3044ebfdac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Oct 2022 20:03:04 -0500
Subject: [PATCH 304/884] build(deps): bump cachix/install-nix-action from 17
 to 18 (#4340)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cachix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index d4547e58..bc72bb78 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -14,7 +14,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Install nix
-      uses: cachix/install-nix-action@v17
+      uses: cachix/install-nix-action@v18
 
     - name: Authenticate with Cachix
       uses: cachix/cachix-action@v11

From d17ffc47f008821e1b4ab04cd85d019ed8dc6fb9 Mon Sep 17 00:00:00 2001
From: Philipp Mildenberger <philipp@mildenberger.me>
Date: Tue, 18 Oct 2022 19:28:16 +0200
Subject: [PATCH 305/884] Use the same `WalkBuilder` configuration for the
 global search file picker as the default file picker (#4334)

Skip searching .git in global search, similar to how file picker skips listing files in .git.
---
 helix-term/src/commands.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index d5fc1ad9..318dd035 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1865,10 +1865,15 @@ fn global_search(cx: &mut Context) {
                     .hidden(file_picker_config.hidden)
                     .parents(file_picker_config.parents)
                     .ignore(file_picker_config.ignore)
+                    .follow_links(file_picker_config.follow_symlinks)
                     .git_ignore(file_picker_config.git_ignore)
                     .git_global(file_picker_config.git_global)
                     .git_exclude(file_picker_config.git_exclude)
                     .max_depth(file_picker_config.max_depth)
+                    // We always want to ignore the .git directory, otherwise if
+                    // `ignore` is turned off above, we end up with a lot of noise
+                    // in our picker.
+                    .filter_entry(|entry| entry.file_name() != ".git")
                     .build_parallel()
                     .run(|| {
                         let mut searcher = searcher.clone();

From 1f74cf45d45804da8f33e173b26b3ddda82c706b Mon Sep 17 00:00:00 2001
From: Roberto Vidal <vidal.roberto.j@gmail.com>
Date: Tue, 18 Oct 2022 20:30:00 +0200
Subject: [PATCH 306/884] display tree sitter scopes in a popup (#4337)

---
 helix-term/src/commands/typed.rs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 8ab10da4..1bfc8153 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1060,7 +1060,21 @@ fn tree_sitter_scopes(
 
     let pos = doc.selection(view.id).primary().cursor(text);
     let scopes = indent::get_scopes(doc.syntax(), text, pos);
-    cx.editor.set_status(format!("scopes: {:?}", &scopes));
+
+    let contents = format!("```json\n{:?}\n````", scopes);
+
+    let callback = async move {
+        let call: job::Callback =
+            Box::new(move |editor: &mut Editor, compositor: &mut Compositor| {
+                let contents = ui::Markdown::new(contents, editor.syn_loader.clone());
+                let popup = Popup::new("hover", contents).auto_close(true);
+                compositor.replace_or_push("hover", popup);
+            });
+        Ok(call)
+    };
+
+    cx.jobs.callback(callback);
+
     Ok(())
 }
 

From 0c14d9f869c503a873a420c4acab17bd922d1d3b Mon Sep 17 00:00:00 2001
From: zetashift <rskaraya@gmail.com>
Date: Wed, 19 Oct 2022 02:32:02 +0200
Subject: [PATCH 307/884] Add a first version of kanagawa theme (#4300)

---
 runtime/themes/kanagawa.toml | 125 +++++++++++++++++++++++++++++++++++
 1 file changed, 125 insertions(+)
 create mode 100644 runtime/themes/kanagawa.toml

diff --git a/runtime/themes/kanagawa.toml b/runtime/themes/kanagawa.toml
new file mode 100644
index 00000000..50a7c0a7
--- /dev/null
+++ b/runtime/themes/kanagawa.toml
@@ -0,0 +1,125 @@
+# Kanagawa
+# Author: zetashift
+
+# Adaptation of https://github.com/rebelot/kanagawa.nvim
+# Original author: rebelot
+# All credits to the original author, the palette is taken from the README
+# because of some theming differences, it's not an exact copy of the original.
+
+## User interface
+"ui.selection" = { bg = "waveBlue1" }
+"ui.background" = { fg = "fujiWhite", bg = "sumiInk1" }
+
+"ui.linenr" = { fg = "sumiInk4" }
+
+"ui.statusline" = { fg = "oldWhite", bg = "sumiInk0" }
+"ui.statusline.inactive" = { fg = "fujiGray", bg = "sumiInk0" }
+"ui.statusline.normal" = { fg = "sumiInk0", bg = "crystalBlue", modifiers = ["bold"] }
+"ui.statusline.insert" = { fg = "sumiInk0", bg = "autumnGreen"  }
+"ui.statusline.select" = { fg = "sumiInk0", bg = "oniViolet" }
+
+"ui.bufferline" = { fg = "oldWhite", bg = "sumiInk0" }
+"ui.bufferline.inactive" = { fg = "fujiGray", bg = "sumiInk0" }
+
+"ui.popup" = { fg = "fujiWhite", bg = "sumiInk0" }
+"ui.window" = { fg = "fujiWhite" }
+"ui.help" = { fg = "fujiWhite", bg = "waveBlue1" }
+"ui.text" = "fujiWhite"
+"ui.text.focus" = { fg = "fujiWhite", bg = "waveBlue1", modifiers = ["bold"] }
+"ui.virtual" = "waveBlue1"
+
+"ui.cursor" = { fg = "fujiWhite", bg = "waveBlue1"}
+"ui.cursor.primary" = { fg = "seaFoam", bg = "waveBlue1" }
+"ui.cursor.match" = { fg = "seaFoam", modifiers = ["bold"] }
+"ui.highlight" = { fg = "fujiWhite", bg = "waveBlue2" }
+
+diagnostic = { modifiers = ["underlined"] }
+
+error = "samuraiRed"
+warning = "roninYellow"
+info = "waveAqua1"
+hint = "dragonBlue"
+
+## Syntax highlighting
+"type" = "waveAqua2"
+"constant" = "surimiOrange"
+"constant.numeric" = "sakuraPink"
+"constant.character.escape" = "springBlue"
+"string" = "springGreen"
+"string.regexp" = "boatYellow2"
+"comment" = "fujiGray"
+"variable" = "fujiWhite"
+"variable.builtin" = "waveRed"
+"variable.parameter" = "carpYellow"
+"variable.other.member" = "carpYellow"
+"label" = "springBlue"
+"punctuation" = "springViolet2"
+"punctuation.delimiter" = "springViolet2" 
+"punctuation.bracket" = "springViolet2" 
+"keyword" = "oniViolet"
+"keyword.directive" = "peachRed"
+"operator" = "boatYellow2"
+"function" = "crystalBlue"
+"function.builtin" = "peachRed"
+"function.macro" = "waveRed"
+"tag" = "springBlue"
+"namespace" = "surimiOrange"
+"attribute" = "peachRed"
+"constructor" = "springBlue"
+"module" = "waveAqua2"
+"special" = "peachRed"
+
+## Markup modifiers
+"markup.heading.marker" = "fujiGray"
+"markup.heading.1" = { fg = "surimiOrange", modifiers = ["bold"] }
+"markup.heading.2" = { fg = "carpYellow", modifiers = ["bold"] }
+"markup.heading.3" = { fg = "waveAqua2", modifiers = ["bold"] }
+"markup.heading.4" = { fg = "springGreen", modifiers = ["bold"] }
+"markup.heading.5" = { fg = "waveRed", modifiers = ["bold"] }
+"markup.heading.6" = { fg = "autumnRed", modifiers = ["bold"] }
+"markup.list" = "oniViolet"
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.link.url" = { fg = "springBlue", modifiers = ["underlined"] }
+"markup.link.text" = "crystalBlue"
+"markup.quote" = "seaFoam"
+"markup.raw" = "seaFoam"
+
+[palette]
+seaFoam       = "#C7CCD1" # custom lighter foreground
+fujiWhite     = "#DCD7BA" # default foreground
+oldWhite      = "#C8C093" # dark foreground, e.g. statuslines
+sumiInk0      = "#16161D" # dark background, e.g. statuslines, floating windows
+sumiInk1      = "#1F1F28" # default background
+sumiInk3      = "#363646" # lighter background, e.g. colorcolumns and folds
+sumiInk4      = "#54546D" # darker foreground, e.g. linenumbers, fold column
+waveBlue1     = "#223249" # popup background, visual selection background
+waveBlue2     = "#2D4F67" # popup selection background, search background
+winterGreen   = "#2B3328" # diff add background
+winterYellow  = "#49443C" # diff change background
+winterRed     = "#43242B" # diff deleted background
+winterBlue    = "#252535" # diff line background
+autumnGreen   = "#76946A" # git add
+autumnRed     = "#C34043" # git delete
+autumnYellow  = "#DCA561" # git change
+samuraiRed    = "#E82424" # diagnostic error
+roninYellow   = "#FF9E3B" # diagnostic warning
+waveAqua1     = "#6A9589" # diagnostic info
+dragonBlue    = "#658594" # diagnostic hint
+fujiGray      = "#727169" # comments
+springViolet1 = "#938AA9" # light foreground
+oniViolet     = "#957FB8" # statements and keywords
+crystalBlue   = "#7E9CD8" # functions and titles
+springViolet2 = "#9CABCA" # brackets and punctuation
+springBlue    = "#7FB4CA" # specials and builtins
+lightBlue     = "#A3D4D5" # not used!
+waveAqua2     = "#7AA89F" # types
+springGreen   = "#98BB6C" # strings
+boatYellow1   = "#938056" # not used
+boatYellow2   = "#C0A36E" # operators, regex
+carpYellow    = "#E6C384" # identifiers
+sakuraPink    = "#D27E99" # numbers
+waveRed       = "#E46876" # standout specials 1, e.g. builtin variables
+peachRed      = "#FF5D62" # standout specials 2, e.g. exception handling, returns
+surimiOrange  = "#FFA066" # constants, imports, booleans
+katanaGray    = "#717C7C" # deprecated
\ No newline at end of file

From 1a772d1b67d4895d79273b027b1b1f86bd1616fe Mon Sep 17 00:00:00 2001
From: Jonathan LEI <me@xjonathan.dev>
Date: Wed, 19 Oct 2022 08:53:58 +0800
Subject: [PATCH 308/884] Fix deleting word from end of buffer (#4328)

---
 helix-term/src/commands.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 318dd035..5073651b 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2885,7 +2885,7 @@ pub mod insert {
 
     /// Exclude the cursor in range.
     fn exclude_cursor(text: RopeSlice, range: Range, cursor: Range) -> Range {
-        if range.to() == cursor.to() {
+        if range.to() == cursor.to() && text.len_chars() != cursor.to() {
             Range::new(
                 range.from(),
                 graphemes::prev_grapheme_boundary(text, cursor.to()),

From faf0c521d15c314f411cc6178024c5d3310212da Mon Sep 17 00:00:00 2001
From: Peter Phillips <phillipspc@gmail.com>
Date: Tue, 18 Oct 2022 22:16:44 -0400
Subject: [PATCH 309/884] Fix link to textobjects usage from keymap
 documentation (#4357)

---
 book/src/keymap.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 5bdbdd29..6523b09f 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -221,7 +221,7 @@ Jumps to various locations.
 Accessed by typing `m` in [normal mode](#normal-mode).
 
 See the relevant section in [Usage](./usage.md) for an explanation about
-[surround](./usage.md#surround) and [textobject](./usage.md#textobject) usage.
+[surround](./usage.md#surround) and [textobject](./usage.md#textobjects) usage.
 
 | Key              | Description                                     | Command                    |
 | -----            | -----------                                     | -------                    |

From d706194597d462fbaeb1ef55e2e8fb6eae38d2f3 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Sun, 10 Apr 2022 11:05:47 -0400
Subject: [PATCH 310/884] chore(write): serialize write operations within a
 Document

The way that document writes are handled are by submitting them to the
async job pool, which are all executed opportunistically out of order. It
was discovered that this can lead to write inconsistencies when there
are multiple writes to the same file in quick succession.

This seeks to fix this problem by removing document writes from the
general pool of jobs and into its own specialized event. Now when a
user submits a write with one of the write commands, a request is simply
queued up in a new mpsc channel that each Document makes to handle its own
writes. This way, if multiple writes are submitted on the same document,
they are executed in order, while still allowing concurrent writes for
different documents.
---
 helix-term/src/application.rs    | 135 +++++++++++++++++++++++--------
 helix-term/src/commands.rs       |   2 +-
 helix-term/src/commands/typed.rs |  13 +--
 helix-term/tests/test/write.rs   |   2 -
 helix-view/src/document.rs       | 128 ++++++++++++++++++++++++++---
 helix-view/src/editor.rs         |  81 ++++++++++++++++---
 6 files changed, 297 insertions(+), 64 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 4bb36b59..a9e25d08 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -6,7 +6,14 @@ use helix_core::{
     pos_at_coords, syntax, Selection,
 };
 use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap};
-use helix_view::{align_view, editor::ConfigEvent, theme, tree::Layout, Align, Editor};
+use helix_view::{
+    align_view,
+    document::DocumentSaveEventResult,
+    editor::{ConfigEvent, EditorEvent},
+    theme,
+    tree::Layout,
+    Align, Editor,
+};
 use serde_json::json;
 
 use crate::{
@@ -19,7 +26,7 @@ use crate::{
     ui::{self, overlay::overlayed},
 };
 
-use log::{error, warn};
+use log::{debug, error, warn};
 use std::{
     io::{stdin, stdout, Write},
     sync::Arc,
@@ -294,26 +301,6 @@ impl Application {
                 Some(signal) = self.signals.next() => {
                     self.handle_signals(signal).await;
                 }
-                Some((id, call)) = self.editor.language_servers.incoming.next() => {
-                    self.handle_language_server_message(call, id).await;
-                    // limit render calls for fast language server messages
-                    let last = self.editor.language_servers.incoming.is_empty();
-
-                    if last || self.last_render.elapsed() > LSP_DEADLINE {
-                        self.render();
-                        self.last_render = Instant::now();
-                    }
-                }
-                Some(payload) = self.editor.debugger_events.next() => {
-                    let needs_render = self.editor.handle_debugger_message(payload).await;
-                    if needs_render {
-                        self.render();
-                    }
-                }
-                Some(config_event) = self.editor.config_events.1.recv() => {
-                    self.handle_config_events(config_event);
-                    self.render();
-                }
                 Some(callback) = self.jobs.futures.next() => {
                     self.jobs.handle_callback(&mut self.editor, &mut self.compositor, callback);
                     self.render();
@@ -322,20 +309,47 @@ impl Application {
                     self.jobs.handle_callback(&mut self.editor, &mut self.compositor, callback);
                     self.render();
                 }
-                _ = &mut self.editor.idle_timer => {
-                    // idle timeout
-                    self.editor.clear_idle_timer();
-                    self.handle_idle_timeout();
+                event = self.editor.wait_event() => {
+                    match event {
+                        EditorEvent::DocumentSave(event) => {
+                            self.handle_document_write(event);
+                            self.render();
+                        }
+                        EditorEvent::ConfigEvent(event) => {
+                            self.handle_config_events(event);
+                            self.render();
+                        }
+                        EditorEvent::LanguageServerMessage((id, call)) => {
+                            self.handle_language_server_message(call, id).await;
+                            // limit render calls for fast language server messages
+                            let last = self.editor.language_servers.incoming.is_empty();
+
+                            if last || self.last_render.elapsed() > LSP_DEADLINE {
+                                self.render();
+                                self.last_render = Instant::now();
+                            }
+                        }
+                        EditorEvent::DebuggerEvent(payload) => {
+                            let needs_render = self.editor.handle_debugger_message(payload).await;
+                            if needs_render {
+                                self.render();
+                            }
+                        }
+                        EditorEvent::IdleTimer => {
+                            self.editor.clear_idle_timer();
+                            self.handle_idle_timeout();
 
-                    #[cfg(feature = "integration")]
-                    {
-                        idle_handled = true;
+                            #[cfg(feature = "integration")]
+                            {
+                                idle_handled = true;
+                            }
+                        }
                     }
                 }
             }
 
             // for integration tests only, reset the idle timer after every
-            // event to make a signal when test events are done processing
+            // event to signal when test events are done processing
             #[cfg(feature = "integration")]
             {
                 if idle_handled {
@@ -446,6 +460,46 @@ impl Application {
         }
     }
 
+    pub fn handle_document_write(&mut self, doc_save_event: DocumentSaveEventResult) {
+        if let Err(err) = doc_save_event {
+            self.editor.set_error(err.to_string());
+            return;
+        }
+
+        let doc_save_event = doc_save_event.unwrap();
+        let doc = self.editor.document_mut(doc_save_event.doc_id);
+
+        if doc.is_none() {
+            warn!(
+                "received document saved event for non-existent doc id: {}",
+                doc_save_event.doc_id
+            );
+
+            return;
+        }
+
+        let doc = doc.unwrap();
+
+        debug!(
+            "document {:?} saved with revision {}",
+            doc.path(),
+            doc_save_event.revision
+        );
+
+        doc.set_last_saved_revision(doc_save_event.revision);
+        let lines = doc.text().len_lines();
+        let bytes = doc.text().len_bytes();
+
+        let path_str = doc
+            .path()
+            .expect("document written without path")
+            .to_string_lossy()
+            .into_owned();
+
+        self.editor
+            .set_status(format!("'{}' written, {}L {}B", path_str, lines, bytes));
+    }
+
     pub fn handle_terminal_events(&mut self, event: Result<CrosstermEvent, crossterm::ErrorKind>) {
         let mut cx = crate::compositor::Context {
             editor: &mut self.editor,
@@ -866,11 +920,28 @@ impl Application {
 
         self.event_loop(input_stream).await;
 
-        let err = self.close().await.err();
+        let mut save_errs = Vec::new();
+
+        for doc in self.editor.documents_mut() {
+            if let Some(Err(err)) = doc.close().await {
+                save_errs.push((
+                    doc.path()
+                        .map(|path| path.to_string_lossy().into_owned())
+                        .unwrap_or_else(|| "".into()),
+                    err,
+                ));
+            }
+        }
 
+        let close_err = self.close().await.err();
         restore_term()?;
 
-        if let Some(err) = err {
+        for (path, err) in save_errs {
+            self.editor.exit_code = 1;
+            eprintln!("Error closing '{}': {}", path, err);
+        }
+
+        if let Some(err) = close_err {
             self.editor.exit_code = 1;
             eprintln!("Error: {}", err);
         }
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 5073651b..f38434e2 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -51,7 +51,7 @@ use crate::{
     ui::{self, overlay::overlayed, FilePicker, Picker, Popup, Prompt, PromptEvent},
 };
 
-use crate::job::{self, Job, Jobs};
+use crate::job::{self, Jobs};
 use futures_util::{FutureExt, StreamExt};
 use std::{collections::HashMap, fmt, future::Future};
 use std::{collections::HashSet, num::NonZeroUsize};
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 1bfc8153..d82dd7fe 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -77,7 +77,9 @@ fn buffer_close_by_ids_impl(
     let (modified_ids, modified_names): (Vec<_>, Vec<_>) = doc_ids
         .iter()
         .filter_map(|&doc_id| {
-            if let Err(CloseError::BufferModified(name)) = editor.close_document(doc_id, force) {
+            if let Err(CloseError::BufferModified(name)) =
+                helix_lsp::block_on(editor.close_document(doc_id, force))
+            {
                 Some((doc_id, name))
             } else {
                 None
@@ -269,6 +271,7 @@ fn write_impl(
         doc.set_path(Some(path.as_ref().as_ref()))
             .context("invalid filepath")?;
     }
+
     if doc.path().is_none() {
         bail!("cannot write a buffer without a filename");
     }
@@ -287,8 +290,8 @@ fn write_impl(
     } else {
         None
     };
-    let future = doc.format_and_save(fmt, force);
-    cx.jobs.add(Job::new(future).wait_before_exiting());
+
+    doc.format_and_save(fmt, force)?;
 
     if path.is_some() {
         let id = doc.id();
@@ -602,8 +605,8 @@ fn write_all_impl(
         } else {
             None
         };
-        let future = doc.format_and_save(fmt, force);
-        jobs.add(Job::new(future).wait_before_exiting());
+
+        doc.format_and_save(fmt, force)?;
     }
 
     if quit {
diff --git a/helix-term/tests/test/write.rs b/helix-term/tests/test/write.rs
index 8869d881..4ac850c1 100644
--- a/helix-term/tests/test/write.rs
+++ b/helix-term/tests/test/write.rs
@@ -62,7 +62,6 @@ async fn test_write_quit() -> anyhow::Result<()> {
 }
 
 #[tokio::test]
-#[ignore]
 async fn test_write_concurrent() -> anyhow::Result<()> {
     let mut file = tempfile::NamedTempFile::new()?;
     let mut command = String::new();
@@ -92,7 +91,6 @@ async fn test_write_concurrent() -> anyhow::Result<()> {
 }
 
 #[tokio::test]
-#[ignore]
 async fn test_write_fail_mod_flag() -> anyhow::Result<()> {
     let file = helpers::new_readonly_tempfile()?;
 
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 0daa983f..d6480b32 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -3,6 +3,7 @@ use futures_util::future::BoxFuture;
 use futures_util::FutureExt;
 use helix_core::auto_pairs::AutoPairs;
 use helix_core::Range;
+use log::debug;
 use serde::de::{self, Deserialize, Deserializer};
 use serde::Serialize;
 use std::borrow::Cow;
@@ -13,6 +14,8 @@ use std::future::Future;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::sync::Arc;
+use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};
+use tokio::sync::Mutex;
 
 use helix_core::{
     encoding,
@@ -83,6 +86,16 @@ impl Serialize for Mode {
     }
 }
 
+/// A snapshot of the text of a document that we want to write out to disk
+#[derive(Debug, Clone)]
+pub struct DocumentSaveEvent {
+    pub revision: usize,
+    pub doc_id: DocumentId,
+}
+
+pub type DocumentSaveEventResult = Result<DocumentSaveEvent, anyhow::Error>;
+pub type DocumentSaveEventFuture = BoxFuture<'static, DocumentSaveEventResult>;
+
 pub struct Document {
     pub(crate) id: DocumentId,
     text: Rope,
@@ -118,6 +131,9 @@ pub struct Document {
     last_saved_revision: usize,
     version: i32, // should be usize?
     pub(crate) modified_since_accessed: bool,
+    save_sender: Option<UnboundedSender<DocumentSaveEventFuture>>,
+    save_receiver: Option<UnboundedReceiver<DocumentSaveEventFuture>>,
+    current_save: Arc<Mutex<Option<DocumentSaveEventFuture>>>,
 
     diagnostics: Vec<Diagnostic>,
     language_server: Option<Arc<helix_lsp::Client>>,
@@ -338,6 +354,7 @@ impl Document {
         let encoding = encoding.unwrap_or(encoding::UTF_8);
         let changes = ChangeSet::new(&text);
         let old_state = None;
+        let (save_sender, save_receiver) = tokio::sync::mpsc::unbounded_channel();
 
         Self {
             id: DocumentId::default(),
@@ -358,6 +375,9 @@ impl Document {
             savepoint: None,
             last_saved_revision: 0,
             modified_since_accessed: false,
+            save_sender: Some(save_sender),
+            save_receiver: Some(save_receiver),
+            current_save: Arc::new(Mutex::new(None)),
             language_server: None,
         }
     }
@@ -492,29 +512,34 @@ impl Document {
         Some(fut.boxed())
     }
 
-    pub fn save(&mut self, force: bool) -> impl Future<Output = Result<(), anyhow::Error>> {
+    pub fn save(&mut self, force: bool) -> Result<(), anyhow::Error> {
         self.save_impl::<futures_util::future::Ready<_>>(None, force)
     }
 
     pub fn format_and_save(
         &mut self,
-        formatting: Option<impl Future<Output = Result<Transaction, FormatterError>>>,
+        formatting: Option<
+            impl Future<Output = Result<Transaction, FormatterError>> + 'static + Send,
+        >,
         force: bool,
-    ) -> impl Future<Output = anyhow::Result<()>> {
+    ) -> anyhow::Result<()> {
         self.save_impl(formatting, force)
     }
 
-    // TODO: do we need some way of ensuring two save operations on the same doc can't run at once?
-    // or is that handled by the OS/async layer
+    // TODO: impl Drop to handle ensuring writes when closed
     /// The `Document`'s text is encoded according to its encoding and written to the file located
     /// at its `path()`.
     ///
     /// If `formatting` is present, it supplies some changes that we apply to the text before saving.
-    fn save_impl<F: Future<Output = Result<Transaction, FormatterError>>>(
+    fn save_impl<F: Future<Output = Result<Transaction, FormatterError>> + 'static + Send>(
         &mut self,
         formatting: Option<F>,
         force: bool,
-    ) -> impl Future<Output = Result<(), anyhow::Error>> {
+    ) -> Result<(), anyhow::Error> {
+        if self.save_sender.is_none() {
+            bail!("saves are closed for this document!");
+        }
+
         // we clone and move text + path into the future so that we asynchronously save the current
         // state without blocking any further edits.
 
@@ -525,12 +550,13 @@ impl Document {
         let language_server = self.language_server.clone();
 
         // mark changes up to now as saved
-        self.reset_modified();
+        let current_rev = self.get_current_revision();
+        let doc_id = self.id();
 
         let encoding = self.encoding;
 
         // We encode the file according to the `Document`'s encoding.
-        async move {
+        let save_event = async move {
             use tokio::fs::File;
             if let Some(parent) = path.parent() {
                 // TODO: display a prompt asking the user if the directories should be created
@@ -563,9 +589,14 @@ impl Document {
             let mut file = File::create(path).await?;
             to_writer(&mut file, encoding, &text).await?;
 
+            let event = DocumentSaveEvent {
+                revision: current_rev,
+                doc_id,
+            };
+
             if let Some(language_server) = language_server {
                 if !language_server.is_initialized() {
-                    return Ok(());
+                    return Ok(event);
                 }
                 if let Some(notification) =
                     language_server.text_document_did_save(identifier, &text)
@@ -574,8 +605,70 @@ impl Document {
                 }
             }
 
-            Ok(())
+            Ok(event)
+        };
+
+        self.save_sender
+            .as_mut()
+            .unwrap()
+            .send(Box::pin(save_event))
+            .map_err(|err| anyhow!("failed to send save event: {}", err))
+    }
+
+    pub async fn await_save(&mut self) -> Option<DocumentSaveEventResult> {
+        let mut current_save = self.current_save.lock().await;
+        if let Some(ref mut save) = *current_save {
+            let result = save.await;
+            *current_save = None;
+            debug!("save of '{:?}' result: {:?}", self.path(), result);
+            return Some(result);
+        }
+
+        // return early if the receiver is closed
+        self.save_receiver.as_ref()?;
+
+        let save = match self.save_receiver.as_mut().unwrap().recv().await {
+            Some(save) => save,
+            None => {
+                self.save_receiver = None;
+                return None;
+            }
+        };
+
+        // save a handle to the future so that when a poll on this
+        // function gets cancelled, we don't lose it
+        *current_save = Some(save);
+        debug!("awaiting save of '{:?}'", self.path());
+
+        let result = (*current_save).as_mut().unwrap().await;
+        *current_save = None;
+
+        debug!("save of '{:?}' result: {:?}", self.path(), result);
+
+        Some(result)
+    }
+
+    /// Prepares the Document for being closed by stopping any new writes
+    /// and flushing through the queue of pending writes. If any fail,
+    /// it stops early before emptying the rest of the queue. Callers
+    /// should keep calling until it returns None.
+    pub async fn close(&mut self) -> Option<DocumentSaveEventResult> {
+        if self.save_sender.is_some() {
+            self.save_sender = None;
         }
+
+        let mut final_result = None;
+
+        while let Some(save_event) = self.await_save().await {
+            let is_err = save_event.is_err();
+            final_result = Some(save_event);
+
+            if is_err {
+                break;
+            }
+        }
+
+        final_result
     }
 
     /// Detect the programming language based on the file type.
@@ -941,6 +1034,19 @@ impl Document {
         self.last_saved_revision = current_revision;
     }
 
+    /// Set the document's latest saved revision to the given one.
+    pub fn set_last_saved_revision(&mut self, rev: usize) {
+        self.last_saved_revision = rev;
+    }
+
+    /// Get the current revision number
+    pub fn get_current_revision(&mut self) -> usize {
+        let history = self.history.take();
+        let current_revision = history.current_revision();
+        self.history.set(history);
+        current_revision
+    }
+
     /// Corresponding language scope name. Usually `source.<lang>`.
     pub fn language_scope(&self) -> Option<&str> {
         self.language
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index e9a3c639..ec6119a4 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1,6 +1,6 @@
 use crate::{
     clipboard::{get_clipboard_provider, ClipboardProvider},
-    document::Mode,
+    document::{DocumentSaveEventResult, Mode},
     graphics::{CursorKind, Rect},
     info::Info,
     input::KeyEvent,
@@ -9,8 +9,9 @@ use crate::{
     Document, DocumentId, View, ViewId,
 };
 
-use futures_util::future;
-use futures_util::stream::select_all::SelectAll;
+use futures_util::stream::{select_all::SelectAll, FuturesUnordered};
+use futures_util::{future, StreamExt};
+use helix_lsp::Call;
 use tokio_stream::wrappers::UnboundedReceiverStream;
 
 use std::{
@@ -65,7 +66,7 @@ where
     )
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case", default, deny_unknown_fields)]
 pub struct FilePickerConfig {
     /// IgnoreOptions
@@ -172,7 +173,7 @@ pub struct Config {
     pub color_modes: bool,
 }
 
-#[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(default, rename_all = "kebab-case", deny_unknown_fields)]
 pub struct TerminalConfig {
     pub command: String,
@@ -225,7 +226,7 @@ pub fn get_terminal_provider() -> Option<TerminalConfig> {
     None
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(default, rename_all = "kebab-case", deny_unknown_fields)]
 pub struct LspConfig {
     /// Display LSP progress messages below statusline
@@ -246,7 +247,7 @@ impl Default for LspConfig {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case", default, deny_unknown_fields)]
 pub struct SearchConfig {
     /// Smart case: Case insensitive searching unless pattern contains upper case characters. Defaults to true.
@@ -255,7 +256,7 @@ pub struct SearchConfig {
     pub wrap_around: bool,
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case", default, deny_unknown_fields)]
 pub struct StatusLineConfig {
     pub left: Vec<StatusLineElement>,
@@ -279,7 +280,7 @@ impl Default for StatusLineConfig {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case", default, deny_unknown_fields)]
 pub struct ModeConfig {
     pub normal: String,
@@ -458,7 +459,7 @@ impl std::str::FromStr for GutterType {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(default)]
 pub struct WhitespaceConfig {
     pub render: WhitespaceRender,
@@ -688,6 +689,15 @@ pub struct Editor {
     pub config_events: (UnboundedSender<ConfigEvent>, UnboundedReceiver<ConfigEvent>),
 }
 
+#[derive(Debug)]
+pub enum EditorEvent {
+    DocumentSave(DocumentSaveEventResult),
+    ConfigEvent(ConfigEvent),
+    LanguageServerMessage((usize, Call)),
+    DebuggerEvent(dap::Payload),
+    IdleTimer,
+}
+
 #[derive(Debug, Clone)]
 pub enum ConfigEvent {
     Refresh,
@@ -719,6 +729,8 @@ pub enum CloseError {
     DoesNotExist,
     /// Buffer is modified
     BufferModified(String),
+    /// Document failed to save
+    SaveError(anyhow::Error),
 }
 
 impl Editor {
@@ -1079,8 +1091,12 @@ impl Editor {
         self._refresh();
     }
 
-    pub fn close_document(&mut self, doc_id: DocumentId, force: bool) -> Result<(), CloseError> {
-        let doc = match self.documents.get(&doc_id) {
+    pub async fn close_document(
+        &mut self,
+        doc_id: DocumentId,
+        force: bool,
+    ) -> Result<(), CloseError> {
+        let doc = match self.documents.get_mut(&doc_id) {
             Some(doc) => doc,
             None => return Err(CloseError::DoesNotExist),
         };
@@ -1089,8 +1105,19 @@ impl Editor {
             return Err(CloseError::BufferModified(doc.display_name().into_owned()));
         }
 
+        if let Some(Err(err)) = doc.close().await {
+            return Err(CloseError::SaveError(err));
+        }
+
+        // Don't fail the whole write because the language server could not
+        // acknowledge the close
         if let Some(language_server) = doc.language_server() {
-            tokio::spawn(language_server.text_document_did_close(doc.identifier()));
+            if let Err(err) = language_server
+                .text_document_did_close(doc.identifier())
+                .await
+            {
+                log::error!("Error closing doc in language server: {}", err);
+            }
         }
 
         enum Action {
@@ -1269,4 +1296,32 @@ impl Editor {
         .await
         .map(|_| ())
     }
+
+    pub async fn wait_event(&mut self) -> EditorEvent {
+        let mut saves: FuturesUnordered<_> = self
+            .documents
+            .values_mut()
+            .map(Document::await_save)
+            .collect();
+
+        tokio::select! {
+            biased;
+
+            Some(Some(event)) = saves.next() => {
+                EditorEvent::DocumentSave(event)
+            }
+            Some(config_event) = self.config_events.1.recv() => {
+                EditorEvent::ConfigEvent(config_event)
+            }
+            Some(message) = self.language_servers.incoming.next() => {
+                EditorEvent::LanguageServerMessage(message)
+            }
+            Some(event) = self.debugger_events.next() => {
+                EditorEvent::DebuggerEvent(event)
+            }
+            _ = &mut self.idle_timer => {
+                EditorEvent::IdleTimer
+            }
+        }
+    }
 }

From a5a93182cd5ccf88bc95b68044aa05d746ded35e Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Sat, 23 Apr 2022 18:38:55 -0400
Subject: [PATCH 311/884] fix: buffer-close ensuring writes

Make sure buffer-close waits for the document to finish its writes.
---
 helix-term/src/application.rs     |  2 +
 helix-term/src/commands/typed.rs  |  1 +
 helix-term/tests/test/commands.rs |  1 -
 helix-view/src/document.rs        | 66 +++++++++++++++++++++++++------
 helix-view/src/editor.rs          |  5 +++
 5 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index a9e25d08..2c1047da 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -310,6 +310,8 @@ impl Application {
                     self.render();
                 }
                 event = self.editor.wait_event() => {
+                    log::debug!("received editor event: {:?}", event);
+
                     match event {
                         EditorEvent::DocumentSave(event) => {
                             self.handle_document_write(event);
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index d82dd7fe..375e7b4f 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -151,6 +151,7 @@ fn buffer_close(
     }
 
     let document_ids = buffer_gather_paths_impl(cx.editor, args);
+    log::debug!("closing buffers: {:?}", document_ids);
     buffer_close_by_ids_impl(cx.editor, &document_ids, false)
 }
 
diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index f7ce9af0..8aea144b 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -26,7 +26,6 @@ async fn test_write_quit_fail() -> anyhow::Result<()> {
 }
 
 #[tokio::test]
-#[ignore]
 async fn test_buffer_close_concurrent() -> anyhow::Result<()> {
     test_key_sequences(
         &mut Application::new(Args::default(), Config::default())?,
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index d6480b32..3045e3b7 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -616,6 +616,10 @@ impl Document {
     }
 
     pub async fn await_save(&mut self) -> Option<DocumentSaveEventResult> {
+        self.await_save_impl(true).await
+    }
+
+    async fn await_save_impl(&mut self, block: bool) -> Option<DocumentSaveEventResult> {
         let mut current_save = self.current_save.lock().await;
         if let Some(ref mut save) = *current_save {
             let result = save.await;
@@ -627,7 +631,15 @@ impl Document {
         // return early if the receiver is closed
         self.save_receiver.as_ref()?;
 
-        let save = match self.save_receiver.as_mut().unwrap().recv().await {
+        let rx = self.save_receiver.as_mut().unwrap();
+
+        let save_req = if block {
+            rx.recv().await
+        } else {
+            rx.try_recv().ok()
+        };
+
+        let save = match save_req {
             Some(save) => save,
             None => {
                 self.save_receiver = None;
@@ -648,19 +660,24 @@ impl Document {
         Some(result)
     }
 
-    /// Prepares the Document for being closed by stopping any new writes
-    /// and flushing through the queue of pending writes. If any fail,
-    /// it stops early before emptying the rest of the queue. Callers
-    /// should keep calling until it returns None.
-    pub async fn close(&mut self) -> Option<DocumentSaveEventResult> {
-        if self.save_sender.is_some() {
-            self.save_sender = None;
-        }
+    /// Flushes the queue of pending writes. If any fail,
+    /// it stops early before emptying the rest of the queue.
+    pub async fn try_flush_saves(&mut self) -> Option<DocumentSaveEventResult> {
+        self.flush_saves_impl(false).await
+    }
 
+    async fn flush_saves_impl(&mut self, block: bool) -> Option<DocumentSaveEventResult> {
         let mut final_result = None;
 
-        while let Some(save_event) = self.await_save().await {
-            let is_err = save_event.is_err();
+        while let Some(save_event) = self.await_save_impl(block).await {
+            let is_err = match &save_event {
+                Ok(event) => {
+                    self.set_last_saved_revision(event.revision);
+                    false
+                }
+                Err(_) => true,
+            };
+
             final_result = Some(save_event);
 
             if is_err {
@@ -671,6 +688,17 @@ impl Document {
         final_result
     }
 
+    /// Prepares the Document for being closed by stopping any new writes
+    /// and flushing through the queue of pending writes. If any fail,
+    /// it stops early before emptying the rest of the queue.
+    pub async fn close(&mut self) -> Option<DocumentSaveEventResult> {
+        if self.save_sender.is_some() {
+            self.save_sender = None;
+        }
+
+        self.flush_saves_impl(true).await
+    }
+
     /// Detect the programming language based on the file type.
     pub fn detect_language(&mut self, config_loader: Arc<syntax::Loader>) {
         if let Some(path) = &self.path {
@@ -1023,6 +1051,11 @@ impl Document {
         let history = self.history.take();
         let current_revision = history.current_revision();
         self.history.set(history);
+        log::debug!(
+            "modified - last saved: {}, current: {}",
+            self.last_saved_revision,
+            current_revision
+        );
         current_revision != self.last_saved_revision || !self.changes.is_empty()
     }
 
@@ -1036,9 +1069,20 @@ impl Document {
 
     /// Set the document's latest saved revision to the given one.
     pub fn set_last_saved_revision(&mut self, rev: usize) {
+        log::debug!(
+            "doc {} revision updated {} -> {}",
+            self.id,
+            self.last_saved_revision,
+            rev
+        );
         self.last_saved_revision = rev;
     }
 
+    /// Get the document's latest saved revision.
+    pub fn get_last_saved_revision(&mut self) -> usize {
+        self.last_saved_revision
+    }
+
     /// Get the current revision number
     pub fn get_current_revision(&mut self) -> usize {
         let history = self.history.take();
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index ec6119a4..e038a82d 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1101,6 +1101,11 @@ impl Editor {
             None => return Err(CloseError::DoesNotExist),
         };
 
+        // flush out any pending writes first to clear the modified status
+        if let Some(save_result) = doc.try_flush_saves().await {
+            save_result?;
+        }
+
         if !force && doc.is_modified() {
             return Err(CloseError::BufferModified(doc.display_name().into_owned()));
         }

From 83b6042b97d13fca751e3d5d0c32f04e3ad04c9a Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Sun, 24 Apr 2022 15:33:43 -0400
Subject: [PATCH 312/884] fix(write): do not set new path on document until
 write succeeds

If a document is written with a new path, currently, in the event that
the write fails, the document still gets its path changed. This fixes
it so that the path is not updated unless the write succeeds.
---
 helix-term/src/application.rs    | 26 +++++++++-----
 helix-term/src/commands/typed.rs |  9 ++---
 helix-term/tests/test/write.rs   | 61 ++++++++++++++++++++++++++++++--
 helix-view/src/document.rs       | 52 +++++++++++++++++++--------
 4 files changed, 116 insertions(+), 32 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 2c1047da..0640de3c 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -3,6 +3,7 @@ use futures_util::Stream;
 use helix_core::{
     config::{default_syntax_loader, user_syntax_loader},
     diagnostic::{DiagnosticTag, NumberOrString},
+    path::get_relative_path,
     pos_at_coords, syntax, Selection,
 };
 use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap};
@@ -489,17 +490,26 @@ impl Application {
         );
 
         doc.set_last_saved_revision(doc_save_event.revision);
+
         let lines = doc.text().len_lines();
         let bytes = doc.text().len_bytes();
 
-        let path_str = doc
-            .path()
-            .expect("document written without path")
-            .to_string_lossy()
-            .into_owned();
-
-        self.editor
-            .set_status(format!("'{}' written, {}L {}B", path_str, lines, bytes));
+        if let Err(err) = doc.set_path(Some(&doc_save_event.path)) {
+            log::error!(
+                "error setting path for doc '{:?}': {}",
+                doc.path(),
+                err.to_string(),
+            );
+            self.editor.set_error(err.to_string());
+        } else {
+            // TODO: fix being overwritten by lsp
+            self.editor.set_status(format!(
+                "'{}' written, {}L {}B",
+                get_relative_path(&doc_save_event.path).to_string_lossy(),
+                lines,
+                bytes
+            ));
+        }
     }
 
     pub fn handle_terminal_events(&mut self, event: Result<CrosstermEvent, crossterm::ErrorKind>) {
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 375e7b4f..35c84601 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -268,11 +268,6 @@ fn write_impl(
     let jobs = &mut cx.jobs;
     let doc = doc_mut!(cx.editor);
 
-    if let Some(ref path) = path {
-        doc.set_path(Some(path.as_ref().as_ref()))
-            .context("invalid filepath")?;
-    }
-
     if doc.path().is_none() {
         bail!("cannot write a buffer without a filename");
     }
@@ -292,7 +287,7 @@ fn write_impl(
         None
     };
 
-    doc.format_and_save(fmt, force)?;
+    doc.format_and_save(fmt, path.map(AsRef::as_ref), force)?;
 
     if path.is_some() {
         let id = doc.id();
@@ -607,7 +602,7 @@ fn write_all_impl(
             None
         };
 
-        doc.format_and_save(fmt, force)?;
+        doc.format_and_save::<_, PathBuf>(fmt, None, force)?;
     }
 
     if quit {
diff --git a/helix-term/tests/test/write.rs b/helix-term/tests/test/write.rs
index 4ac850c1..d2e6922f 100644
--- a/helix-term/tests/test/write.rs
+++ b/helix-term/tests/test/write.rs
@@ -35,7 +35,7 @@ async fn test_write() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn test_write_quit() -> anyhow::Result<()> {
     let mut file = tempfile::NamedTempFile::new()?;
 
@@ -129,7 +129,64 @@ async fn test_write_fail_mod_flag() -> anyhow::Result<()> {
 }
 
 #[tokio::test]
-#[ignore]
+async fn test_write_new_path() -> anyhow::Result<()> {
+    let mut file1 = tempfile::NamedTempFile::new().unwrap();
+    let mut file2 = tempfile::NamedTempFile::new().unwrap();
+
+    test_key_sequences(
+        &mut Application::new(
+            Args {
+                files: vec![(file1.path().to_path_buf(), Position::default())],
+                ..Default::default()
+            },
+            Config::default(),
+        )?,
+        vec![
+            (
+                Some("ii can eat glass, it will not hurt me<ret><esc>:w<ret>"),
+                Some(&|app| {
+                    let doc = doc!(app.editor);
+                    assert!(!app.editor.is_err());
+                    assert_eq!(file1.path(), doc.path().unwrap());
+                }),
+            ),
+            (
+                Some(&format!(":w {}<ret>", file2.path().to_string_lossy())),
+                Some(&|app| {
+                    let doc = doc!(app.editor);
+                    assert!(!app.editor.is_err());
+                    assert_eq!(file2.path(), doc.path().unwrap());
+                    assert!(app.editor.document_by_path(file1.path()).is_none());
+                }),
+            ),
+        ],
+        false,
+    )
+    .await?;
+
+    file1.as_file_mut().flush()?;
+    file1.as_file_mut().sync_all()?;
+    file2.as_file_mut().flush()?;
+    file2.as_file_mut().sync_all()?;
+
+    let mut file1_content = String::new();
+    file1.as_file_mut().read_to_string(&mut file1_content)?;
+    assert_eq!(
+        helpers::platform_line("i can eat glass, it will not hurt me\n"),
+        file1_content
+    );
+
+    let mut file2_content = String::new();
+    file2.as_file_mut().read_to_string(&mut file2_content)?;
+    assert_eq!(
+        helpers::platform_line("i can eat glass, it will not hurt me\n"),
+        file2_content
+    );
+
+    Ok(())
+}
+
+#[tokio::test]
 async fn test_write_fail_new_path() -> anyhow::Result<()> {
     let file = helpers::new_readonly_tempfile()?;
 
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 3045e3b7..82d526a9 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -91,6 +91,7 @@ impl Serialize for Mode {
 pub struct DocumentSaveEvent {
     pub revision: usize,
     pub doc_id: DocumentId,
+    pub path: PathBuf,
 }
 
 pub type DocumentSaveEventResult = Result<DocumentSaveEvent, anyhow::Error>;
@@ -512,41 +513,61 @@ impl Document {
         Some(fut.boxed())
     }
 
-    pub fn save(&mut self, force: bool) -> Result<(), anyhow::Error> {
-        self.save_impl::<futures_util::future::Ready<_>>(None, force)
+    pub fn save<P: Into<PathBuf>>(
+        &mut self,
+        path: Option<P>,
+        force: bool,
+    ) -> Result<(), anyhow::Error> {
+        self.save_impl::<futures_util::future::Ready<_>, _>(None, path, force)
     }
 
-    pub fn format_and_save(
+    pub fn format_and_save<F, P>(
         &mut self,
-        formatting: Option<
-            impl Future<Output = Result<Transaction, FormatterError>> + 'static + Send,
-        >,
+        formatting: Option<F>,
+        path: Option<P>,
         force: bool,
-    ) -> anyhow::Result<()> {
-        self.save_impl(formatting, force)
+    ) -> anyhow::Result<()>
+    where
+        F: Future<Output = Result<Transaction, FormatterError>> + 'static + Send,
+        P: Into<PathBuf>,
+    {
+        self.save_impl(formatting, path, force)
     }
 
-    // TODO: impl Drop to handle ensuring writes when closed
     /// The `Document`'s text is encoded according to its encoding and written to the file located
     /// at its `path()`.
     ///
     /// If `formatting` is present, it supplies some changes that we apply to the text before saving.
-    fn save_impl<F: Future<Output = Result<Transaction, FormatterError>> + 'static + Send>(
+    fn save_impl<F, P>(
         &mut self,
         formatting: Option<F>,
+        path: Option<P>,
         force: bool,
-    ) -> Result<(), anyhow::Error> {
+    ) -> Result<(), anyhow::Error>
+    where
+        F: Future<Output = Result<Transaction, FormatterError>> + 'static + Send,
+        P: Into<PathBuf>,
+    {
         if self.save_sender.is_none() {
             bail!("saves are closed for this document!");
         }
 
         // we clone and move text + path into the future so that we asynchronously save the current
         // state without blocking any further edits.
-
         let mut text = self.text().clone();
-        let path = self.path.clone().expect("Can't save with no path set!");
-        let identifier = self.identifier();
 
+        let path = match path {
+            Some(path) => helix_core::path::get_canonicalized_path(&path.into())?,
+            None => {
+                if self.path.is_none() {
+                    bail!("Can't save with no path set!");
+                }
+
+                self.path.as_ref().unwrap().clone()
+            }
+        };
+
+        let identifier = self.identifier();
         let language_server = self.language_server.clone();
 
         // mark changes up to now as saved
@@ -586,12 +607,13 @@ impl Document {
                 }
             }
 
-            let mut file = File::create(path).await?;
+            let mut file = File::create(&path).await?;
             to_writer(&mut file, encoding, &text).await?;
 
             let event = DocumentSaveEvent {
                 revision: current_rev,
                 doc_id,
+                path,
             };
 
             if let Some(language_server) = language_server {

From e1f7bdb1d2ef68c0de38e768080291901ff4662e Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Mon, 9 May 2022 23:08:12 -0400
Subject: [PATCH 313/884] fix buffer-close

---
 helix-term/src/application.rs     |  1 +
 helix-term/src/commands/typed.rs  |  6 +++---
 helix-term/tests/test/commands.rs |  2 +-
 helix-term/tests/test/helpers.rs  |  6 ++++--
 helix-term/tests/test/write.rs    |  2 +-
 helix-view/src/document.rs        | 14 ++++++--------
 helix-view/src/editor.rs          |  4 ++--
 7 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 0640de3c..5c25e8aa 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -344,6 +344,7 @@ impl Application {
 
                             #[cfg(feature = "integration")]
                             {
+                                log::debug!("idle handled");
                                 idle_handled = true;
                             }
                         }
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 35c84601..efe693b9 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -77,9 +77,9 @@ fn buffer_close_by_ids_impl(
     let (modified_ids, modified_names): (Vec<_>, Vec<_>) = doc_ids
         .iter()
         .filter_map(|&doc_id| {
-            if let Err(CloseError::BufferModified(name)) =
+            if let Err(CloseError::BufferModified(name)) = tokio::task::block_in_place(|| {
                 helix_lsp::block_on(editor.close_document(doc_id, force))
-            {
+            }) {
                 Some((doc_id, name))
             } else {
                 None
@@ -151,7 +151,6 @@ fn buffer_close(
     }
 
     let document_ids = buffer_gather_paths_impl(cx.editor, args);
-    log::debug!("closing buffers: {:?}", document_ids);
     buffer_close_by_ids_impl(cx.editor, &document_ids, false)
 }
 
@@ -519,6 +518,7 @@ fn write_quit(
     }
 
     write_impl(cx, args.first(), false)?;
+    // TODO: change to use document close
     helix_lsp::block_on(cx.jobs.finish())?;
     quit(cx, &[], event)
 }
diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index 8aea144b..1f1bd6a9 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -25,7 +25,7 @@ async fn test_write_quit_fail() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn test_buffer_close_concurrent() -> anyhow::Result<()> {
     test_key_sequences(
         &mut Application::new(Args::default(), Config::default())?,
diff --git a/helix-term/tests/test/helpers.rs b/helix-term/tests/test/helpers.rs
index 8f2501e6..bbcc6632 100644
--- a/helix-term/tests/test/helpers.rs
+++ b/helix-term/tests/test/helpers.rs
@@ -56,7 +56,9 @@ pub async fn test_key_sequences(
     for (i, (in_keys, test_fn)) in inputs.into_iter().enumerate() {
         if let Some(in_keys) = in_keys {
             for key_event in parse_macro(in_keys)?.into_iter() {
-                tx.send(Ok(Event::Key(KeyEvent::from(key_event))))?;
+                let key = Event::Key(KeyEvent::from(key_event));
+                log::trace!("sending key: {:?}", key);
+                tx.send(Ok(key))?;
             }
         }
 
@@ -70,7 +72,7 @@ pub async fn test_key_sequences(
         // verify if it exited on the last iteration if it should have and
         // the inverse
         if i == num_inputs - 1 && app_exited != should_exit {
-            bail!("expected app to exit: {} != {}", app_exited, should_exit);
+            bail!("expected app to exit: {} != {}", should_exit, app_exited);
         }
 
         if let Some(test) = test_fn {
diff --git a/helix-term/tests/test/write.rs b/helix-term/tests/test/write.rs
index d2e6922f..544f1ba1 100644
--- a/helix-term/tests/test/write.rs
+++ b/helix-term/tests/test/write.rs
@@ -61,7 +61,7 @@ async fn test_write_quit() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn test_write_concurrent() -> anyhow::Result<()> {
     let mut file = tempfile::NamedTempFile::new()?;
     let mut command = String::new();
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 82d526a9..b6e42065 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -3,7 +3,6 @@ use futures_util::future::BoxFuture;
 use futures_util::FutureExt;
 use helix_core::auto_pairs::AutoPairs;
 use helix_core::Range;
-use log::debug;
 use serde::de::{self, Deserialize, Deserializer};
 use serde::Serialize;
 use std::borrow::Cow;
@@ -644,16 +643,15 @@ impl Document {
     async fn await_save_impl(&mut self, block: bool) -> Option<DocumentSaveEventResult> {
         let mut current_save = self.current_save.lock().await;
         if let Some(ref mut save) = *current_save {
+            log::trace!("reawaiting save of '{:?}'", self.path());
             let result = save.await;
             *current_save = None;
-            debug!("save of '{:?}' result: {:?}", self.path(), result);
+            log::trace!("reawait save of '{:?}' result: {:?}", self.path(), result);
             return Some(result);
         }
 
         // return early if the receiver is closed
-        self.save_receiver.as_ref()?;
-
-        let rx = self.save_receiver.as_mut().unwrap();
+        let rx = self.save_receiver.as_mut()?;
 
         let save_req = if block {
             rx.recv().await
@@ -672,12 +670,12 @@ impl Document {
         // save a handle to the future so that when a poll on this
         // function gets cancelled, we don't lose it
         *current_save = Some(save);
-        debug!("awaiting save of '{:?}'", self.path());
+        log::trace!("awaiting save of '{:?}'", self.path());
 
         let result = (*current_save).as_mut().unwrap().await;
         *current_save = None;
 
-        debug!("save of '{:?}' result: {:?}", self.path(), result);
+        log::trace!("save of '{:?}' result: {:?}", self.path(), result);
 
         Some(result)
     }
@@ -715,7 +713,7 @@ impl Document {
     /// it stops early before emptying the rest of the queue.
     pub async fn close(&mut self) -> Option<DocumentSaveEventResult> {
         if self.save_sender.is_some() {
-            self.save_sender = None;
+            self.save_sender.take();
         }
 
         self.flush_saves_impl(true).await
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index e038a82d..e54aa7fa 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1102,8 +1102,8 @@ impl Editor {
         };
 
         // flush out any pending writes first to clear the modified status
-        if let Some(save_result) = doc.try_flush_saves().await {
-            save_result?;
+        if let Some(Err(err)) = doc.try_flush_saves().await {
+            return Err(CloseError::SaveError(err));
         }
 
         if !force && doc.is_modified() {

From 69c9e44ef205a81c112dfb14d5f2e67e5ce9c300 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Tue, 10 May 2022 23:41:44 -0400
Subject: [PATCH 314/884] update write-quit to wait for saves

---
 helix-term/src/commands/typed.rs  | 8 ++++++--
 helix-term/tests/test/commands.rs | 7 ++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index efe693b9..bc254146 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -518,8 +518,12 @@ fn write_quit(
     }
 
     write_impl(cx, args.first(), false)?;
-    // TODO: change to use document close
-    helix_lsp::block_on(cx.jobs.finish())?;
+    let doc = doc_mut!(cx.editor);
+
+    tokio::task::block_in_place(|| helix_lsp::block_on(doc.try_flush_saves()))
+        .map(|result| result.map(|_| ()))
+        .unwrap_or(Ok(()))?;
+
     quit(cx, &[], event)
 }
 
diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index 1f1bd6a9..b7c0f7cc 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -8,7 +8,7 @@ use helix_term::application::Application;
 
 use super::*;
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn test_write_quit_fail() -> anyhow::Result<()> {
     let file = helpers::new_readonly_tempfile()?;
 
@@ -16,6 +16,11 @@ async fn test_write_quit_fail() -> anyhow::Result<()> {
         &mut helpers::app_with_file(file.path())?,
         Some("ihello<esc>:wq<ret>"),
         Some(&|app| {
+            let mut docs: Vec<_> = app.editor.documents().collect();
+            assert_eq!(1, docs.len());
+
+            let doc = docs.pop().unwrap();
+            assert_eq!(Some(file.path()), doc.path().map(PathBuf::as_path));
             assert_eq!(&Severity::Error, app.editor.get_status().unwrap().1);
         }),
         false,

From b8a07f7d15a10186fa2b481a3423c23f32d7d561 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Fri, 24 Jun 2022 08:39:07 -0400
Subject: [PATCH 315/884] add conditional noop render back

It makes it much slower without stubbing this out
---
 helix-core/src/auto_pairs.rs     |  1 -
 helix-term/src/application.rs    |  4 ++++
 helix-term/src/commands.rs       | 14 ++------------
 helix-term/src/commands/typed.rs | 17 +++--------------
 4 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/helix-core/src/auto_pairs.rs b/helix-core/src/auto_pairs.rs
index ff680a77..edc404ac 100644
--- a/helix-core/src/auto_pairs.rs
+++ b/helix-core/src/auto_pairs.rs
@@ -7,7 +7,6 @@ use std::collections::HashMap;
 use smallvec::SmallVec;
 
 // Heavily based on https://github.com/codemirror/closebrackets/
-
 pub const DEFAULT_PAIRS: &[(char, char)] = &[
     ('(', ')'),
     ('{', '}'),
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 5c25e8aa..fd9b7c3e 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -253,6 +253,10 @@ impl Application {
         Ok(app)
     }
 
+    #[cfg(feature = "integration")]
+    fn render(&mut self) {}
+
+    #[cfg(not(feature = "integration"))]
     fn render(&mut self) {
         let compositor = &mut self.compositor;
 
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index f38434e2..a4421f03 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2504,13 +2504,6 @@ fn insert_at_line_end(cx: &mut Context) {
     doc.set_selection(view.id, selection);
 }
 
-/// Sometimes when applying formatting changes we want to mark the buffer as unmodified, for
-/// example because we just applied the same changes while saving.
-enum Modified {
-    SetUnmodified,
-    LeaveModified,
-}
-
 // Creates an LspCallback that waits for formatting changes to be computed. When they're done,
 // it applies them, but only if the doc hasn't changed.
 //
@@ -2519,7 +2512,6 @@ enum Modified {
 async fn make_format_callback(
     doc_id: DocumentId,
     doc_version: i32,
-    modified: Modified,
     format: impl Future<Output = Result<Transaction, FormatterError>> + Send + 'static,
 ) -> anyhow::Result<job::Callback> {
     let format = format.await?;
@@ -2536,17 +2528,15 @@ async fn make_format_callback(
             doc.append_changes_to_history(view.id);
             doc.detect_indent_and_line_ending();
             view.ensure_cursor_in_view(doc, scrolloff);
-            if let Modified::SetUnmodified = modified {
-                doc.reset_modified();
-            }
         } else {
             log::info!("discarded formatting changes because the document changed");
         }
     });
+
     Ok(call)
 }
 
-#[derive(PartialEq)]
+#[derive(PartialEq, Eq)]
 pub enum Open {
     Below,
     Above,
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index bc254146..14b23f2a 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -273,12 +273,7 @@ fn write_impl(
     let fmt = if auto_format {
         doc.auto_format().map(|fmt| {
             let shared = fmt.shared();
-            let callback = make_format_callback(
-                doc.id(),
-                doc.version(),
-                Modified::SetUnmodified,
-                shared.clone(),
-            );
+            let callback = make_format_callback(doc.id(), doc.version(), shared.clone());
             jobs.callback(callback);
             shared
         })
@@ -346,8 +341,7 @@ fn format(
 
     let doc = doc!(cx.editor);
     if let Some(format) = doc.format() {
-        let callback =
-            make_format_callback(doc.id(), doc.version(), Modified::LeaveModified, format);
+        let callback = make_format_callback(doc.id(), doc.version(), format);
         cx.jobs.callback(callback);
     }
 
@@ -593,12 +587,7 @@ fn write_all_impl(
         let fmt = if auto_format {
             doc.auto_format().map(|fmt| {
                 let shared = fmt.shared();
-                let callback = make_format_callback(
-                    doc.id(),
-                    doc.version(),
-                    Modified::SetUnmodified,
-                    shared.clone(),
-                );
+                let callback = make_format_callback(doc.id(), doc.version(), shared.clone());
                 jobs.callback(callback);
                 shared
             })

From cb23399dee723cec67f1a04dbe6514dfddfd7f5f Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Sat, 9 Jul 2022 22:39:40 -0400
Subject: [PATCH 316/884] improve reliability of shutdown

---
 helix-term/src/application.rs    | 72 +++++++++++++++++++++++---------
 helix-term/src/commands/typed.rs |  8 +++-
 helix-view/src/document.rs       | 17 +++++++-
 helix-view/src/editor.rs         |  8 +++-
 4 files changed, 80 insertions(+), 25 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index fd9b7c3e..e84739cd 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -937,26 +937,26 @@ impl Application {
 
         self.event_loop(input_stream).await;
 
-        let mut save_errs = Vec::new();
-
-        for doc in self.editor.documents_mut() {
-            if let Some(Err(err)) = doc.close().await {
-                save_errs.push((
-                    doc.path()
-                        .map(|path| path.to_string_lossy().into_owned())
-                        .unwrap_or_else(|| "".into()),
-                    err,
-                ));
-            }
-        }
+        // let mut save_errs = Vec::new();
+
+        // for doc in self.editor.documents_mut() {
+        //     if let Some(Err(err)) = doc.close().await {
+        //         save_errs.push((
+        //             doc.path()
+        //                 .map(|path| path.to_string_lossy().into_owned())
+        //                 .unwrap_or_else(|| "".into()),
+        //             err,
+        //         ));
+        //     }
+        // }
 
         let close_err = self.close().await.err();
         restore_term()?;
 
-        for (path, err) in save_errs {
-            self.editor.exit_code = 1;
-            eprintln!("Error closing '{}': {}", path, err);
-        }
+        // for (path, err) in save_errs {
+        //     self.editor.exit_code = 1;
+        //     eprintln!("Error closing '{}': {}", path, err);
+        // }
 
         if let Some(err) = close_err {
             self.editor.exit_code = 1;
@@ -967,12 +967,44 @@ impl Application {
     }
 
     pub async fn close(&mut self) -> anyhow::Result<()> {
-        self.jobs.finish().await?;
+        // [NOTE] we intentionally do not return early for errors because we
+        //        want to try to run as much cleanup as we can, regardless of
+        //        errors along the way
 
-        if self.editor.close_language_servers(None).await.is_err() {
-            log::error!("Timed out waiting for language servers to shutdown");
+        let mut result = match self.jobs.finish().await {
+            Ok(_) => Ok(()),
+            Err(err) => {
+                log::error!("Error executing job: {}", err);
+                Err(err)
+            }
         };
 
-        Ok(())
+        for doc in self.editor.documents_mut() {
+            if let Some(save_result) = doc.close().await {
+                result = match save_result {
+                    Ok(_) => result,
+                    Err(err) => {
+                        if let Some(path) = doc.path() {
+                            log::error!(
+                                "Error saving document '{}': {}",
+                                path.to_string_lossy(),
+                                err
+                            );
+                        }
+                        Err(err)
+                    }
+                };
+            }
+        }
+
+        match self.editor.close_language_servers(None).await {
+            Ok(_) => result,
+            Err(_) => {
+                log::error!("Timed out waiting for language servers to shutdown");
+                Err(anyhow::format_err!(
+                    "Timed out waiting for language servers to shutdown"
+                ))
+            }
+        }
     }
 }
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 14b23f2a..650ff75d 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1,5 +1,7 @@
 use std::ops::Deref;
 
+use crate::job::Job;
+
 use super::*;
 
 use helix_view::{
@@ -19,6 +21,8 @@ pub struct TypableCommand {
 }
 
 fn quit(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) -> anyhow::Result<()> {
+    log::info!("quitting...");
+
     if event != PromptEvent::Validate {
         return Ok(());
     }
@@ -274,7 +278,7 @@ fn write_impl(
         doc.auto_format().map(|fmt| {
             let shared = fmt.shared();
             let callback = make_format_callback(doc.id(), doc.version(), shared.clone());
-            jobs.callback(callback);
+            jobs.add(Job::with_callback(callback).wait_before_exiting());
             shared
         })
     } else {
@@ -512,8 +516,10 @@ fn write_quit(
     }
 
     write_impl(cx, args.first(), false)?;
+
     let doc = doc_mut!(cx.editor);
 
+    tokio::task::block_in_place(|| helix_lsp::block_on(cx.jobs.finish()))?;
     tokio::task::block_in_place(|| helix_lsp::block_on(doc.try_flush_saves()))
         .map(|result| result.map(|_| ()))
         .unwrap_or(Ok(()))?;
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index b6e42065..1743fac2 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -551,6 +551,11 @@ impl Document {
             bail!("saves are closed for this document!");
         }
 
+        log::debug!(
+            "submitting save of doc '{:?}'",
+            self.path().map(|path| path.to_string_lossy())
+        );
+
         // we clone and move text + path into the future so that we asynchronously save the current
         // state without blocking any further edits.
         let mut text = self.text().clone();
@@ -695,7 +700,14 @@ impl Document {
                     self.set_last_saved_revision(event.revision);
                     false
                 }
-                Err(_) => true,
+                Err(err) => {
+                    log::error!(
+                        "error saving document {:?}: {}",
+                        self.path().map(|path| path.to_string_lossy()),
+                        err
+                    );
+                    true
+                }
             };
 
             final_result = Some(save_event);
@@ -1072,7 +1084,8 @@ impl Document {
         let current_revision = history.current_revision();
         self.history.set(history);
         log::debug!(
-            "modified - last saved: {}, current: {}",
+            "id {} modified - last saved: {}, current: {}",
+            self.id,
             self.last_saved_revision,
             current_revision
         );
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index e54aa7fa..58fcf238 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -816,12 +816,16 @@ impl Editor {
 
     #[inline]
     pub fn set_status<T: Into<Cow<'static, str>>>(&mut self, status: T) {
-        self.status_msg = Some((status.into(), Severity::Info));
+        let status = status.into();
+        log::debug!("editor status: {}", status);
+        self.status_msg = Some((status, Severity::Info));
     }
 
     #[inline]
     pub fn set_error<T: Into<Cow<'static, str>>>(&mut self, error: T) {
-        self.status_msg = Some((error.into(), Severity::Error));
+        let error = error.into();
+        log::error!("editor error: {}", error);
+        self.status_msg = Some((error, Severity::Error));
     }
 
     #[inline]

From c9418582d2a6d8dbb8b5bb1d3432a9087438e61d Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Tue, 5 Jul 2022 00:15:15 -0400
Subject: [PATCH 317/884] fix modified status with auto format

---
 helix-term/src/commands.rs       | 17 +++++++++++++++-
 helix-term/src/commands/typed.rs | 35 +++++++++++++++++---------------
 helix-view/src/document.rs       |  1 +
 3 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index a4421f03..e76e0280 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -52,7 +52,7 @@ use crate::{
 };
 
 use crate::job::{self, Jobs};
-use futures_util::{FutureExt, StreamExt};
+use futures_util::StreamExt;
 use std::{collections::HashMap, fmt, future::Future};
 use std::{collections::HashSet, num::NonZeroUsize};
 
@@ -2513,6 +2513,7 @@ async fn make_format_callback(
     doc_id: DocumentId,
     doc_version: i32,
     format: impl Future<Output = Result<Transaction, FormatterError>> + Send + 'static,
+    write: Option<(Option<PathBuf>, bool)>,
 ) -> anyhow::Result<job::Callback> {
     let format = format.await?;
     let call: job::Callback = Box::new(move |editor, _compositor| {
@@ -2523,11 +2524,25 @@ async fn make_format_callback(
         let scrolloff = editor.config().scrolloff;
         let doc = doc_mut!(editor, &doc_id);
         let view = view_mut!(editor);
+        let loader = editor.syn_loader.clone();
+
         if doc.version() == doc_version {
             apply_transaction(&format, doc, view);
             doc.append_changes_to_history(view.id);
             doc.detect_indent_and_line_ending();
             view.ensure_cursor_in_view(doc, scrolloff);
+
+            if let Some((path, force)) = write {
+                let refresh_lang = path.is_some();
+
+                if let Err(err) = doc.save(path, force) {
+                    editor.set_error(format!("Error saving: {}", err));
+                } else if refresh_lang {
+                    let id = doc.id();
+                    doc.detect_language(loader);
+                    let _ = editor.refresh_language_server(id);
+                }
+            }
         } else {
             log::info!("discarded formatting changes because the document changed");
         }
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 650ff75d..955b3b58 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -267,30 +267,32 @@ fn write_impl(
     path: Option<&Cow<str>>,
     force: bool,
 ) -> anyhow::Result<()> {
-    let auto_format = cx.editor.config().auto_format;
+    let editor_auto_fmt = cx.editor.config().auto_format;
     let jobs = &mut cx.jobs;
     let doc = doc_mut!(cx.editor);
+    let path = path.map(AsRef::as_ref);
 
     if doc.path().is_none() {
         bail!("cannot write a buffer without a filename");
     }
-    let fmt = if auto_format {
+
+    let fmt = if editor_auto_fmt {
         doc.auto_format().map(|fmt| {
-            let shared = fmt.shared();
-            let callback = make_format_callback(doc.id(), doc.version(), shared.clone());
+            let callback = make_format_callback(
+                doc.id(),
+                doc.version(),
+                fmt,
+                Some((path.map(Into::into), force)),
+            );
+
             jobs.add(Job::with_callback(callback).wait_before_exiting());
-            shared
         })
     } else {
         None
     };
 
-    doc.format_and_save(fmt, path.map(AsRef::as_ref), force)?;
-
-    if path.is_some() {
-        let id = doc.id();
-        doc.detect_language(cx.editor.syn_loader.clone());
-        let _ = cx.editor.refresh_language_server(id);
+    if fmt.is_none() {
+        doc.save(path, force)?;
     }
 
     Ok(())
@@ -345,7 +347,7 @@ fn format(
 
     let doc = doc!(cx.editor);
     if let Some(format) = doc.format() {
-        let callback = make_format_callback(doc.id(), doc.version(), format);
+        let callback = make_format_callback(doc.id(), doc.version(), format, None);
         cx.jobs.callback(callback);
     }
 
@@ -592,16 +594,17 @@ fn write_all_impl(
 
         let fmt = if auto_format {
             doc.auto_format().map(|fmt| {
-                let shared = fmt.shared();
-                let callback = make_format_callback(doc.id(), doc.version(), shared.clone());
+                let callback =
+                    make_format_callback(doc.id(), doc.version(), fmt, Some((None, force)));
                 jobs.callback(callback);
-                shared
             })
         } else {
             None
         };
 
-        doc.format_and_save::<_, PathBuf>(fmt, None, force)?;
+        if fmt.is_none() {
+            doc.save::<PathBuf>(None, force)?;
+        }
     }
 
     if quit {
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 1743fac2..fe081442 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -14,6 +14,7 @@ use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::sync::Arc;
 use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};
+
 use tokio::sync::Mutex;
 
 use helix_core::{

From aaa145067833c41686b7cdde9fb999018735bc04 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Mon, 11 Jul 2022 23:38:26 -0400
Subject: [PATCH 318/884] fix write-quit with auto format

write-quit will now save all files successfully even when there is auto
formatting
---
 helix-term/src/application.rs    |  6 +++-
 helix-term/src/commands.rs       | 19 +++++++------
 helix-term/src/commands/dap.rs   | 25 +++++++++--------
 helix-term/src/commands/typed.rs | 17 +++++++-----
 helix-term/src/job.rs            | 47 ++++++++++++++++++++++++++++----
 helix-term/src/ui/editor.rs      |  7 +++--
 6 files changed, 85 insertions(+), 36 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index e84739cd..84eba22a 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -971,7 +971,11 @@ impl Application {
         //        want to try to run as much cleanup as we can, regardless of
         //        errors along the way
 
-        let mut result = match self.jobs.finish().await {
+        let mut result = match self
+            .jobs
+            .finish(Some(&mut self.editor), Some(&mut self.compositor))
+            .await
+        {
             Ok(_) => Ok(()),
             Err(err) => {
                 log::error!("Error executing job: {}", err);
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index e76e0280..afd94564 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -47,6 +47,7 @@ use movement::Movement;
 use crate::{
     args,
     compositor::{self, Component, Compositor},
+    job::Callback,
     keymap::ReverseKeymap,
     ui::{self, overlay::overlayed, FilePicker, Picker, Popup, Prompt, PromptEvent},
 };
@@ -107,10 +108,11 @@ impl<'a> Context<'a> {
         let callback = Box::pin(async move {
             let json = call.await?;
             let response = serde_json::from_value(json)?;
-            let call: job::Callback =
-                Box::new(move |editor: &mut Editor, compositor: &mut Compositor| {
+            let call: job::Callback = Callback::EditorCompositor(Box::new(
+                move |editor: &mut Editor, compositor: &mut Compositor| {
                     callback(editor, compositor, response)
-                });
+                },
+            ));
             Ok(call)
         });
         self.jobs.callback(callback);
@@ -1925,8 +1927,8 @@ fn global_search(cx: &mut Context) {
     let show_picker = async move {
         let all_matches: Vec<FileResult> =
             UnboundedReceiverStream::new(all_matches_rx).collect().await;
-        let call: job::Callback =
-            Box::new(move |editor: &mut Editor, compositor: &mut Compositor| {
+        let call: job::Callback = Callback::EditorCompositor(Box::new(
+            move |editor: &mut Editor, compositor: &mut Compositor| {
                 if all_matches.is_empty() {
                     editor.set_status("No matches found");
                     return;
@@ -1962,7 +1964,8 @@ fn global_search(cx: &mut Context) {
                     },
                 );
                 compositor.push(Box::new(overlayed(picker)));
-            });
+            },
+        ));
         Ok(call)
     };
     cx.jobs.callback(show_picker);
@@ -2516,7 +2519,7 @@ async fn make_format_callback(
     write: Option<(Option<PathBuf>, bool)>,
 ) -> anyhow::Result<job::Callback> {
     let format = format.await?;
-    let call: job::Callback = Box::new(move |editor, _compositor| {
+    let call: job::Callback = Callback::EditorCompositor(Box::new(move |editor, _compositor| {
         if !editor.documents.contains_key(&doc_id) {
             return;
         }
@@ -2546,7 +2549,7 @@ async fn make_format_callback(
         } else {
             log::info!("discarded formatting changes because the document changed");
         }
-    });
+    }));
 
     Ok(call)
 }
diff --git a/helix-term/src/commands/dap.rs b/helix-term/src/commands/dap.rs
index 12a3fbc7..9c067eba 100644
--- a/helix-term/src/commands/dap.rs
+++ b/helix-term/src/commands/dap.rs
@@ -118,11 +118,14 @@ fn dap_callback<T, F>(
     let callback = Box::pin(async move {
         let json = call.await?;
         let response = serde_json::from_value(json)?;
-        let call: Callback = Box::new(move |editor: &mut Editor, compositor: &mut Compositor| {
-            callback(editor, compositor, response)
-        });
+        let call: Callback = Callback::EditorCompositor(Box::new(
+            move |editor: &mut Editor, compositor: &mut Compositor| {
+                callback(editor, compositor, response)
+            },
+        ));
         Ok(call)
     });
+
     jobs.callback(callback);
 }
 
@@ -274,10 +277,10 @@ pub fn dap_launch(cx: &mut Context) {
             let completions = template.completion.clone();
             let name = template.name.clone();
             let callback = Box::pin(async move {
-                let call: Callback = Box::new(move |_editor, compositor| {
+                let call: Callback = Callback::Compositor(Box::new(move |compositor| {
                     let prompt = debug_parameter_prompt(completions, name, Vec::new());
                     compositor.push(Box::new(prompt));
-                });
+                }));
                 Ok(call)
             });
             cx.jobs.callback(callback);
@@ -332,10 +335,10 @@ fn debug_parameter_prompt(
                 let config_name = config_name.clone();
                 let params = params.clone();
                 let callback = Box::pin(async move {
-                    let call: Callback = Box::new(move |_editor, compositor| {
+                    let call: Callback = Callback::Compositor(Box::new(move |compositor| {
                         let prompt = debug_parameter_prompt(completions, config_name, params);
                         compositor.push(Box::new(prompt));
-                    });
+                    }));
                     Ok(call)
                 });
                 cx.jobs.callback(callback);
@@ -582,7 +585,7 @@ pub fn dap_edit_condition(cx: &mut Context) {
             None => return,
         };
         let callback = Box::pin(async move {
-            let call: Callback = Box::new(move |editor, compositor| {
+            let call: Callback = Callback::EditorCompositor(Box::new(move |editor, compositor| {
                 let mut prompt = Prompt::new(
                     "condition:".into(),
                     None,
@@ -610,7 +613,7 @@ pub fn dap_edit_condition(cx: &mut Context) {
                     prompt.insert_str(&condition, editor)
                 }
                 compositor.push(Box::new(prompt));
-            });
+            }));
             Ok(call)
         });
         cx.jobs.callback(callback);
@@ -624,7 +627,7 @@ pub fn dap_edit_log(cx: &mut Context) {
             None => return,
         };
         let callback = Box::pin(async move {
-            let call: Callback = Box::new(move |editor, compositor| {
+            let call: Callback = Callback::EditorCompositor(Box::new(move |editor, compositor| {
                 let mut prompt = Prompt::new(
                     "log-message:".into(),
                     None,
@@ -651,7 +654,7 @@ pub fn dap_edit_log(cx: &mut Context) {
                     prompt.insert_str(&log_message, editor);
                 }
                 compositor.push(Box::new(prompt));
-            });
+            }));
             Ok(call)
         });
         cx.jobs.callback(callback);
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 955b3b58..a687b854 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -519,9 +519,10 @@ fn write_quit(
 
     write_impl(cx, args.first(), false)?;
 
+    tokio::task::block_in_place(|| helix_lsp::block_on(cx.jobs.finish(Some(cx.editor), None)))?;
+
     let doc = doc_mut!(cx.editor);
 
-    tokio::task::block_in_place(|| helix_lsp::block_on(cx.jobs.finish()))?;
     tokio::task::block_in_place(|| helix_lsp::block_on(doc.try_flush_saves()))
         .map(|result| result.map(|_| ()))
         .unwrap_or(Ok(()))?;
@@ -1491,12 +1492,13 @@ fn tree_sitter_subtree(
             let contents = format!("```tsq\n{}\n```", selected_node.to_sexp());
 
             let callback = async move {
-                let call: job::Callback =
-                    Box::new(move |editor: &mut Editor, compositor: &mut Compositor| {
+                let call: job::Callback = Callback::EditorCompositor(Box::new(
+                    move |editor: &mut Editor, compositor: &mut Compositor| {
                         let contents = ui::Markdown::new(contents, editor.syn_loader.clone());
                         let popup = Popup::new("hover", contents).auto_close(true);
                         compositor.replace_or_push("hover", popup);
-                    });
+                    },
+                ));
                 Ok(call)
             };
 
@@ -1604,8 +1606,8 @@ fn run_shell_command(
 
     if !output.is_empty() {
         let callback = async move {
-            let call: job::Callback =
-                Box::new(move |editor: &mut Editor, compositor: &mut Compositor| {
+            let call: job::Callback = Callback::EditorCompositor(Box::new(
+                move |editor: &mut Editor, compositor: &mut Compositor| {
                     let contents = ui::Markdown::new(
                         format!("```sh\n{}\n```", output),
                         editor.syn_loader.clone(),
@@ -1614,7 +1616,8 @@ fn run_shell_command(
                         helix_core::Position::new(editor.cursor().0.unwrap_or_default().row, 2),
                     ));
                     compositor.replace_or_push("shell", popup);
-                });
+                },
+            ));
             Ok(call)
         };
 
diff --git a/helix-term/src/job.rs b/helix-term/src/job.rs
index e5147992..a997653d 100644
--- a/helix-term/src/job.rs
+++ b/helix-term/src/job.rs
@@ -5,7 +5,12 @@ use crate::compositor::Compositor;
 use futures_util::future::{BoxFuture, Future, FutureExt};
 use futures_util::stream::{FuturesUnordered, StreamExt};
 
-pub type Callback = Box<dyn FnOnce(&mut Editor, &mut Compositor) + Send>;
+pub enum Callback {
+    EditorCompositor(Box<dyn FnOnce(&mut Editor, &mut Compositor) + Send>),
+    Editor(Box<dyn FnOnce(&mut Editor) + Send>),
+    Compositor(Box<dyn FnOnce(&mut Compositor) + Send>),
+}
+
 pub type JobFuture = BoxFuture<'static, anyhow::Result<Option<Callback>>>;
 
 pub struct Job {
@@ -68,9 +73,11 @@ impl Jobs {
     ) {
         match call {
             Ok(None) => {}
-            Ok(Some(call)) => {
-                call(editor, compositor);
-            }
+            Ok(Some(call)) => match call {
+                Callback::EditorCompositor(call) => call(editor, compositor),
+                Callback::Editor(call) => call(editor),
+                Callback::Compositor(call) => call(compositor),
+            },
             Err(e) => {
                 editor.set_error(format!("Async job failed: {}", e));
             }
@@ -93,13 +100,41 @@ impl Jobs {
     }
 
     /// Blocks until all the jobs that need to be waited on are done.
-    pub async fn finish(&mut self) -> anyhow::Result<()> {
+    pub async fn finish(
+        &mut self,
+        mut editor: Option<&mut Editor>,
+        mut compositor: Option<&mut Compositor>,
+    ) -> anyhow::Result<()> {
         log::debug!("waiting on jobs...");
         let mut wait_futures = std::mem::take(&mut self.wait_futures);
         while let (Some(job), tail) = wait_futures.into_future().await {
             match job {
-                Ok(_) => {
+                Ok(callback) => {
                     wait_futures = tail;
+
+                    if let Some(callback) = callback {
+                        // clippy doesn't realize this is an error without the derefs
+                        #[allow(clippy::needless_option_as_deref)]
+                        match callback {
+                            Callback::EditorCompositor(call)
+                                if editor.is_some() && compositor.is_some() =>
+                            {
+                                call(
+                                    editor.as_deref_mut().unwrap(),
+                                    compositor.as_deref_mut().unwrap(),
+                                )
+                            }
+                            Callback::Editor(call) if editor.is_some() => {
+                                call(editor.as_deref_mut().unwrap())
+                            }
+                            Callback::Compositor(call) if compositor.is_some() => {
+                                call(compositor.as_deref_mut().unwrap())
+                            }
+
+                            // skip callbacks for which we don't have the necessary references
+                            _ => (),
+                        }
+                    }
                 }
                 Err(e) => {
                     self.wait_futures = tail;
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 3cd2130a..abed7f9b 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1,7 +1,8 @@
 use crate::{
     commands,
     compositor::{Component, Context, Event, EventResult},
-    job, key,
+    job::{self, Callback},
+    key,
     keymap::{KeymapResult, Keymaps},
     ui::{Completion, ProgressSpinners},
 };
@@ -944,9 +945,9 @@ impl EditorView {
 
                     // TODO: Use an on_mode_change hook to remove signature help
                     cxt.jobs.callback(async {
-                        let call: job::Callback = Box::new(|_editor, compositor| {
+                        let call: job::Callback = Callback::Compositor(Box::new(|compositor| {
                             compositor.remove(SignatureHelp::ID);
-                        });
+                        }));
                         Ok(call)
                     });
                 }

From 8c667ef8deea1311a8e9569909ac11d79cc993ed Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Fri, 22 Jul 2022 01:07:31 -0400
Subject: [PATCH 319/884] factor editor event handling into function

---
 helix-term/src/application.rs | 101 +++++++++++++++++-----------------
 helix-term/src/ui/mod.rs      |   6 +-
 2 files changed, 55 insertions(+), 52 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 84eba22a..bae3f192 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -287,9 +287,6 @@ impl Application {
     where
         S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
     {
-        #[cfg(feature = "integration")]
-        let mut idle_handled = false;
-
         loop {
             if self.editor.should_close() {
                 return false;
@@ -315,56 +312,19 @@ impl Application {
                     self.render();
                 }
                 event = self.editor.wait_event() => {
-                    log::debug!("received editor event: {:?}", event);
+                    let _idle_handled = self.handle_editor_event(event).await;
 
-                    match event {
-                        EditorEvent::DocumentSave(event) => {
-                            self.handle_document_write(event);
-                            self.render();
-                        }
-                        EditorEvent::ConfigEvent(event) => {
-                            self.handle_config_events(event);
-                            self.render();
-                        }
-                        EditorEvent::LanguageServerMessage((id, call)) => {
-                            self.handle_language_server_message(call, id).await;
-                            // limit render calls for fast language server messages
-                            let last = self.editor.language_servers.incoming.is_empty();
-
-                            if last || self.last_render.elapsed() > LSP_DEADLINE {
-                                self.render();
-                                self.last_render = Instant::now();
-                            }
-                        }
-                        EditorEvent::DebuggerEvent(payload) => {
-                            let needs_render = self.editor.handle_debugger_message(payload).await;
-                            if needs_render {
-                                self.render();
-                            }
-                        }
-                        EditorEvent::IdleTimer => {
-                            self.editor.clear_idle_timer();
-                            self.handle_idle_timeout();
-
-                            #[cfg(feature = "integration")]
-                            {
-                                log::debug!("idle handled");
-                                idle_handled = true;
-                            }
+                    // for integration tests only, reset the idle timer after every
+                    // event to signal when test events are done processing
+                    #[cfg(feature = "integration")]
+                    {
+                        if _idle_handled {
+                            return true;
                         }
-                    }
-                }
-            }
 
-            // for integration tests only, reset the idle timer after every
-            // event to signal when test events are done processing
-            #[cfg(feature = "integration")]
-            {
-                if idle_handled {
-                    return true;
+                        self.editor.reset_idle_timer();
+                    }
                 }
-
-                self.editor.reset_idle_timer();
             }
         }
     }
@@ -517,6 +477,49 @@ impl Application {
         }
     }
 
+    #[inline(always)]
+    pub async fn handle_editor_event(&mut self, event: EditorEvent) -> bool {
+        log::debug!("received editor event: {:?}", event);
+
+        match event {
+            EditorEvent::DocumentSave(event) => {
+                self.handle_document_write(event);
+                self.render();
+            }
+            EditorEvent::ConfigEvent(event) => {
+                self.handle_config_events(event);
+                self.render();
+            }
+            EditorEvent::LanguageServerMessage((id, call)) => {
+                self.handle_language_server_message(call, id).await;
+                // limit render calls for fast language server messages
+                let last = self.editor.language_servers.incoming.is_empty();
+
+                if last || self.last_render.elapsed() > LSP_DEADLINE {
+                    self.render();
+                    self.last_render = Instant::now();
+                }
+            }
+            EditorEvent::DebuggerEvent(payload) => {
+                let needs_render = self.editor.handle_debugger_message(payload).await;
+                if needs_render {
+                    self.render();
+                }
+            }
+            EditorEvent::IdleTimer => {
+                self.editor.clear_idle_timer();
+                self.handle_idle_timeout();
+
+                #[cfg(feature = "integration")]
+                {
+                    return true;
+                }
+            }
+        }
+
+        false
+    }
+
     pub fn handle_terminal_events(&mut self, event: Result<CrosstermEvent, crossterm::ErrorKind>) {
         let mut cx = crate::compositor::Context {
             editor: &mut self.editor,
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 6ac4dbb7..f99dea0b 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -14,7 +14,7 @@ mod statusline;
 mod text;
 
 use crate::compositor::{Component, Compositor};
-use crate::job;
+use crate::job::{self, Callback};
 pub use completion::Completion;
 pub use editor::EditorView;
 pub use markdown::Markdown;
@@ -121,7 +121,7 @@ pub fn regex_prompt(
 
                             if event == PromptEvent::Validate {
                                 let callback = async move {
-                                    let call: job::Callback = Box::new(
+                                    let call: job::Callback = Callback::EditorCompositor(Box::new(
                                         move |_editor: &mut Editor, compositor: &mut Compositor| {
                                             let contents = Text::new(format!("{}", err));
                                             let size = compositor.size();
@@ -135,7 +135,7 @@ pub fn regex_prompt(
 
                                             compositor.replace_or_push("invalid-regex", popup);
                                         },
-                                    );
+                                    ));
                                     Ok(call)
                                 };
 

From faa00d4cc3de89a89679f6315c0345182929beb2 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Sun, 7 Aug 2022 00:00:15 -0400
Subject: [PATCH 320/884] increase LSP shutdown timeout

The Clang LAP takes a long time to shut down on Windows
---
 helix-view/src/editor.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 58fcf238..27b4458f 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1288,14 +1288,14 @@ impl Editor {
         }
     }
 
-    /// Closes language servers with timeout. The default timeout is 500 ms, use
+    /// Closes language servers with timeout. The default timeout is 10000 ms, use
     /// `timeout` parameter to override this.
     pub async fn close_language_servers(
         &self,
         timeout: Option<u64>,
     ) -> Result<(), tokio::time::error::Elapsed> {
         tokio::time::timeout(
-            Duration::from_millis(timeout.unwrap_or(500)),
+            Duration::from_millis(timeout.unwrap_or(10000)),
             future::join_all(
                 self.language_servers
                     .iter_clients()

From e5fd5e2a9c78a3f391cda24cb57d187e248f06d1 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Tue, 9 Aug 2022 00:32:04 -0400
Subject: [PATCH 321/884] fix panic when view of pending write is closed

---
 helix-term/src/commands/typed.rs | 18 ++++++++----------
 helix-term/src/compositor.rs     | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index a687b854..fa2ba5e6 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -34,6 +34,7 @@ fn quit(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) ->
         buffers_remaining_impl(cx.editor)?
     }
 
+    cx.block_try_flush_writes()?;
     cx.editor.close(view!(cx.editor).id);
 
     Ok(())
@@ -518,15 +519,7 @@ fn write_quit(
     }
 
     write_impl(cx, args.first(), false)?;
-
-    tokio::task::block_in_place(|| helix_lsp::block_on(cx.jobs.finish(Some(cx.editor), None)))?;
-
-    let doc = doc_mut!(cx.editor);
-
-    tokio::task::block_in_place(|| helix_lsp::block_on(doc.try_flush_saves()))
-        .map(|result| result.map(|_| ()))
-        .unwrap_or(Ok(()))?;
-
+    cx.block_try_flush_writes()?;
     quit(cx, &[], event)
 }
 
@@ -540,6 +533,7 @@ fn force_write_quit(
     }
 
     write_impl(cx, args.first(), true)?;
+    cx.block_try_flush_writes()?;
     force_quit(cx, &[], event)
 }
 
@@ -613,6 +607,8 @@ fn write_all_impl(
             buffers_remaining_impl(cx.editor)?;
         }
 
+        cx.block_try_flush_writes()?;
+
         // close all views
         let views: Vec<_> = cx.editor.tree.views().map(|(view, _)| view.id).collect();
         for view_id in views {
@@ -682,6 +678,7 @@ fn quit_all(
         return Ok(());
     }
 
+    cx.block_try_flush_writes()?;
     quit_all_impl(cx.editor, false)
 }
 
@@ -710,8 +707,9 @@ fn cquit(
         .first()
         .and_then(|code| code.parse::<i32>().ok())
         .unwrap_or(1);
-    cx.editor.exit_code = exit_code;
 
+    cx.editor.exit_code = exit_code;
+    cx.block_try_flush_writes()?;
     quit_all_impl(cx.editor, false)
 }
 
diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs
index c0898dae..6ef77341 100644
--- a/helix-term/src/compositor.rs
+++ b/helix-term/src/compositor.rs
@@ -27,6 +27,24 @@ pub struct Context<'a> {
     pub jobs: &'a mut Jobs,
 }
 
+impl<'a> Context<'a> {
+    /// Waits on all pending jobs, and then tries to flush all pending write
+    /// operations for the current document.
+    pub fn block_try_flush_writes(&mut self) -> anyhow::Result<()> {
+        tokio::task::block_in_place(|| {
+            helix_lsp::block_on(self.jobs.finish(Some(self.editor), None))
+        })?;
+
+        let doc = doc_mut!(self.editor);
+
+        tokio::task::block_in_place(|| helix_lsp::block_on(doc.try_flush_saves()))
+            .map(|result| result.map(|_| ()))
+            .unwrap_or(Ok(()))?;
+
+        Ok(())
+    }
+}
+
 pub trait Component: Any + AnyComponent {
     /// Process input events, return true if handled.
     fn handle_event(&mut self, _event: &Event, _ctx: &mut Context) -> EventResult {

From d544376590e9e9d649cc7406282b5ebd54dc6f0a Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Tue, 9 Aug 2022 23:32:01 -0400
Subject: [PATCH 322/884] reset idle timer for all events

---
 helix-term/src/application.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index bae3f192..70eae18a 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -314,18 +314,21 @@ impl Application {
                 event = self.editor.wait_event() => {
                     let _idle_handled = self.handle_editor_event(event).await;
 
-                    // for integration tests only, reset the idle timer after every
-                    // event to signal when test events are done processing
                     #[cfg(feature = "integration")]
                     {
                         if _idle_handled {
                             return true;
                         }
-
-                        self.editor.reset_idle_timer();
                     }
                 }
             }
+
+            // for integration tests only, reset the idle timer after every
+            // event to signal when test events are done processing
+            #[cfg(feature = "integration")]
+            {
+                self.editor.reset_idle_timer();
+            }
         }
     }
 

From 7b11e9ac6941188c6f6148961fdd97e34988490e Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Tue, 23 Aug 2022 17:21:26 -0400
Subject: [PATCH 323/884] fix erroneous write sender close

This was not distinguishing the error types when trying a receive on an empty
receiver, which was erroneously causing the sender to be closed when trying to
flush the writes when there were none
---
 helix-view/src/document.rs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index fe081442..86a1d6d2 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -13,6 +13,7 @@ use std::future::Future;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::sync::Arc;
+use tokio::sync::mpsc::error::TryRecvError;
 use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};
 
 use tokio::sync::Mutex;
@@ -662,7 +663,16 @@ impl Document {
         let save_req = if block {
             rx.recv().await
         } else {
-            rx.try_recv().ok()
+            let msg = rx.try_recv();
+
+            if let Err(err) = msg {
+                match err {
+                    TryRecvError::Empty => return None,
+                    TryRecvError::Disconnected => None,
+                }
+            } else {
+                msg.ok()
+            }
         };
 
         let save = match save_req {

From 57de4e62519a59aece104867569c2b9ad044af54 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Wed, 24 Aug 2022 01:13:41 -0400
Subject: [PATCH 324/884] various fixes in write-all path

---
 helix-term/src/commands/typed.rs  |  25 ++++--
 helix-term/src/compositor.rs      |  12 +--
 helix-term/tests/integration.rs   |   1 +
 helix-term/tests/test/commands.rs |  12 +--
 helix-term/tests/test/helpers.rs  |  28 ++++++-
 helix-term/tests/test/splits.rs   | 122 ++++++++++++++++++++++++++++++
 6 files changed, 175 insertions(+), 25 deletions(-)
 create mode 100644 helix-term/tests/test/splits.rs

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index fa2ba5e6..7fd619d9 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -573,13 +573,20 @@ fn write_all_impl(
         return Ok(());
     }
 
-    let mut errors = String::new();
+    let mut errors: Option<String> = None;
     let auto_format = cx.editor.config().auto_format;
     let jobs = &mut cx.jobs;
+
     // save all documents
     for doc in &mut cx.editor.documents.values_mut() {
         if doc.path().is_none() {
-            errors.push_str("cannot write a buffer without a filename\n");
+            errors = errors
+                .or_else(|| Some(String::new()))
+                .map(|mut errs: String| {
+                    errs.push_str("cannot write a buffer without a filename\n");
+                    errs
+                });
+
             continue;
         }
 
@@ -591,7 +598,7 @@ fn write_all_impl(
             doc.auto_format().map(|fmt| {
                 let callback =
                     make_format_callback(doc.id(), doc.version(), fmt, Some((None, force)));
-                jobs.callback(callback);
+                jobs.add(Job::with_callback(callback).wait_before_exiting());
             })
         } else {
             None
@@ -603,12 +610,12 @@ fn write_all_impl(
     }
 
     if quit {
+        cx.block_try_flush_writes()?;
+
         if !force {
             buffers_remaining_impl(cx.editor)?;
         }
 
-        cx.block_try_flush_writes()?;
-
         // close all views
         let views: Vec<_> = cx.editor.tree.views().map(|(view, _)| view.id).collect();
         for view_id in views {
@@ -616,7 +623,13 @@ fn write_all_impl(
         }
     }
 
-    bail!(errors)
+    if let Some(errs) = errors {
+        if !force {
+            bail!(errs);
+        }
+    }
+
+    Ok(())
 }
 
 fn write_all(
diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs
index 6ef77341..5077807d 100644
--- a/helix-term/src/compositor.rs
+++ b/helix-term/src/compositor.rs
@@ -29,17 +29,17 @@ pub struct Context<'a> {
 
 impl<'a> Context<'a> {
     /// Waits on all pending jobs, and then tries to flush all pending write
-    /// operations for the current document.
+    /// operations for all documents.
     pub fn block_try_flush_writes(&mut self) -> anyhow::Result<()> {
         tokio::task::block_in_place(|| {
             helix_lsp::block_on(self.jobs.finish(Some(self.editor), None))
         })?;
 
-        let doc = doc_mut!(self.editor);
-
-        tokio::task::block_in_place(|| helix_lsp::block_on(doc.try_flush_saves()))
-            .map(|result| result.map(|_| ()))
-            .unwrap_or(Ok(()))?;
+        for doc in &mut self.editor.documents.values_mut() {
+            tokio::task::block_in_place(|| helix_lsp::block_on(doc.try_flush_saves()))
+                .map(|result| result.map(|_| ()))
+                .unwrap_or(Ok(()))?;
+        }
 
         Ok(())
     }
diff --git a/helix-term/tests/integration.rs b/helix-term/tests/integration.rs
index 8969e976..e3754c43 100644
--- a/helix-term/tests/integration.rs
+++ b/helix-term/tests/integration.rs
@@ -22,5 +22,6 @@ mod test {
     mod commands;
     mod movement;
     mod prompt;
+    mod splits;
     mod write;
 }
diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index b7c0f7cc..0279e348 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -1,7 +1,4 @@
-use std::{
-    io::{Read, Write},
-    ops::RangeInclusive,
-};
+use std::ops::RangeInclusive;
 
 use helix_core::diagnostic::Severity;
 use helix_term::application::Application;
@@ -86,12 +83,7 @@ async fn test_buffer_close_concurrent() -> anyhow::Result<()> {
     )
     .await?;
 
-    file.as_file_mut().flush()?;
-    file.as_file_mut().sync_all()?;
-
-    let mut file_content = String::new();
-    file.as_file_mut().read_to_string(&mut file_content)?;
-    assert_eq!(RANGE.end().to_string(), file_content);
+    helpers::assert_file_has_content(file.as_file_mut(), &RANGE.end().to_string())?;
 
     Ok(())
 }
diff --git a/helix-term/tests/test/helpers.rs b/helix-term/tests/test/helpers.rs
index bbcc6632..ed1a0331 100644
--- a/helix-term/tests/test/helpers.rs
+++ b/helix-term/tests/test/helpers.rs
@@ -1,10 +1,15 @@
-use std::{io::Write, path::PathBuf, time::Duration};
+use std::{
+    fs::File,
+    io::{Read, Write},
+    path::PathBuf,
+    time::Duration,
+};
 
 use anyhow::bail;
 use crossterm::event::{Event, KeyEvent};
-use helix_core::{test, Selection, Transaction};
+use helix_core::{diagnostic::Severity, test, Selection, Transaction};
 use helix_term::{application::Application, args::Args, config::Config};
-use helix_view::{doc, input::parse_macro};
+use helix_view::{doc, input::parse_macro, Editor};
 use tempfile::NamedTempFile;
 use tokio_stream::wrappers::UnboundedReceiverStream;
 
@@ -213,3 +218,20 @@ pub fn app_with_file<P: Into<PathBuf>>(path: P) -> anyhow::Result<Application> {
         Config::default(),
     )
 }
+
+pub fn assert_file_has_content(file: &mut File, content: &str) -> anyhow::Result<()> {
+    file.flush()?;
+    file.sync_all()?;
+
+    let mut file_content = String::new();
+    file.read_to_string(&mut file_content)?;
+    assert_eq!(content, file_content);
+
+    Ok(())
+}
+
+pub fn assert_status_not_error(editor: &Editor) {
+    if let Some((_, sev)) = editor.get_status() {
+        assert_ne!(&Severity::Error, sev);
+    }
+}
diff --git a/helix-term/tests/test/splits.rs b/helix-term/tests/test/splits.rs
new file mode 100644
index 00000000..70a517be
--- /dev/null
+++ b/helix-term/tests/test/splits.rs
@@ -0,0 +1,122 @@
+use super::*;
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_split_write_quit_all() -> anyhow::Result<()> {
+    let mut file1 = tempfile::NamedTempFile::new()?;
+    let mut file2 = tempfile::NamedTempFile::new()?;
+    let mut file3 = tempfile::NamedTempFile::new()?;
+
+    test_key_sequences(
+        &mut helpers::app_with_file(file1.path())?,
+        vec![
+            (
+                Some(&format!(
+                    "ihello1<esc>:sp<ret>:o {}<ret>ihello2<esc>:sp<ret>:o {}<ret>ihello3<esc>",
+                    file2.path().to_string_lossy(),
+                    file3.path().to_string_lossy()
+                )),
+                Some(&|app| {
+                    let docs: Vec<_> = app.editor.documents().collect();
+                    assert_eq!(3, docs.len());
+
+                    let doc1 = docs
+                        .iter()
+                        .find(|doc| doc.path().unwrap() == file1.path())
+                        .unwrap();
+
+                    assert_eq!("hello1", doc1.text().to_string());
+
+                    let doc2 = docs
+                        .iter()
+                        .find(|doc| doc.path().unwrap() == file2.path())
+                        .unwrap();
+
+                    assert_eq!("hello2", doc2.text().to_string());
+
+                    let doc3 = docs
+                        .iter()
+                        .find(|doc| doc.path().unwrap() == file3.path())
+                        .unwrap();
+
+                    assert_eq!("hello3", doc3.text().to_string());
+
+                    helpers::assert_status_not_error(&app.editor);
+                    assert_eq!(3, app.editor.tree.views().count());
+                }),
+            ),
+            (
+                Some(":wqa<ret>"),
+                Some(&|app| {
+                    helpers::assert_status_not_error(&app.editor);
+                    assert_eq!(0, app.editor.tree.views().count());
+                }),
+            ),
+        ],
+        true,
+    )
+    .await?;
+
+    helpers::assert_file_has_content(file1.as_file_mut(), "hello1")?;
+    helpers::assert_file_has_content(file2.as_file_mut(), "hello2")?;
+    helpers::assert_file_has_content(file3.as_file_mut(), "hello3")?;
+
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_split_write_quit_same_file() -> anyhow::Result<()> {
+    let mut file = tempfile::NamedTempFile::new()?;
+
+    test_key_sequences(
+        &mut helpers::app_with_file(file.path())?,
+        vec![
+            (
+                Some("O<esc>ihello<esc>:sp<ret>ogoodbye<esc>"),
+                Some(&|app| {
+                    assert_eq!(2, app.editor.tree.views().count());
+                    helpers::assert_status_not_error(&app.editor);
+
+                    let mut docs: Vec<_> = app.editor.documents().collect();
+                    assert_eq!(1, docs.len());
+
+                    let doc = docs.pop().unwrap();
+
+                    assert_eq!(
+                        helpers::platform_line("hello\ngoodbye"),
+                        doc.text().to_string()
+                    );
+
+                    assert!(doc.is_modified());
+                }),
+            ),
+            (
+                Some(":wq<ret>"),
+                Some(&|app| {
+                    helpers::assert_status_not_error(&app.editor);
+                    assert_eq!(1, app.editor.tree.views().count());
+
+                    let mut docs: Vec<_> = app.editor.documents().collect();
+                    assert_eq!(1, docs.len());
+
+                    let doc = docs.pop().unwrap();
+
+                    assert_eq!(
+                        helpers::platform_line("hello\ngoodbye"),
+                        doc.text().to_string()
+                    );
+
+                    assert!(!doc.is_modified());
+                }),
+            ),
+        ],
+        false,
+    )
+    .await?;
+
+    helpers::assert_file_has_content(
+        file.as_file_mut(),
+        &helpers::platform_line("hello\ngoodbye"),
+    )?;
+
+    Ok(())
+}

From 6cffc7f05d0ca983690b46300cc82933389172c8 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Sun, 28 Aug 2022 23:23:00 -0400
Subject: [PATCH 325/884] Add note about log level for integration tests

---
 docs/CONTRIBUTING.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 353cb4fd..491cd424 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -35,7 +35,8 @@ to `cargo install` anything either).
 Integration tests for helix-term can be run with `cargo integration-test`. Code
 contributors are strongly encouraged to write integration tests for their code.
 Existing tests can be used as examples. Helpers can be found in
-[helpers.rs][helpers.rs]
+[helpers.rs][helpers.rs]. The log level can be set with the `HELIX_LOG_LEVEL`
+environment variable, e.g. `HELIX_LOG_LEVEL=debug cargo integration-test`.
 
 ## Minimum Stable Rust Version (MSRV) Policy
 

From f82a551b98cec165ac91aae15ba656a811229fde Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Tue, 30 Aug 2022 23:08:15 -0400
Subject: [PATCH 326/884] Rename doc save event names to past tense

---
 helix-term/src/application.rs |  6 +++---
 helix-term/src/job.rs         |  1 +
 helix-view/src/document.rs    | 24 ++++++++++++------------
 helix-view/src/editor.rs      |  6 +++---
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 70eae18a..a06460de 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -9,7 +9,7 @@ use helix_core::{
 use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap};
 use helix_view::{
     align_view,
-    document::DocumentSaveEventResult,
+    document::DocumentSavedEventResult,
     editor::{ConfigEvent, EditorEvent},
     theme,
     tree::Layout,
@@ -431,7 +431,7 @@ impl Application {
         }
     }
 
-    pub fn handle_document_write(&mut self, doc_save_event: DocumentSaveEventResult) {
+    pub fn handle_document_write(&mut self, doc_save_event: DocumentSavedEventResult) {
         if let Err(err) = doc_save_event {
             self.editor.set_error(err.to_string());
             return;
@@ -485,7 +485,7 @@ impl Application {
         log::debug!("received editor event: {:?}", event);
 
         match event {
-            EditorEvent::DocumentSave(event) => {
+            EditorEvent::DocumentSaved(event) => {
                 self.handle_document_write(event);
                 self.render();
             }
diff --git a/helix-term/src/job.rs b/helix-term/src/job.rs
index a997653d..3c9e4511 100644
--- a/helix-term/src/job.rs
+++ b/helix-term/src/job.rs
@@ -107,6 +107,7 @@ impl Jobs {
     ) -> anyhow::Result<()> {
         log::debug!("waiting on jobs...");
         let mut wait_futures = std::mem::take(&mut self.wait_futures);
+
         while let (Some(job), tail) = wait_futures.into_future().await {
             match job {
                 Ok(callback) => {
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 86a1d6d2..91d5f8aa 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -89,14 +89,14 @@ impl Serialize for Mode {
 
 /// A snapshot of the text of a document that we want to write out to disk
 #[derive(Debug, Clone)]
-pub struct DocumentSaveEvent {
+pub struct DocumentSavedEvent {
     pub revision: usize,
     pub doc_id: DocumentId,
     pub path: PathBuf,
 }
 
-pub type DocumentSaveEventResult = Result<DocumentSaveEvent, anyhow::Error>;
-pub type DocumentSaveEventFuture = BoxFuture<'static, DocumentSaveEventResult>;
+pub type DocumentSavedEventResult = Result<DocumentSavedEvent, anyhow::Error>;
+pub type DocumentSavedEventFuture = BoxFuture<'static, DocumentSavedEventResult>;
 
 pub struct Document {
     pub(crate) id: DocumentId,
@@ -133,9 +133,9 @@ pub struct Document {
     last_saved_revision: usize,
     version: i32, // should be usize?
     pub(crate) modified_since_accessed: bool,
-    save_sender: Option<UnboundedSender<DocumentSaveEventFuture>>,
-    save_receiver: Option<UnboundedReceiver<DocumentSaveEventFuture>>,
-    current_save: Arc<Mutex<Option<DocumentSaveEventFuture>>>,
+    save_sender: Option<UnboundedSender<DocumentSavedEventFuture>>,
+    save_receiver: Option<UnboundedReceiver<DocumentSavedEventFuture>>,
+    current_save: Arc<Mutex<Option<DocumentSavedEventFuture>>>,
 
     diagnostics: Vec<Diagnostic>,
     language_server: Option<Arc<helix_lsp::Client>>,
@@ -616,7 +616,7 @@ impl Document {
             let mut file = File::create(&path).await?;
             to_writer(&mut file, encoding, &text).await?;
 
-            let event = DocumentSaveEvent {
+            let event = DocumentSavedEvent {
                 revision: current_rev,
                 doc_id,
                 path,
@@ -643,11 +643,11 @@ impl Document {
             .map_err(|err| anyhow!("failed to send save event: {}", err))
     }
 
-    pub async fn await_save(&mut self) -> Option<DocumentSaveEventResult> {
+    pub async fn await_save(&mut self) -> Option<DocumentSavedEventResult> {
         self.await_save_impl(true).await
     }
 
-    async fn await_save_impl(&mut self, block: bool) -> Option<DocumentSaveEventResult> {
+    async fn await_save_impl(&mut self, block: bool) -> Option<DocumentSavedEventResult> {
         let mut current_save = self.current_save.lock().await;
         if let Some(ref mut save) = *current_save {
             log::trace!("reawaiting save of '{:?}'", self.path());
@@ -698,11 +698,11 @@ impl Document {
 
     /// Flushes the queue of pending writes. If any fail,
     /// it stops early before emptying the rest of the queue.
-    pub async fn try_flush_saves(&mut self) -> Option<DocumentSaveEventResult> {
+    pub async fn try_flush_saves(&mut self) -> Option<DocumentSavedEventResult> {
         self.flush_saves_impl(false).await
     }
 
-    async fn flush_saves_impl(&mut self, block: bool) -> Option<DocumentSaveEventResult> {
+    async fn flush_saves_impl(&mut self, block: bool) -> Option<DocumentSavedEventResult> {
         let mut final_result = None;
 
         while let Some(save_event) = self.await_save_impl(block).await {
@@ -734,7 +734,7 @@ impl Document {
     /// Prepares the Document for being closed by stopping any new writes
     /// and flushing through the queue of pending writes. If any fail,
     /// it stops early before emptying the rest of the queue.
-    pub async fn close(&mut self) -> Option<DocumentSaveEventResult> {
+    pub async fn close(&mut self) -> Option<DocumentSavedEventResult> {
         if self.save_sender.is_some() {
             self.save_sender.take();
         }
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 27b4458f..fbd0b2b0 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1,6 +1,6 @@
 use crate::{
     clipboard::{get_clipboard_provider, ClipboardProvider},
-    document::{DocumentSaveEventResult, Mode},
+    document::{DocumentSavedEventResult, Mode},
     graphics::{CursorKind, Rect},
     info::Info,
     input::KeyEvent,
@@ -691,7 +691,7 @@ pub struct Editor {
 
 #[derive(Debug)]
 pub enum EditorEvent {
-    DocumentSave(DocumentSaveEventResult),
+    DocumentSaved(DocumentSavedEventResult),
     ConfigEvent(ConfigEvent),
     LanguageServerMessage((usize, Call)),
     DebuggerEvent(dap::Payload),
@@ -1317,7 +1317,7 @@ impl Editor {
             biased;
 
             Some(Some(event)) = saves.next() => {
-                EditorEvent::DocumentSave(event)
+                EditorEvent::DocumentSaved(event)
             }
             Some(config_event) = self.config_events.1.recv() => {
                 EditorEvent::ConfigEvent(config_event)

From 18c32118b1df63895b662c1b37ada28ad0d5c9b5 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Tue, 30 Aug 2022 23:10:33 -0400
Subject: [PATCH 327/884] Save text in document saved events, use in status
 message

---
 helix-term/src/application.rs | 4 ++--
 helix-view/src/document.rs    | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index a06460de..793993ee 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -459,8 +459,8 @@ impl Application {
 
         doc.set_last_saved_revision(doc_save_event.revision);
 
-        let lines = doc.text().len_lines();
-        let bytes = doc.text().len_bytes();
+        let lines = doc_save_event.text.len_lines();
+        let bytes = doc_save_event.text.len_bytes();
 
         if let Err(err) = doc.set_path(Some(&doc_save_event.path)) {
             log::error!(
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 91d5f8aa..61bea527 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -93,6 +93,7 @@ pub struct DocumentSavedEvent {
     pub revision: usize,
     pub doc_id: DocumentId,
     pub path: PathBuf,
+    pub text: Rope,
 }
 
 pub type DocumentSavedEventResult = Result<DocumentSavedEvent, anyhow::Error>;
@@ -620,6 +621,7 @@ impl Document {
                 revision: current_rev,
                 doc_id,
                 path,
+                text: text.clone(),
             };
 
             if let Some(language_server) = language_server {

From af03df3413f04ce7079d14388ce42fe70bd1397e Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Wed, 31 Aug 2022 15:08:00 -0400
Subject: [PATCH 328/884] fix write scratch buffer to file

---
 helix-term/src/commands/typed.rs |  4 --
 helix-term/tests/test/write.rs   | 71 ++++++++++++++++++++++++--------
 helix-view/src/document.rs       | 18 +++++---
 3 files changed, 67 insertions(+), 26 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 7fd619d9..d312c45f 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -273,10 +273,6 @@ fn write_impl(
     let doc = doc_mut!(cx.editor);
     let path = path.map(AsRef::as_ref);
 
-    if doc.path().is_none() {
-        bail!("cannot write a buffer without a filename");
-    }
-
     let fmt = if editor_auto_fmt {
         doc.auto_format().map(|fmt| {
             let callback = make_format_callback(
diff --git a/helix-term/tests/test/write.rs b/helix-term/tests/test/write.rs
index 544f1ba1..7d105431 100644
--- a/helix-term/tests/test/write.rs
+++ b/helix-term/tests/test/write.rs
@@ -128,6 +128,52 @@ async fn test_write_fail_mod_flag() -> anyhow::Result<()> {
     Ok(())
 }
 
+#[tokio::test]
+async fn test_write_scratch_to_new_path() -> anyhow::Result<()> {
+    let mut file = tempfile::NamedTempFile::new()?;
+
+    test_key_sequence(
+        &mut Application::new(Args::default(), Config::default())?,
+        Some(format!("ihello<esc>:w {}<ret>", file.path().to_string_lossy()).as_ref()),
+        Some(&|app| {
+            assert!(!app.editor.is_err());
+
+            let mut docs: Vec<_> = app.editor.documents().collect();
+            assert_eq!(1, docs.len());
+
+            let doc = docs.pop().unwrap();
+            assert_eq!(Some(&file.path().to_path_buf()), doc.path());
+        }),
+        false,
+    )
+    .await?;
+
+    helpers::assert_file_has_content(file.as_file_mut(), &helpers::platform_line("hello"))?;
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn test_write_scratch_no_path_fails() -> anyhow::Result<()> {
+    helpers::test_key_sequence_with_input_text(
+        None,
+        ("#[\n|]#", "ihello<esc>:w<ret>", "hello#[\n|]#"),
+        &|app| {
+            assert!(app.editor.is_err());
+
+            let mut docs: Vec<_> = app.editor.documents().collect();
+            assert_eq!(1, docs.len());
+
+            let doc = docs.pop().unwrap();
+            assert_eq!(None, doc.path());
+        },
+        false,
+    )
+    .await?;
+
+    Ok(())
+}
+
 #[tokio::test]
 async fn test_write_new_path() -> anyhow::Result<()> {
     let mut file1 = tempfile::NamedTempFile::new().unwrap();
@@ -164,24 +210,15 @@ async fn test_write_new_path() -> anyhow::Result<()> {
     )
     .await?;
 
-    file1.as_file_mut().flush()?;
-    file1.as_file_mut().sync_all()?;
-    file2.as_file_mut().flush()?;
-    file2.as_file_mut().sync_all()?;
+    helpers::assert_file_has_content(
+        file1.as_file_mut(),
+        &helpers::platform_line("i can eat glass, it will not hurt me\n"),
+    )?;
 
-    let mut file1_content = String::new();
-    file1.as_file_mut().read_to_string(&mut file1_content)?;
-    assert_eq!(
-        helpers::platform_line("i can eat glass, it will not hurt me\n"),
-        file1_content
-    );
-
-    let mut file2_content = String::new();
-    file2.as_file_mut().read_to_string(&mut file2_content)?;
-    assert_eq!(
-        helpers::platform_line("i can eat glass, it will not hurt me\n"),
-        file2_content
-    );
+    helpers::assert_file_has_content(
+        file2.as_file_mut(),
+        &helpers::platform_line("i can eat glass, it will not hurt me\n"),
+    )?;
 
     Ok(())
 }
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 61bea527..ff64689e 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -574,7 +574,12 @@ impl Document {
             }
         };
 
-        let identifier = self.identifier();
+        let identifier = if self.path().is_some() {
+            Some(self.identifier())
+        } else {
+            None
+        };
+
         let language_server = self.language_server.clone();
 
         // mark changes up to now as saved
@@ -628,10 +633,13 @@ impl Document {
                 if !language_server.is_initialized() {
                     return Ok(event);
                 }
-                if let Some(notification) =
-                    language_server.text_document_did_save(identifier, &text)
-                {
-                    notification.await?;
+
+                if let Some(identifier) = identifier {
+                    if let Some(notification) =
+                        language_server.text_document_did_save(identifier, &text)
+                    {
+                        notification.await?;
+                    }
                 }
             }
 

From b3fc31a211293f48696d26855781577d1859c2c6 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Fri, 2 Sep 2022 09:20:28 -0400
Subject: [PATCH 329/884] move language server refresh to document saved event
 handler

---
 helix-term/src/application.rs | 42 ++++++++++++++++++++++-------------
 helix-term/src/commands.rs    |  9 +-------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 793993ee..60610c1d 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -462,22 +462,34 @@ impl Application {
         let lines = doc_save_event.text.len_lines();
         let bytes = doc_save_event.text.len_bytes();
 
-        if let Err(err) = doc.set_path(Some(&doc_save_event.path)) {
-            log::error!(
-                "error setting path for doc '{:?}': {}",
-                doc.path(),
-                err.to_string(),
-            );
-            self.editor.set_error(err.to_string());
-        } else {
-            // TODO: fix being overwritten by lsp
-            self.editor.set_status(format!(
-                "'{}' written, {}L {}B",
-                get_relative_path(&doc_save_event.path).to_string_lossy(),
-                lines,
-                bytes
-            ));
+        if doc.path() != Some(&doc_save_event.path) {
+            if let Err(err) = doc.set_path(Some(&doc_save_event.path)) {
+                log::error!(
+                    "error setting path for doc '{:?}': {}",
+                    doc.path(),
+                    err.to_string(),
+                );
+
+                self.editor.set_error(err.to_string());
+                return;
+            }
+
+            let loader = self.editor.syn_loader.clone();
+
+            // borrowing the same doc again to get around the borrow checker
+            let doc = self.editor.document_mut(doc_save_event.doc_id).unwrap();
+            let id = doc.id();
+            doc.detect_language(loader);
+            let _ = self.editor.refresh_language_server(id);
         }
+
+        // TODO: fix being overwritten by lsp
+        self.editor.set_status(format!(
+            "'{}' written, {}L {}B",
+            get_relative_path(&doc_save_event.path).to_string_lossy(),
+            lines,
+            bytes
+        ));
     }
 
     #[inline(always)]
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index afd94564..6deecbe2 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2519,7 +2519,7 @@ async fn make_format_callback(
     write: Option<(Option<PathBuf>, bool)>,
 ) -> anyhow::Result<job::Callback> {
     let format = format.await?;
-    let call: job::Callback = Callback::EditorCompositor(Box::new(move |editor, _compositor| {
+    let call: job::Callback = Callback::Editor(Box::new(move |editor| {
         if !editor.documents.contains_key(&doc_id) {
             return;
         }
@@ -2527,7 +2527,6 @@ async fn make_format_callback(
         let scrolloff = editor.config().scrolloff;
         let doc = doc_mut!(editor, &doc_id);
         let view = view_mut!(editor);
-        let loader = editor.syn_loader.clone();
 
         if doc.version() == doc_version {
             apply_transaction(&format, doc, view);
@@ -2536,14 +2535,8 @@ async fn make_format_callback(
             view.ensure_cursor_in_view(doc, scrolloff);
 
             if let Some((path, force)) = write {
-                let refresh_lang = path.is_some();
-
                 if let Err(err) = doc.save(path, force) {
                     editor.set_error(format!("Error saving: {}", err));
-                } else if refresh_lang {
-                    let id = doc.id();
-                    doc.detect_language(loader);
-                    let _ = editor.refresh_language_server(id);
                 }
             }
         } else {

From b530a86d1f15cc7df0e1ae8aa4bd02109ac33a8f Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Fri, 2 Sep 2022 23:38:38 -0400
Subject: [PATCH 330/884] remove Callback::Compositor variant

To reduce likelihood of accidental discarding of important callbacks
---
 helix-term/src/application.rs  |  2 +-
 helix-term/src/commands/dap.rs | 18 ++++++++++--------
 helix-term/src/compositor.rs   |  4 +---
 helix-term/src/job.rs          | 20 ++++----------------
 helix-term/src/ui/editor.rs    |  7 ++++---
 5 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 60610c1d..fe53d73d 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -991,7 +991,7 @@ impl Application {
 
         let mut result = match self
             .jobs
-            .finish(Some(&mut self.editor), Some(&mut self.compositor))
+            .finish(&mut self.editor, Some(&mut self.compositor))
             .await
         {
             Ok(_) => Ok(()),
diff --git a/helix-term/src/commands/dap.rs b/helix-term/src/commands/dap.rs
index 9c067eba..c27417e3 100644
--- a/helix-term/src/commands/dap.rs
+++ b/helix-term/src/commands/dap.rs
@@ -277,10 +277,11 @@ pub fn dap_launch(cx: &mut Context) {
             let completions = template.completion.clone();
             let name = template.name.clone();
             let callback = Box::pin(async move {
-                let call: Callback = Callback::Compositor(Box::new(move |compositor| {
-                    let prompt = debug_parameter_prompt(completions, name, Vec::new());
-                    compositor.push(Box::new(prompt));
-                }));
+                let call: Callback =
+                    Callback::EditorCompositor(Box::new(move |_editor, compositor| {
+                        let prompt = debug_parameter_prompt(completions, name, Vec::new());
+                        compositor.push(Box::new(prompt));
+                    }));
                 Ok(call)
             });
             cx.jobs.callback(callback);
@@ -335,10 +336,11 @@ fn debug_parameter_prompt(
                 let config_name = config_name.clone();
                 let params = params.clone();
                 let callback = Box::pin(async move {
-                    let call: Callback = Callback::Compositor(Box::new(move |compositor| {
-                        let prompt = debug_parameter_prompt(completions, config_name, params);
-                        compositor.push(Box::new(prompt));
-                    }));
+                    let call: Callback =
+                        Callback::EditorCompositor(Box::new(move |_editor, compositor| {
+                            let prompt = debug_parameter_prompt(completions, config_name, params);
+                            compositor.push(Box::new(prompt));
+                        }));
                     Ok(call)
                 });
                 cx.jobs.callback(callback);
diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs
index 5077807d..35b9d054 100644
--- a/helix-term/src/compositor.rs
+++ b/helix-term/src/compositor.rs
@@ -31,9 +31,7 @@ impl<'a> Context<'a> {
     /// Waits on all pending jobs, and then tries to flush all pending write
     /// operations for all documents.
     pub fn block_try_flush_writes(&mut self) -> anyhow::Result<()> {
-        tokio::task::block_in_place(|| {
-            helix_lsp::block_on(self.jobs.finish(Some(self.editor), None))
-        })?;
+        tokio::task::block_in_place(|| helix_lsp::block_on(self.jobs.finish(self.editor, None)))?;
 
         for doc in &mut self.editor.documents.values_mut() {
             tokio::task::block_in_place(|| helix_lsp::block_on(doc.try_flush_saves()))
diff --git a/helix-term/src/job.rs b/helix-term/src/job.rs
index 3c9e4511..2888b6eb 100644
--- a/helix-term/src/job.rs
+++ b/helix-term/src/job.rs
@@ -8,7 +8,6 @@ use futures_util::stream::{FuturesUnordered, StreamExt};
 pub enum Callback {
     EditorCompositor(Box<dyn FnOnce(&mut Editor, &mut Compositor) + Send>),
     Editor(Box<dyn FnOnce(&mut Editor) + Send>),
-    Compositor(Box<dyn FnOnce(&mut Compositor) + Send>),
 }
 
 pub type JobFuture = BoxFuture<'static, anyhow::Result<Option<Callback>>>;
@@ -76,7 +75,6 @@ impl Jobs {
             Ok(Some(call)) => match call {
                 Callback::EditorCompositor(call) => call(editor, compositor),
                 Callback::Editor(call) => call(editor),
-                Callback::Compositor(call) => call(compositor),
             },
             Err(e) => {
                 editor.set_error(format!("Async job failed: {}", e));
@@ -102,7 +100,7 @@ impl Jobs {
     /// Blocks until all the jobs that need to be waited on are done.
     pub async fn finish(
         &mut self,
-        mut editor: Option<&mut Editor>,
+        editor: &mut Editor,
         mut compositor: Option<&mut Compositor>,
     ) -> anyhow::Result<()> {
         log::debug!("waiting on jobs...");
@@ -117,20 +115,10 @@ impl Jobs {
                         // clippy doesn't realize this is an error without the derefs
                         #[allow(clippy::needless_option_as_deref)]
                         match callback {
-                            Callback::EditorCompositor(call)
-                                if editor.is_some() && compositor.is_some() =>
-                            {
-                                call(
-                                    editor.as_deref_mut().unwrap(),
-                                    compositor.as_deref_mut().unwrap(),
-                                )
-                            }
-                            Callback::Editor(call) if editor.is_some() => {
-                                call(editor.as_deref_mut().unwrap())
-                            }
-                            Callback::Compositor(call) if compositor.is_some() => {
-                                call(compositor.as_deref_mut().unwrap())
+                            Callback::EditorCompositor(call) if compositor.is_some() => {
+                                call(editor, compositor.as_deref_mut().unwrap())
                             }
+                            Callback::Editor(call) => call(editor),
 
                             // skip callbacks for which we don't have the necessary references
                             _ => (),
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index abed7f9b..73dfd52c 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -945,9 +945,10 @@ impl EditorView {
 
                     // TODO: Use an on_mode_change hook to remove signature help
                     cxt.jobs.callback(async {
-                        let call: job::Callback = Callback::Compositor(Box::new(|compositor| {
-                            compositor.remove(SignatureHelp::ID);
-                        }));
+                        let call: job::Callback =
+                            Callback::EditorCompositor(Box::new(|_editor, compositor| {
+                                compositor.remove(SignatureHelp::ID);
+                            }));
                         Ok(call)
                     });
                 }

From 3f07885b351748c5b8225aadb165f8ef7066f047 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Fri, 16 Sep 2022 23:17:48 -0400
Subject: [PATCH 331/884] document should save even if formatter fails

---
 helix-core/src/syntax.rs             |  6 ++
 helix-term/src/application.rs        | 15 ++---
 helix-term/src/commands.rs           | 27 +++++----
 helix-term/src/main.rs               | 12 +++-
 helix-term/tests/test/auto_indent.rs |  1 +
 helix-term/tests/test/auto_pairs.rs  |  1 +
 helix-term/tests/test/commands.rs    | 14 +++--
 helix-term/tests/test/helpers.rs     | 90 ++++++++++++++++++++++++----
 helix-term/tests/test/movement.rs    |  4 +-
 helix-term/tests/test/prompt.rs      |  4 +-
 helix-term/tests/test/splits.rs      | 11 +++-
 helix-term/tests/test/write.rs       | 66 +++++++++++++-------
 12 files changed, 185 insertions(+), 66 deletions(-)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 61d382fd..f907629f 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -61,6 +61,12 @@ pub struct Configuration {
     pub language: Vec<LanguageConfiguration>,
 }
 
+impl Default for Configuration {
+    fn default() -> Self {
+        crate::config::default_syntax_loader()
+    }
+}
+
 // largely based on tree-sitter/cli/src/loader.rs
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case", deny_unknown_fields)]
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index fe53d73d..4fde2a66 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -1,7 +1,6 @@
 use arc_swap::{access::Map, ArcSwap};
 use futures_util::Stream;
 use helix_core::{
-    config::{default_syntax_loader, user_syntax_loader},
     diagnostic::{DiagnosticTag, NumberOrString},
     path::get_relative_path,
     pos_at_coords, syntax, Selection,
@@ -110,7 +109,11 @@ fn restore_term() -> Result<(), Error> {
 }
 
 impl Application {
-    pub fn new(args: Args, config: Config) -> Result<Self, Error> {
+    pub fn new(
+        args: Args,
+        config: Config,
+        syn_loader_conf: syntax::Configuration,
+    ) -> Result<Self, Error> {
         #[cfg(feature = "integration")]
         setup_integration_logging();
 
@@ -137,14 +140,6 @@ impl Application {
             })
             .unwrap_or_else(|| theme_loader.default_theme(true_color));
 
-        let syn_loader_conf = user_syntax_loader().unwrap_or_else(|err| {
-            eprintln!("Bad language config: {}", err);
-            eprintln!("Press <ENTER> to continue with default language config");
-            use std::io::Read;
-            // This waits for an enter press.
-            let _ = std::io::stdin().read(&mut []);
-            default_syntax_loader()
-        });
         let syn_loader = std::sync::Arc::new(syntax::Loader::new(syn_loader_conf));
 
         let mut compositor = Compositor::new().context("build compositor")?;
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 6deecbe2..f6d583f5 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2518,7 +2518,8 @@ async fn make_format_callback(
     format: impl Future<Output = Result<Transaction, FormatterError>> + Send + 'static,
     write: Option<(Option<PathBuf>, bool)>,
 ) -> anyhow::Result<job::Callback> {
-    let format = format.await?;
+    let format = format.await;
+
     let call: job::Callback = Callback::Editor(Box::new(move |editor| {
         if !editor.documents.contains_key(&doc_id) {
             return;
@@ -2528,19 +2529,21 @@ async fn make_format_callback(
         let doc = doc_mut!(editor, &doc_id);
         let view = view_mut!(editor);
 
-        if doc.version() == doc_version {
-            apply_transaction(&format, doc, view);
-            doc.append_changes_to_history(view.id);
-            doc.detect_indent_and_line_ending();
-            view.ensure_cursor_in_view(doc, scrolloff);
+        if let Ok(format) = format {
+            if doc.version() == doc_version {
+                apply_transaction(&format, doc, view);
+                doc.append_changes_to_history(view.id);
+                doc.detect_indent_and_line_ending();
+                view.ensure_cursor_in_view(doc, scrolloff);
+            } else {
+                log::info!("discarded formatting changes because the document changed");
+            }
+        }
 
-            if let Some((path, force)) = write {
-                if let Err(err) = doc.save(path, force) {
-                    editor.set_error(format!("Error saving: {}", err));
-                }
+        if let Some((path, force)) = write {
+            if let Err(err) = doc.save(path, force) {
+                editor.set_error(format!("Error saving: {}", err));
             }
-        } else {
-            log::info!("discarded formatting changes because the document changed");
         }
     }));
 
diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs
index 726bf9e3..96b695c6 100644
--- a/helix-term/src/main.rs
+++ b/helix-term/src/main.rs
@@ -139,8 +139,18 @@ FLAGS:
         Err(err) => return Err(Error::new(err)),
     };
 
+    let syn_loader_conf = helix_core::config::user_syntax_loader().unwrap_or_else(|err| {
+        eprintln!("Bad language config: {}", err);
+        eprintln!("Press <ENTER> to continue with default language config");
+        use std::io::Read;
+        // This waits for an enter press.
+        let _ = std::io::stdin().read(&mut []);
+        helix_core::config::default_syntax_loader()
+    });
+
     // TODO: use the thread local executor to spawn the application task separately from the work pool
-    let mut app = Application::new(args, config).context("unable to create new application")?;
+    let mut app = Application::new(args, config, syn_loader_conf)
+        .context("unable to create new application")?;
 
     let exit_code = app.run(&mut EventStream::new()).await?;
 
diff --git a/helix-term/tests/test/auto_indent.rs b/helix-term/tests/test/auto_indent.rs
index 2f638893..5c093a5d 100644
--- a/helix-term/tests/test/auto_indent.rs
+++ b/helix-term/tests/test/auto_indent.rs
@@ -8,6 +8,7 @@ async fn auto_indent_c() -> anyhow::Result<()> {
             ..Default::default()
         },
         Config::default(),
+        helpers::test_syntax_conf(None),
         // switches to append mode?
         (
             helpers::platform_line("void foo() {#[|}]#").as_ref(),
diff --git a/helix-term/tests/test/auto_pairs.rs b/helix-term/tests/test/auto_pairs.rs
index ec47a5b4..caf80bd4 100644
--- a/helix-term/tests/test/auto_pairs.rs
+++ b/helix-term/tests/test/auto_pairs.rs
@@ -13,6 +13,7 @@ async fn auto_pairs_basic() -> anyhow::Result<()> {
             },
             ..Default::default()
         },
+        helpers::test_syntax_conf(None),
         ("#[\n|]#", "i(<esc>", "(#[|\n]#"),
     )
     .await?;
diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index 0279e348..5238cc69 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -1,16 +1,18 @@
 use std::ops::RangeInclusive;
 
 use helix_core::diagnostic::Severity;
-use helix_term::application::Application;
 
 use super::*;
 
 #[tokio::test(flavor = "multi_thread")]
 async fn test_write_quit_fail() -> anyhow::Result<()> {
     let file = helpers::new_readonly_tempfile()?;
+    let mut app = helpers::AppBuilder::new()
+        .with_file(file.path(), None)
+        .build()?;
 
     test_key_sequence(
-        &mut helpers::app_with_file(file.path())?,
+        &mut app,
         Some("ihello<esc>:wq<ret>"),
         Some(&|app| {
             let mut docs: Vec<_> = app.editor.documents().collect();
@@ -30,7 +32,7 @@ async fn test_write_quit_fail() -> anyhow::Result<()> {
 #[tokio::test(flavor = "multi_thread")]
 async fn test_buffer_close_concurrent() -> anyhow::Result<()> {
     test_key_sequences(
-        &mut Application::new(Args::default(), Config::default())?,
+        &mut helpers::AppBuilder::new().build()?,
         vec![
             (
                 None,
@@ -70,8 +72,12 @@ async fn test_buffer_close_concurrent() -> anyhow::Result<()> {
 
     command.push_str(":buffer<minus>close<ret>");
 
+    let mut app = helpers::AppBuilder::new()
+        .with_file(file.path(), None)
+        .build()?;
+
     test_key_sequence(
-        &mut helpers::app_with_file(file.path())?,
+        &mut app,
         Some(&command),
         Some(&|app| {
             assert!(!app.editor.is_err(), "error: {:?}", app.editor.get_status());
diff --git a/helix-term/tests/test/helpers.rs b/helix-term/tests/test/helpers.rs
index ed1a0331..c2fbe953 100644
--- a/helix-term/tests/test/helpers.rs
+++ b/helix-term/tests/test/helpers.rs
@@ -108,7 +108,7 @@ pub async fn test_key_sequence_with_input_text<T: Into<TestCase>>(
     let test_case = test_case.into();
     let mut app = match app {
         Some(app) => app,
-        None => Application::new(Args::default(), Config::default())?,
+        None => Application::new(Args::default(), Config::default(), test_syntax_conf(None))?,
     };
 
     let (view, doc) = helix_view::current!(app.editor);
@@ -132,16 +132,30 @@ pub async fn test_key_sequence_with_input_text<T: Into<TestCase>>(
     .await
 }
 
+/// Generates language configs that merge in overrides, like a user language
+/// config. The argument string must be a raw TOML document.
+pub fn test_syntax_conf(overrides: Option<String>) -> helix_core::syntax::Configuration {
+    let mut lang = helix_loader::config::default_lang_config();
+
+    if let Some(overrides) = overrides {
+        let override_toml = toml::from_str(&overrides).unwrap();
+        lang = helix_loader::merge_toml_values(lang, override_toml, 3);
+    }
+
+    lang.try_into().unwrap()
+}
+
 /// Use this for very simple test cases where there is one input
 /// document, selection, and sequence of key presses, and you just
 /// want to verify the resulting document and selection.
 pub async fn test_with_config<T: Into<TestCase>>(
     args: Args,
     config: Config,
+    syn_conf: helix_core::syntax::Configuration,
     test_case: T,
 ) -> anyhow::Result<()> {
     let test_case = test_case.into();
-    let app = Application::new(args, config)?;
+    let app = Application::new(args, config, syn_conf)?;
 
     test_key_sequence_with_input_text(
         Some(app),
@@ -162,7 +176,13 @@ pub async fn test_with_config<T: Into<TestCase>>(
 }
 
 pub async fn test<T: Into<TestCase>>(test_case: T) -> anyhow::Result<()> {
-    test_with_config(Args::default(), Config::default(), test_case).await
+    test_with_config(
+        Args::default(),
+        Config::default(),
+        test_syntax_conf(None),
+        test_case,
+    )
+    .await
 }
 
 pub fn temp_file_with_contents<S: AsRef<str>>(
@@ -207,16 +227,60 @@ pub fn new_readonly_tempfile() -> anyhow::Result<NamedTempFile> {
     Ok(file)
 }
 
-/// Creates a new Application with default config that opens the given file
-/// path
-pub fn app_with_file<P: Into<PathBuf>>(path: P) -> anyhow::Result<Application> {
-    Application::new(
-        Args {
-            files: vec![(path.into(), helix_core::Position::default())],
-            ..Default::default()
-        },
-        Config::default(),
-    )
+#[derive(Default)]
+pub struct AppBuilder {
+    args: Args,
+    config: Config,
+    syn_conf: helix_core::syntax::Configuration,
+    input: Option<(String, Selection)>,
+}
+
+impl AppBuilder {
+    pub fn new() -> Self {
+        AppBuilder::default()
+    }
+
+    pub fn with_file<P: Into<PathBuf>>(
+        mut self,
+        path: P,
+        pos: Option<helix_core::Position>,
+    ) -> Self {
+        self.args.files.push((path.into(), pos.unwrap_or_default()));
+        self
+    }
+
+    pub fn with_config(mut self, config: Config) -> Self {
+        self.config = config;
+        self
+    }
+
+    pub fn with_input_text<S: Into<String>>(mut self, input_text: S) -> Self {
+        self.input = Some(test::print(&input_text.into()));
+        self
+    }
+
+    pub fn with_lang_config(mut self, syn_conf: helix_core::syntax::Configuration) -> Self {
+        self.syn_conf = syn_conf;
+        self
+    }
+
+    pub fn build(self) -> anyhow::Result<Application> {
+        let mut app = Application::new(self.args, self.config, self.syn_conf)?;
+
+        if let Some((text, selection)) = self.input {
+            let (view, doc) = helix_view::current!(app.editor);
+            let sel = doc.selection(view.id).clone();
+            let trans = Transaction::change_by_selection(doc.text(), &sel, |_| {
+                (0, doc.text().len_chars(), Some((text.clone()).into()))
+            })
+            .with_selection(selection);
+
+            // replace the initial text with the input text
+            doc.apply(&trans, view.id);
+        }
+
+        Ok(app)
+    }
 }
 
 pub fn assert_file_has_content(file: &mut File, content: &str) -> anyhow::Result<()> {
diff --git a/helix-term/tests/test/movement.rs b/helix-term/tests/test/movement.rs
index 45aae39e..7212d026 100644
--- a/helix-term/tests/test/movement.rs
+++ b/helix-term/tests/test/movement.rs
@@ -70,7 +70,9 @@ async fn insert_to_normal_mode_cursor_position() -> anyhow::Result<()> {
 async fn cursor_position_newly_opened_file() -> anyhow::Result<()> {
     let test = |content: &str, expected_sel: Selection| -> anyhow::Result<()> {
         let file = helpers::temp_file_with_contents(content)?;
-        let mut app = helpers::app_with_file(file.path())?;
+        let mut app = helpers::AppBuilder::new()
+            .with_file(file.path(), None)
+            .build()?;
 
         let (view, doc) = helix_view::current!(app.editor);
         let sel = doc.selection(view.id).clone();
diff --git a/helix-term/tests/test/prompt.rs b/helix-term/tests/test/prompt.rs
index 2ab9604c..62ec03f1 100644
--- a/helix-term/tests/test/prompt.rs
+++ b/helix-term/tests/test/prompt.rs
@@ -1,11 +1,9 @@
 use super::*;
 
-use helix_term::application::Application;
-
 #[tokio::test]
 async fn test_history_completion() -> anyhow::Result<()> {
     test_key_sequence(
-        &mut Application::new(Args::default(), Config::default())?,
+        &mut AppBuilder::new().build()?,
         Some(":asdf<ret>:theme d<C-n><tab>"),
         Some(&|app| {
             assert!(!app.editor.is_err());
diff --git a/helix-term/tests/test/splits.rs b/helix-term/tests/test/splits.rs
index 70a517be..5807413a 100644
--- a/helix-term/tests/test/splits.rs
+++ b/helix-term/tests/test/splits.rs
@@ -6,8 +6,12 @@ async fn test_split_write_quit_all() -> anyhow::Result<()> {
     let mut file2 = tempfile::NamedTempFile::new()?;
     let mut file3 = tempfile::NamedTempFile::new()?;
 
+    let mut app = helpers::AppBuilder::new()
+        .with_file(file1.path(), None)
+        .build()?;
+
     test_key_sequences(
-        &mut helpers::app_with_file(file1.path())?,
+        &mut app,
         vec![
             (
                 Some(&format!(
@@ -66,9 +70,12 @@ async fn test_split_write_quit_all() -> anyhow::Result<()> {
 #[tokio::test(flavor = "multi_thread")]
 async fn test_split_write_quit_same_file() -> anyhow::Result<()> {
     let mut file = tempfile::NamedTempFile::new()?;
+    let mut app = helpers::AppBuilder::new()
+        .with_file(file.path(), None)
+        .build()?;
 
     test_key_sequences(
-        &mut helpers::app_with_file(file.path())?,
+        &mut app,
         vec![
             (
                 Some("O<esc>ihello<esc>:sp<ret>ogoodbye<esc>"),
diff --git a/helix-term/tests/test/write.rs b/helix-term/tests/test/write.rs
index 7d105431..6aa51a31 100644
--- a/helix-term/tests/test/write.rs
+++ b/helix-term/tests/test/write.rs
@@ -4,7 +4,6 @@ use std::{
 };
 
 use helix_core::diagnostic::Severity;
-use helix_term::application::Application;
 use helix_view::doc;
 
 use super::*;
@@ -12,9 +11,12 @@ use super::*;
 #[tokio::test]
 async fn test_write() -> anyhow::Result<()> {
     let mut file = tempfile::NamedTempFile::new()?;
+    let mut app = helpers::AppBuilder::new()
+        .with_file(file.path(), None)
+        .build()?;
 
     test_key_sequence(
-        &mut helpers::app_with_file(file.path())?,
+        &mut app,
         Some("ithe gostak distims the doshes<ret><esc>:w<ret>"),
         None,
         false,
@@ -38,9 +40,12 @@ async fn test_write() -> anyhow::Result<()> {
 #[tokio::test(flavor = "multi_thread")]
 async fn test_write_quit() -> anyhow::Result<()> {
     let mut file = tempfile::NamedTempFile::new()?;
+    let mut app = helpers::AppBuilder::new()
+        .with_file(file.path(), None)
+        .build()?;
 
     test_key_sequence(
-        &mut helpers::app_with_file(file.path())?,
+        &mut app,
         Some("ithe gostak distims the doshes<ret><esc>:wq<ret>"),
         None,
         true,
@@ -66,19 +71,16 @@ async fn test_write_concurrent() -> anyhow::Result<()> {
     let mut file = tempfile::NamedTempFile::new()?;
     let mut command = String::new();
     const RANGE: RangeInclusive<i32> = 1..=5000;
+    let mut app = helpers::AppBuilder::new()
+        .with_file(file.path(), None)
+        .build()?;
 
     for i in RANGE {
         let cmd = format!("%c{}<esc>:w<ret>", i);
         command.push_str(&cmd);
     }
 
-    test_key_sequence(
-        &mut helpers::app_with_file(file.path())?,
-        Some(&command),
-        None,
-        false,
-    )
-    .await?;
+    test_key_sequence(&mut app, Some(&command), None, false).await?;
 
     file.as_file_mut().flush()?;
     file.as_file_mut().sync_all()?;
@@ -93,9 +95,12 @@ async fn test_write_concurrent() -> anyhow::Result<()> {
 #[tokio::test]
 async fn test_write_fail_mod_flag() -> anyhow::Result<()> {
     let file = helpers::new_readonly_tempfile()?;
+    let mut app = helpers::AppBuilder::new()
+        .with_file(file.path(), None)
+        .build()?;
 
     test_key_sequences(
-        &mut helpers::app_with_file(file.path())?,
+        &mut app,
         vec![
             (
                 None,
@@ -133,7 +138,7 @@ async fn test_write_scratch_to_new_path() -> anyhow::Result<()> {
     let mut file = tempfile::NamedTempFile::new()?;
 
     test_key_sequence(
-        &mut Application::new(Args::default(), Config::default())?,
+        &mut AppBuilder::new().build()?,
         Some(format!("ihello<esc>:w {}<ret>", file.path().to_string_lossy()).as_ref()),
         Some(&|app| {
             assert!(!app.editor.is_err());
@@ -174,19 +179,40 @@ async fn test_write_scratch_no_path_fails() -> anyhow::Result<()> {
     Ok(())
 }
 
+#[tokio::test]
+async fn test_write_auto_format_fails_still_writes() -> anyhow::Result<()> {
+    let mut file = tempfile::Builder::new().suffix(".rs").tempfile()?;
+
+    let lang_conf = indoc! {r#"
+            [[language]]
+            name = "rust"
+            formatter = { command = "bash", args = [ "-c", "exit 1" ] }
+        "#};
+
+    let mut app = helpers::AppBuilder::new()
+        .with_file(file.path(), None)
+        .with_input_text("#[l|]#et foo = 0;\n")
+        .with_lang_config(helpers::test_syntax_conf(Some(lang_conf.into())))
+        .build()?;
+
+    test_key_sequences(&mut app, vec![(Some(":w<ret>"), None)], false).await?;
+
+    // file still saves
+    helpers::assert_file_has_content(file.as_file_mut(), "let foo = 0;\n")?;
+
+    Ok(())
+}
+
 #[tokio::test]
 async fn test_write_new_path() -> anyhow::Result<()> {
     let mut file1 = tempfile::NamedTempFile::new().unwrap();
     let mut file2 = tempfile::NamedTempFile::new().unwrap();
+    let mut app = helpers::AppBuilder::new()
+        .with_file(file1.path(), None)
+        .build()?;
 
     test_key_sequences(
-        &mut Application::new(
-            Args {
-                files: vec![(file1.path().to_path_buf(), Position::default())],
-                ..Default::default()
-            },
-            Config::default(),
-        )?,
+        &mut app,
         vec![
             (
                 Some("ii can eat glass, it will not hurt me<ret><esc>:w<ret>"),
@@ -228,7 +254,7 @@ async fn test_write_fail_new_path() -> anyhow::Result<()> {
     let file = helpers::new_readonly_tempfile()?;
 
     test_key_sequences(
-        &mut Application::new(Args::default(), Config::default())?,
+        &mut AppBuilder::new().build()?,
         vec![
             (
                 None,

From 9e64974f13e91470be7b411285b7a33c698da3aa Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Fri, 16 Sep 2022 23:32:25 -0400
Subject: [PATCH 332/884] remove Document::format_and_save

---
 helix-view/src/document.rs | 43 +++-----------------------------------
 1 file changed, 3 insertions(+), 40 deletions(-)

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index ff64689e..4a09bedc 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -520,32 +520,12 @@ impl Document {
         path: Option<P>,
         force: bool,
     ) -> Result<(), anyhow::Error> {
-        self.save_impl::<futures_util::future::Ready<_>, _>(None, path, force)
-    }
-
-    pub fn format_and_save<F, P>(
-        &mut self,
-        formatting: Option<F>,
-        path: Option<P>,
-        force: bool,
-    ) -> anyhow::Result<()>
-    where
-        F: Future<Output = Result<Transaction, FormatterError>> + 'static + Send,
-        P: Into<PathBuf>,
-    {
-        self.save_impl(formatting, path, force)
+        self.save_impl::<futures_util::future::Ready<_>, _>(path, force)
     }
 
     /// The `Document`'s text is encoded according to its encoding and written to the file located
     /// at its `path()`.
-    ///
-    /// If `formatting` is present, it supplies some changes that we apply to the text before saving.
-    fn save_impl<F, P>(
-        &mut self,
-        formatting: Option<F>,
-        path: Option<P>,
-        force: bool,
-    ) -> Result<(), anyhow::Error>
+    fn save_impl<F, P>(&mut self, path: Option<P>, force: bool) -> Result<(), anyhow::Error>
     where
         F: Future<Output = Result<Transaction, FormatterError>> + 'static + Send,
         P: Into<PathBuf>,
@@ -561,7 +541,7 @@ impl Document {
 
         // we clone and move text + path into the future so that we asynchronously save the current
         // state without blocking any further edits.
-        let mut text = self.text().clone();
+        let text = self.text().clone();
 
         let path = match path {
             Some(path) => helix_core::path::get_canonicalized_path(&path.into())?,
@@ -602,23 +582,6 @@ impl Document {
                 }
             }
 
-            if let Some(fmt) = formatting {
-                match fmt.await {
-                    Ok(transaction) => {
-                        let success = transaction.changes().apply(&mut text);
-                        if !success {
-                            // This shouldn't happen, because the transaction changes were generated
-                            // from the same text we're saving.
-                            log::error!("failed to apply format changes before saving");
-                        }
-                    }
-                    Err(err) => {
-                        // formatting failed: report error, and save file without modifications
-                        log::error!("{}", err);
-                    }
-                }
-            }
-
             let mut file = File::create(&path).await?;
             to_writer(&mut file, encoding, &text).await?;
 

From 31d1bbfddb112a1e38cf974793afc427a3614ecf Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Wed, 21 Sep 2022 18:34:56 -0400
Subject: [PATCH 333/884] review comments

---
 helix-term/src/application.rs    | 35 ++++++++++++++++----------------
 helix-term/src/commands/typed.rs |  2 +-
 helix-view/src/document.rs       | 12 ++---------
 3 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 4fde2a66..694c55c0 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -427,24 +427,25 @@ impl Application {
     }
 
     pub fn handle_document_write(&mut self, doc_save_event: DocumentSavedEventResult) {
-        if let Err(err) = doc_save_event {
-            self.editor.set_error(err.to_string());
-            return;
-        }
-
-        let doc_save_event = doc_save_event.unwrap();
-        let doc = self.editor.document_mut(doc_save_event.doc_id);
-
-        if doc.is_none() {
-            warn!(
-                "received document saved event for non-existent doc id: {}",
-                doc_save_event.doc_id
-            );
+        let doc_save_event = match doc_save_event {
+            Ok(event) => event,
+            Err(err) => {
+                self.editor.set_error(err.to_string());
+                return;
+            }
+        };
 
-            return;
-        }
+        let doc = match self.editor.document_mut(doc_save_event.doc_id) {
+            None => {
+                warn!(
+                    "received document saved event for non-existent doc id: {}",
+                    doc_save_event.doc_id
+                );
 
-        let doc = doc.unwrap();
+                return;
+            }
+            Some(doc) => doc,
+        };
 
         debug!(
             "document {:?} saved with revision {}",
@@ -472,7 +473,7 @@ impl Application {
             let loader = self.editor.syn_loader.clone();
 
             // borrowing the same doc again to get around the borrow checker
-            let doc = self.editor.document_mut(doc_save_event.doc_id).unwrap();
+            let doc = doc_mut!(self.editor, &doc_save_event.doc_id);
             let id = doc.id();
             doc.detect_language(loader);
             let _ = self.editor.refresh_language_server(id);
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index d312c45f..070215cb 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -21,7 +21,7 @@ pub struct TypableCommand {
 }
 
 fn quit(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) -> anyhow::Result<()> {
-    log::info!("quitting...");
+    log::debug!("quitting...");
 
     if event != PromptEvent::Validate {
         return Ok(());
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 4a09bedc..0774e516 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -554,12 +554,7 @@ impl Document {
             }
         };
 
-        let identifier = if self.path().is_some() {
-            Some(self.identifier())
-        } else {
-            None
-        };
-
+        let identifier = self.path().map(|_| self.identifier());
         let language_server = self.language_server.clone();
 
         // mark changes up to now as saved
@@ -708,10 +703,7 @@ impl Document {
     /// and flushing through the queue of pending writes. If any fail,
     /// it stops early before emptying the rest of the queue.
     pub async fn close(&mut self) -> Option<DocumentSavedEventResult> {
-        if self.save_sender.is_some() {
-            self.save_sender.take();
-        }
-
+        self.save_sender.take();
         self.flush_saves_impl(true).await
     }
 

From bf378e71b012b4c108d11825cee6eea7b69778c2 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Tue, 4 Oct 2022 01:37:02 -0400
Subject: [PATCH 334/884] fix tests

---
 helix-term/tests/test/movement.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/helix-term/tests/test/movement.rs b/helix-term/tests/test/movement.rs
index 7212d026..81c66e53 100644
--- a/helix-term/tests/test/movement.rs
+++ b/helix-term/tests/test/movement.rs
@@ -117,6 +117,7 @@ async fn select_mode_tree_sitter_next_function_is_union_of_objects() -> anyhow::
             ..Default::default()
         },
         Config::default(),
+        helpers::test_syntax_conf(None),
         (
             helpers::platform_line(indoc! {"\
                 #[/|]#// Increments
@@ -148,6 +149,7 @@ async fn select_mode_tree_sitter_prev_function_unselects_object() -> anyhow::Res
             ..Default::default()
         },
         Config::default(),
+        helpers::test_syntax_conf(None),
         (
             helpers::platform_line(indoc! {"\
                 /// Increments
@@ -180,6 +182,7 @@ async fn select_mode_tree_sitter_prev_function_goes_backwards_to_object() -> any
             ..Default::default()
         },
         Config::default(),
+        helpers::test_syntax_conf(None),
         (
             helpers::platform_line(indoc! {"\
                 /// Increments
@@ -210,6 +213,7 @@ async fn select_mode_tree_sitter_prev_function_goes_backwards_to_object() -> any
             ..Default::default()
         },
         Config::default(),
+        helpers::test_syntax_conf(None),
         (
             helpers::platform_line(indoc! {"\
                 /// Increments

From beb3427bfbaa88bec8b4c683e342f85eb53ad77d Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Tue, 4 Oct 2022 10:35:15 -0400
Subject: [PATCH 335/884] improve app close failure display

---
 helix-term/src/application.rs    | 72 ++++++++++----------------------
 helix-term/tests/test/helpers.rs | 12 +++++-
 2 files changed, 34 insertions(+), 50 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 694c55c0..2e49e6d1 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -951,28 +951,10 @@ impl Application {
 
         self.event_loop(input_stream).await;
 
-        // let mut save_errs = Vec::new();
-
-        // for doc in self.editor.documents_mut() {
-        //     if let Some(Err(err)) = doc.close().await {
-        //         save_errs.push((
-        //             doc.path()
-        //                 .map(|path| path.to_string_lossy().into_owned())
-        //                 .unwrap_or_else(|| "".into()),
-        //             err,
-        //         ));
-        //     }
-        // }
-
-        let close_err = self.close().await.err();
+        let close_errs = self.close().await;
         restore_term()?;
 
-        // for (path, err) in save_errs {
-        //     self.editor.exit_code = 1;
-        //     eprintln!("Error closing '{}': {}", path, err);
-        // }
-
-        if let Some(err) = close_err {
+        for err in close_errs {
             self.editor.exit_code = 1;
             eprintln!("Error: {}", err);
         }
@@ -980,49 +962,41 @@ impl Application {
         Ok(self.editor.exit_code)
     }
 
-    pub async fn close(&mut self) -> anyhow::Result<()> {
+    pub async fn close(&mut self) -> Vec<anyhow::Error> {
         // [NOTE] we intentionally do not return early for errors because we
         //        want to try to run as much cleanup as we can, regardless of
         //        errors along the way
+        let mut errs = Vec::new();
 
-        let mut result = match self
+        if let Err(err) = self
             .jobs
             .finish(&mut self.editor, Some(&mut self.compositor))
             .await
         {
-            Ok(_) => Ok(()),
-            Err(err) => {
-                log::error!("Error executing job: {}", err);
-                Err(err)
-            }
+            log::error!("Error executing job: {}", err);
+            errs.push(err);
         };
 
         for doc in self.editor.documents_mut() {
-            if let Some(save_result) = doc.close().await {
-                result = match save_result {
-                    Ok(_) => result,
-                    Err(err) => {
-                        if let Some(path) = doc.path() {
-                            log::error!(
-                                "Error saving document '{}': {}",
-                                path.to_string_lossy(),
-                                err
-                            );
-                        }
-                        Err(err)
-                    }
-                };
+            if let Some(Err(err)) = doc.close().await {
+                if let Some(path) = doc.path() {
+                    log::error!(
+                        "Error saving document '{}': {}",
+                        path.to_string_lossy(),
+                        err
+                    );
+                }
+                errs.push(err);
             }
         }
 
-        match self.editor.close_language_servers(None).await {
-            Ok(_) => result,
-            Err(_) => {
-                log::error!("Timed out waiting for language servers to shutdown");
-                Err(anyhow::format_err!(
-                    "Timed out waiting for language servers to shutdown"
-                ))
-            }
+        if self.editor.close_language_servers(None).await.is_err() {
+            log::error!("Timed out waiting for language servers to shutdown");
+            errs.push(anyhow::format_err!(
+                "Timed out waiting for language servers to shutdown"
+            ));
         }
+
+        errs
     }
 }
diff --git a/helix-term/tests/test/helpers.rs b/helix-term/tests/test/helpers.rs
index c2fbe953..5adc3354 100644
--- a/helix-term/tests/test/helpers.rs
+++ b/helix-term/tests/test/helpers.rs
@@ -94,7 +94,17 @@ pub async fn test_key_sequences(
         tokio::time::timeout(TIMEOUT, event_loop).await?;
     }
 
-    app.close().await?;
+    let errs = app.close().await;
+
+    if !errs.is_empty() {
+        log::error!("Errors closing app");
+
+        for err in errs {
+            log::error!("{}", err);
+        }
+
+        bail!("Error closing app");
+    }
 
     Ok(())
 }

From 30c93994b50888aaeb32c65c90426e997800ccea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Fri, 14 Oct 2022 16:22:21 +0900
Subject: [PATCH 336/884] Use a single save_queue on the editor

---
 helix-term/src/application.rs    |  20 ++++-
 helix-term/src/commands.rs       |   3 +-
 helix-term/src/commands/typed.rs |  88 +++++++++++--------
 helix-term/src/compositor.rs     |  22 +++--
 helix-view/src/document.rs       | 140 +++++--------------------------
 helix-view/src/editor.rs         |  79 ++++++++++-------
 6 files changed, 160 insertions(+), 192 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 2e49e6d1..6010e745 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -1,5 +1,5 @@
 use arc_swap::{access::Map, ArcSwap};
-use futures_util::Stream;
+use futures_util::{Stream, StreamExt};
 use helix_core::{
     diagnostic::{DiagnosticTag, NumberOrString},
     path::get_relative_path,
@@ -968,6 +968,24 @@ impl Application {
         //        errors along the way
         let mut errs = Vec::new();
 
+        // TODO: deduplicate with ctx.block_try_flush_writes
+        tokio::task::block_in_place(|| {
+            helix_lsp::block_on(async {
+                while let Some(save_event) = self.editor.save_queue.next().await {
+                    match &save_event {
+                        Ok(event) => {
+                            let doc = doc_mut!(self.editor, &event.doc_id);
+                            doc.set_last_saved_revision(event.revision);
+                        }
+                        Err(err) => {
+                            log::error!("error saving document: {}", err);
+                        }
+                    };
+                    // TODO: if is_err: break?
+                }
+            })
+        });
+
         if let Err(err) = self
             .jobs
             .finish(&mut self.editor, Some(&mut self.compositor))
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index f6d583f5..87bbd6c6 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2541,7 +2541,8 @@ async fn make_format_callback(
         }
 
         if let Some((path, force)) = write {
-            if let Err(err) = doc.save(path, force) {
+            let id = doc.id();
+            if let Err(err) = editor.save(id, path, force) {
                 editor.set_error(format!("Error saving: {}", err));
             }
         }
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 070215cb..ef774256 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -79,12 +79,28 @@ fn buffer_close_by_ids_impl(
     doc_ids: &[DocumentId],
     force: bool,
 ) -> anyhow::Result<()> {
+    // TODO: deduplicate with ctx.block_try_flush_writes
+    tokio::task::block_in_place(|| {
+        helix_lsp::block_on(async {
+            while let Some(save_event) = editor.save_queue.next().await {
+                match &save_event {
+                    Ok(event) => {
+                        let doc = doc_mut!(editor, &event.doc_id);
+                        doc.set_last_saved_revision(event.revision);
+                    }
+                    Err(err) => {
+                        log::error!("error saving document: {}", err);
+                    }
+                };
+                // TODO: if is_err: break?
+            }
+        })
+    });
+
     let (modified_ids, modified_names): (Vec<_>, Vec<_>) = doc_ids
         .iter()
         .filter_map(|&doc_id| {
-            if let Err(CloseError::BufferModified(name)) = tokio::task::block_in_place(|| {
-                helix_lsp::block_on(editor.close_document(doc_id, force))
-            }) {
+            if let Err(CloseError::BufferModified(name)) = editor.close_document(doc_id, force) {
                 Some((doc_id, name))
             } else {
                 None
@@ -289,7 +305,8 @@ fn write_impl(
     };
 
     if fmt.is_none() {
-        doc.save(path, force)?;
+        let id = doc.id();
+        cx.editor.save(id, path, force)?;
     }
 
     Ok(())
@@ -569,40 +586,45 @@ fn write_all_impl(
         return Ok(());
     }
 
-    let mut errors: Option<String> = None;
+    let mut errors: Vec<&'static str> = Vec::new();
     let auto_format = cx.editor.config().auto_format;
     let jobs = &mut cx.jobs;
 
     // save all documents
-    for doc in &mut cx.editor.documents.values_mut() {
-        if doc.path().is_none() {
-            errors = errors
-                .or_else(|| Some(String::new()))
-                .map(|mut errs: String| {
-                    errs.push_str("cannot write a buffer without a filename\n");
-                    errs
-                });
-
-            continue;
-        }
+    let saves: Vec<_> = cx
+        .editor
+        .documents
+        .values()
+        .filter_map(|doc| {
+            if doc.path().is_none() {
+                errors.push("cannot write a buffer without a filename\n");
+                return None;
+            }
 
-        if !doc.is_modified() {
-            continue;
-        }
+            if !doc.is_modified() {
+                return None;
+            }
 
-        let fmt = if auto_format {
-            doc.auto_format().map(|fmt| {
-                let callback =
-                    make_format_callback(doc.id(), doc.version(), fmt, Some((None, force)));
-                jobs.add(Job::with_callback(callback).wait_before_exiting());
-            })
-        } else {
+            let fmt = if auto_format {
+                doc.auto_format().map(|fmt| {
+                    let callback =
+                        make_format_callback(doc.id(), doc.version(), fmt, Some((None, force)));
+                    jobs.add(Job::with_callback(callback).wait_before_exiting());
+                })
+            } else {
+                None
+            };
+
+            if fmt.is_none() {
+                return Some(doc.id());
+            }
             None
-        };
+        })
+        .collect();
 
-        if fmt.is_none() {
-            doc.save::<PathBuf>(None, force)?;
-        }
+    // manually call save for the rest of docs that don't have a formatter
+    for id in saves {
+        cx.editor.save::<PathBuf>(id, None, force)?;
     }
 
     if quit {
@@ -619,10 +641,8 @@ fn write_all_impl(
         }
     }
 
-    if let Some(errs) = errors {
-        if !force {
-            bail!(errs);
-        }
+    if !errors.is_empty() && !force {
+        bail!("{:?}", errors);
     }
 
     Ok(())
diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs
index 35b9d054..a4ffaff2 100644
--- a/helix-term/src/compositor.rs
+++ b/helix-term/src/compositor.rs
@@ -1,3 +1,4 @@
+use futures_util::StreamExt;
 // Each component declares it's own size constraints and gets fitted based on it's parent.
 // Q: how does this work with popups?
 // cursive does compositor.screen_mut().add_layer_at(pos::absolute(x, y), <component>)
@@ -33,11 +34,22 @@ impl<'a> Context<'a> {
     pub fn block_try_flush_writes(&mut self) -> anyhow::Result<()> {
         tokio::task::block_in_place(|| helix_lsp::block_on(self.jobs.finish(self.editor, None)))?;
 
-        for doc in &mut self.editor.documents.values_mut() {
-            tokio::task::block_in_place(|| helix_lsp::block_on(doc.try_flush_saves()))
-                .map(|result| result.map(|_| ()))
-                .unwrap_or(Ok(()))?;
-        }
+        tokio::task::block_in_place(|| {
+            helix_lsp::block_on(async {
+                while let Some(save_event) = self.editor.save_queue.next().await {
+                    match &save_event {
+                        Ok(event) => {
+                            let doc = doc_mut!(self.editor, &event.doc_id);
+                            doc.set_last_saved_revision(event.revision);
+                        }
+                        Err(err) => {
+                            log::error!("error saving document: {}", err);
+                        }
+                    };
+                    // TODO: if is_err: break?
+                }
+            })
+        });
 
         Ok(())
     }
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 0774e516..9fa1241e 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -13,10 +13,6 @@ use std::future::Future;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::sync::Arc;
-use tokio::sync::mpsc::error::TryRecvError;
-use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};
-
-use tokio::sync::Mutex;
 
 use helix_core::{
     encoding,
@@ -134,9 +130,6 @@ pub struct Document {
     last_saved_revision: usize,
     version: i32, // should be usize?
     pub(crate) modified_since_accessed: bool,
-    save_sender: Option<UnboundedSender<DocumentSavedEventFuture>>,
-    save_receiver: Option<UnboundedReceiver<DocumentSavedEventFuture>>,
-    current_save: Arc<Mutex<Option<DocumentSavedEventFuture>>>,
 
     diagnostics: Vec<Diagnostic>,
     language_server: Option<Arc<helix_lsp::Client>>,
@@ -357,7 +350,6 @@ impl Document {
         let encoding = encoding.unwrap_or(encoding::UTF_8);
         let changes = ChangeSet::new(&text);
         let old_state = None;
-        let (save_sender, save_receiver) = tokio::sync::mpsc::unbounded_channel();
 
         Self {
             id: DocumentId::default(),
@@ -378,9 +370,6 @@ impl Document {
             savepoint: None,
             last_saved_revision: 0,
             modified_since_accessed: false,
-            save_sender: Some(save_sender),
-            save_receiver: Some(save_receiver),
-            current_save: Arc::new(Mutex::new(None)),
             language_server: None,
         }
     }
@@ -519,21 +508,26 @@ impl Document {
         &mut self,
         path: Option<P>,
         force: bool,
-    ) -> Result<(), anyhow::Error> {
-        self.save_impl::<futures_util::future::Ready<_>, _>(path, force)
+    ) -> Result<
+        impl Future<Output = Result<DocumentSavedEvent, anyhow::Error>> + 'static + Send,
+        anyhow::Error,
+    > {
+        let path = path.map(|path| path.into());
+        self.save_impl(path, force)
+
+        // futures_util::future::Ready<_>,
     }
 
     /// The `Document`'s text is encoded according to its encoding and written to the file located
     /// at its `path()`.
-    fn save_impl<F, P>(&mut self, path: Option<P>, force: bool) -> Result<(), anyhow::Error>
-    where
-        F: Future<Output = Result<Transaction, FormatterError>> + 'static + Send,
-        P: Into<PathBuf>,
-    {
-        if self.save_sender.is_none() {
-            bail!("saves are closed for this document!");
-        }
-
+    fn save_impl(
+        &mut self,
+        path: Option<PathBuf>,
+        force: bool,
+    ) -> Result<
+        impl Future<Output = Result<DocumentSavedEvent, anyhow::Error>> + 'static + Send,
+        anyhow::Error,
+    > {
         log::debug!(
             "submitting save of doc '{:?}'",
             self.path().map(|path| path.to_string_lossy())
@@ -544,7 +538,7 @@ impl Document {
         let text = self.text().clone();
 
         let path = match path {
-            Some(path) => helix_core::path::get_canonicalized_path(&path.into())?,
+            Some(path) => helix_core::path::get_canonicalized_path(&path)?,
             None => {
                 if self.path.is_none() {
                     bail!("Can't save with no path set!");
@@ -564,7 +558,7 @@ impl Document {
         let encoding = self.encoding;
 
         // We encode the file according to the `Document`'s encoding.
-        let save_event = async move {
+        let future = async move {
             use tokio::fs::File;
             if let Some(parent) = path.parent() {
                 // TODO: display a prompt asking the user if the directories should be created
@@ -604,107 +598,15 @@ impl Document {
             Ok(event)
         };
 
-        self.save_sender
-            .as_mut()
-            .unwrap()
-            .send(Box::pin(save_event))
-            .map_err(|err| anyhow!("failed to send save event: {}", err))
-    }
-
-    pub async fn await_save(&mut self) -> Option<DocumentSavedEventResult> {
-        self.await_save_impl(true).await
-    }
-
-    async fn await_save_impl(&mut self, block: bool) -> Option<DocumentSavedEventResult> {
-        let mut current_save = self.current_save.lock().await;
-        if let Some(ref mut save) = *current_save {
-            log::trace!("reawaiting save of '{:?}'", self.path());
-            let result = save.await;
-            *current_save = None;
-            log::trace!("reawait save of '{:?}' result: {:?}", self.path(), result);
-            return Some(result);
-        }
-
-        // return early if the receiver is closed
-        let rx = self.save_receiver.as_mut()?;
-
-        let save_req = if block {
-            rx.recv().await
-        } else {
-            let msg = rx.try_recv();
-
-            if let Err(err) = msg {
-                match err {
-                    TryRecvError::Empty => return None,
-                    TryRecvError::Disconnected => None,
-                }
-            } else {
-                msg.ok()
-            }
-        };
-
-        let save = match save_req {
-            Some(save) => save,
-            None => {
-                self.save_receiver = None;
-                return None;
-            }
-        };
-
-        // save a handle to the future so that when a poll on this
-        // function gets cancelled, we don't lose it
-        *current_save = Some(save);
-        log::trace!("awaiting save of '{:?}'", self.path());
-
-        let result = (*current_save).as_mut().unwrap().await;
-        *current_save = None;
-
-        log::trace!("save of '{:?}' result: {:?}", self.path(), result);
-
-        Some(result)
-    }
-
-    /// Flushes the queue of pending writes. If any fail,
-    /// it stops early before emptying the rest of the queue.
-    pub async fn try_flush_saves(&mut self) -> Option<DocumentSavedEventResult> {
-        self.flush_saves_impl(false).await
-    }
-
-    async fn flush_saves_impl(&mut self, block: bool) -> Option<DocumentSavedEventResult> {
-        let mut final_result = None;
-
-        while let Some(save_event) = self.await_save_impl(block).await {
-            let is_err = match &save_event {
-                Ok(event) => {
-                    self.set_last_saved_revision(event.revision);
-                    false
-                }
-                Err(err) => {
-                    log::error!(
-                        "error saving document {:?}: {}",
-                        self.path().map(|path| path.to_string_lossy()),
-                        err
-                    );
-                    true
-                }
-            };
-
-            final_result = Some(save_event);
-
-            if is_err {
-                break;
-            }
-        }
-
-        final_result
+        Ok(future)
     }
 
     /// Prepares the Document for being closed by stopping any new writes
     /// and flushing through the queue of pending writes. If any fail,
     /// it stops early before emptying the rest of the queue.
     pub async fn close(&mut self) -> Option<DocumentSavedEventResult> {
-        self.save_sender.take();
-        self.flush_saves_impl(true).await
+        // TODO
+        None
     }
 
     /// Detect the programming language based on the file type.
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index fbd0b2b0..c4789ee2 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1,6 +1,6 @@
 use crate::{
     clipboard::{get_clipboard_provider, ClipboardProvider},
-    document::{DocumentSavedEventResult, Mode},
+    document::{DocumentSavedEventFuture, DocumentSavedEventResult, Mode},
     graphics::{CursorKind, Rect},
     info::Info,
     input::KeyEvent,
@@ -9,7 +9,7 @@ use crate::{
     Document, DocumentId, View, ViewId,
 };
 
-use futures_util::stream::{select_all::SelectAll, FuturesUnordered};
+use futures_util::stream::select_all::SelectAll;
 use futures_util::{future, StreamExt};
 use helix_lsp::Call;
 use tokio_stream::wrappers::UnboundedReceiverStream;
@@ -29,7 +29,7 @@ use tokio::{
     time::{sleep, Duration, Instant, Sleep},
 };
 
-use anyhow::Error;
+use anyhow::{anyhow, Error};
 
 pub use helix_core::diagnostic::Severity;
 pub use helix_core::register::Registers;
@@ -644,12 +644,20 @@ pub struct Breakpoint {
     pub log_message: Option<String>,
 }
 
+use futures_util::stream::{Flatten, Once};
+
 pub struct Editor {
     /// Current editing mode.
     pub mode: Mode,
     pub tree: Tree,
     pub next_document_id: DocumentId,
     pub documents: BTreeMap<DocumentId, Document>,
+
+    // We Flatten<> to resolve the inner DocumentSavedEventFuture. For that we need a stream of streams, hence the Once<>.
+    // https://stackoverflow.com/a/66875668
+    pub saves: HashMap<DocumentId, UnboundedSender<Once<DocumentSavedEventFuture>>>,
+    pub save_queue: SelectAll<Flatten<UnboundedReceiverStream<Once<DocumentSavedEventFuture>>>>,
+
     pub count: Option<std::num::NonZeroUsize>,
     pub selected_register: Option<char>,
     pub registers: Registers,
@@ -751,6 +759,8 @@ impl Editor {
             tree: Tree::new(area),
             next_document_id: DocumentId::default(),
             documents: BTreeMap::new(),
+            saves: HashMap::new(),
+            save_queue: SelectAll::new(),
             count: None,
             selected_register: None,
             macro_recording: None,
@@ -1083,6 +1093,12 @@ impl Editor {
             self.new_document(doc)
         };
 
+        let (save_sender, save_receiver) = tokio::sync::mpsc::unbounded_channel();
+        self.saves.insert(id, save_sender);
+
+        let stream = UnboundedReceiverStream::new(save_receiver).flatten();
+        self.save_queue.push(stream);
+
         self.switch(id, action);
         Ok(id)
     }
@@ -1095,38 +1111,21 @@ impl Editor {
         self._refresh();
     }
 
-    pub async fn close_document(
-        &mut self,
-        doc_id: DocumentId,
-        force: bool,
-    ) -> Result<(), CloseError> {
+    pub fn close_document(&mut self, doc_id: DocumentId, force: bool) -> Result<(), CloseError> {
         let doc = match self.documents.get_mut(&doc_id) {
             Some(doc) => doc,
             None => return Err(CloseError::DoesNotExist),
         };
-
-        // flush out any pending writes first to clear the modified status
-        if let Some(Err(err)) = doc.try_flush_saves().await {
-            return Err(CloseError::SaveError(err));
-        }
-
         if !force && doc.is_modified() {
             return Err(CloseError::BufferModified(doc.display_name().into_owned()));
         }
 
-        if let Some(Err(err)) = doc.close().await {
-            return Err(CloseError::SaveError(err));
-        }
+        // This will also disallow any follow-up writes
+        self.saves.remove(&doc_id);
 
-        // Don't fail the whole write because the language server could not
-        // acknowledge the close
         if let Some(language_server) = doc.language_server() {
-            if let Err(err) = language_server
-                .text_document_did_close(doc.identifier())
-                .await
-            {
-                log::error!("Error closing doc in language server: {}", err);
-            }
+            // TODO: track error
+            tokio::spawn(language_server.text_document_did_close(doc.identifier()));
         }
 
         enum Action {
@@ -1188,6 +1187,28 @@ impl Editor {
         Ok(())
     }
 
+    pub fn save<P: Into<PathBuf>>(
+        &mut self,
+        doc_id: DocumentId,
+        path: Option<P>,
+        force: bool,
+    ) -> anyhow::Result<()> {
+        // convert a channel of futures to pipe into main queue one by one
+        // via stream.then() ? then push into main future
+
+        let path = path.map(|path| path.into());
+        let doc = doc_mut!(self, &doc_id);
+        let future = doc.save(path, force)?;
+        // TODO: if no self.saves for that doc id then bail
+        // bail!("saves are closed for this document!");
+        use futures_util::stream;
+        self.saves[&doc_id]
+            .send(stream::once(Box::pin(future)))
+            .map_err(|err| anyhow!("failed to send save event: {}", err))?;
+
+        Ok(())
+    }
+
     pub fn resize(&mut self, area: Rect) {
         if self.tree.resize(area) {
             self._refresh();
@@ -1307,16 +1328,10 @@ impl Editor {
     }
 
     pub async fn wait_event(&mut self) -> EditorEvent {
-        let mut saves: FuturesUnordered<_> = self
-            .documents
-            .values_mut()
-            .map(Document::await_save)
-            .collect();
-
         tokio::select! {
             biased;
 
-            Some(Some(event)) = saves.next() => {
+            Some(event) = self.save_queue.next() => {
                 EditorEvent::DocumentSaved(event)
             }
             Some(config_event) = self.config_events.1.recv() => {

From b0212b36118f7a4d596510dabb0c011144c7af69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Sun, 16 Oct 2022 18:01:31 +0900
Subject: [PATCH 337/884] Deduplicate flush_writes

---
 helix-term/src/application.rs    | 19 ++-----------------
 helix-term/src/commands/typed.rs | 17 +----------------
 helix-term/src/compositor.rs     | 18 +-----------------
 helix-view/src/editor.rs         | 15 +++++++++++++++
 4 files changed, 19 insertions(+), 50 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 6010e745..719683bf 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -1,5 +1,5 @@
 use arc_swap::{access::Map, ArcSwap};
-use futures_util::{Stream, StreamExt};
+use futures_util::Stream;
 use helix_core::{
     diagnostic::{DiagnosticTag, NumberOrString},
     path::get_relative_path,
@@ -969,22 +969,7 @@ impl Application {
         let mut errs = Vec::new();
 
         // TODO: deduplicate with ctx.block_try_flush_writes
-        tokio::task::block_in_place(|| {
-            helix_lsp::block_on(async {
-                while let Some(save_event) = self.editor.save_queue.next().await {
-                    match &save_event {
-                        Ok(event) => {
-                            let doc = doc_mut!(self.editor, &event.doc_id);
-                            doc.set_last_saved_revision(event.revision);
-                        }
-                        Err(err) => {
-                            log::error!("error saving document: {}", err);
-                        }
-                    };
-                    // TODO: if is_err: break?
-                }
-            })
-        });
+        tokio::task::block_in_place(|| helix_lsp::block_on(self.editor.flush_writes()));
 
         if let Err(err) = self
             .jobs
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index ef774256..c18f3c39 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -80,22 +80,7 @@ fn buffer_close_by_ids_impl(
     force: bool,
 ) -> anyhow::Result<()> {
     // TODO: deduplicate with ctx.block_try_flush_writes
-    tokio::task::block_in_place(|| {
-        helix_lsp::block_on(async {
-            while let Some(save_event) = editor.save_queue.next().await {
-                match &save_event {
-                    Ok(event) => {
-                        let doc = doc_mut!(editor, &event.doc_id);
-                        doc.set_last_saved_revision(event.revision);
-                    }
-                    Err(err) => {
-                        log::error!("error saving document: {}", err);
-                    }
-                };
-                // TODO: if is_err: break?
-            }
-        })
-    });
+    tokio::task::block_in_place(|| helix_lsp::block_on(editor.flush_writes()));
 
     let (modified_ids, modified_names): (Vec<_>, Vec<_>) = doc_ids
         .iter()
diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs
index a4ffaff2..76703780 100644
--- a/helix-term/src/compositor.rs
+++ b/helix-term/src/compositor.rs
@@ -1,4 +1,3 @@
-use futures_util::StreamExt;
 // Each component declares it's own size constraints and gets fitted based on it's parent.
 // Q: how does this work with popups?
 // cursive does compositor.screen_mut().add_layer_at(pos::absolute(x, y), <component>)
@@ -34,22 +33,7 @@ impl<'a> Context<'a> {
     pub fn block_try_flush_writes(&mut self) -> anyhow::Result<()> {
         tokio::task::block_in_place(|| helix_lsp::block_on(self.jobs.finish(self.editor, None)))?;
 
-        tokio::task::block_in_place(|| {
-            helix_lsp::block_on(async {
-                while let Some(save_event) = self.editor.save_queue.next().await {
-                    match &save_event {
-                        Ok(event) => {
-                            let doc = doc_mut!(self.editor, &event.doc_id);
-                            doc.set_last_saved_revision(event.revision);
-                        }
-                        Err(err) => {
-                            log::error!("error saving document: {}", err);
-                        }
-                    };
-                    // TODO: if is_err: break?
-                }
-            })
-        });
+        tokio::task::block_in_place(|| helix_lsp::block_on(self.editor.flush_writes()));
 
         Ok(())
     }
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index c4789ee2..c0efad05 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1348,4 +1348,19 @@ impl Editor {
             }
         }
     }
+
+    pub async fn flush_writes(&mut self) {
+        while let Some(save_event) = self.save_queue.next().await {
+            match &save_event {
+                Ok(event) => {
+                    let doc = doc_mut!(self, &event.doc_id);
+                    doc.set_last_saved_revision(event.revision);
+                }
+                Err(err) => {
+                    log::error!("error saving document: {}", err);
+                }
+            };
+            // TODO: if is_err: break?
+        }
+    }
 }

From b155e861adea1a29c5e4f9e717df8ff85a36052d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Sun, 16 Oct 2022 18:12:26 +0900
Subject: [PATCH 338/884] Use a write_count to determine how many writes left
 to flush

---
 helix-view/src/editor.rs | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index c0efad05..ac0864e1 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -657,6 +657,7 @@ pub struct Editor {
     // https://stackoverflow.com/a/66875668
     pub saves: HashMap<DocumentId, UnboundedSender<Once<DocumentSavedEventFuture>>>,
     pub save_queue: SelectAll<Flatten<UnboundedReceiverStream<Once<DocumentSavedEventFuture>>>>,
+    pub write_count: usize,
 
     pub count: Option<std::num::NonZeroUsize>,
     pub selected_register: Option<char>,
@@ -761,6 +762,7 @@ impl Editor {
             documents: BTreeMap::new(),
             saves: HashMap::new(),
             save_queue: SelectAll::new(),
+            write_count: 0,
             count: None,
             selected_register: None,
             macro_recording: None,
@@ -1206,6 +1208,8 @@ impl Editor {
             .send(stream::once(Box::pin(future)))
             .map_err(|err| anyhow!("failed to send save event: {}", err))?;
 
+        self.write_count += 1;
+
         Ok(())
     }
 
@@ -1332,6 +1336,7 @@ impl Editor {
             biased;
 
             Some(event) = self.save_queue.next() => {
+                self.write_count -= 1;
                 EditorEvent::DocumentSaved(event)
             }
             Some(config_event) = self.config_events.1.recv() => {
@@ -1350,17 +1355,21 @@ impl Editor {
     }
 
     pub async fn flush_writes(&mut self) {
-        while let Some(save_event) = self.save_queue.next().await {
-            match &save_event {
-                Ok(event) => {
-                    let doc = doc_mut!(self, &event.doc_id);
-                    doc.set_last_saved_revision(event.revision);
-                }
-                Err(err) => {
-                    log::error!("error saving document: {}", err);
-                }
-            };
-            // TODO: if is_err: break?
+        while self.write_count > 0 {
+            if let Some(save_event) = self.save_queue.next().await {
+                match &save_event {
+                    Ok(event) => {
+                        let doc = doc_mut!(self, &event.doc_id);
+                        doc.set_last_saved_revision(event.revision);
+                    }
+                    Err(err) => {
+                        log::error!("error saving document: {}", err);
+                    }
+                };
+                // TODO: if is_err: break?
+
+                self.write_count -= 1;
+            }
         }
     }
 }

From 55b50d9e8368793d764d36c0f363f31252900b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Sun, 16 Oct 2022 23:39:58 +0900
Subject: [PATCH 339/884] Seems like this flush is unnecessary

---
 helix-term/src/application.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 719683bf..2e49e6d1 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -968,9 +968,6 @@ impl Application {
         //        errors along the way
         let mut errs = Vec::new();
 
-        // TODO: deduplicate with ctx.block_try_flush_writes
-        tokio::task::block_in_place(|| helix_lsp::block_on(self.editor.flush_writes()));
-
         if let Err(err) = self
             .jobs
             .finish(&mut self.editor, Some(&mut self.compositor))

From 1b6f7319cd605366de109f25821c6b84860f2a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Sun, 16 Oct 2022 23:44:36 +0900
Subject: [PATCH 340/884] Wire up save_queue as a part of new_document rather
 than open

---
 helix-view/src/editor.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index ac0864e1..dc1a800e 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1062,6 +1062,13 @@ impl Editor {
             DocumentId(unsafe { NonZeroUsize::new_unchecked(self.next_document_id.0.get() + 1) });
         doc.id = id;
         self.documents.insert(id, doc);
+
+        let (save_sender, save_receiver) = tokio::sync::mpsc::unbounded_channel();
+        self.saves.insert(id, save_sender);
+
+        let stream = UnboundedReceiverStream::new(save_receiver).flatten();
+        self.save_queue.push(stream);
+
         id
     }
 
@@ -1095,12 +1102,6 @@ impl Editor {
             self.new_document(doc)
         };
 
-        let (save_sender, save_receiver) = tokio::sync::mpsc::unbounded_channel();
-        self.saves.insert(id, save_sender);
-
-        let stream = UnboundedReceiverStream::new(save_receiver).flatten();
-        self.save_queue.push(stream);
-
         self.switch(id, action);
         Ok(id)
     }

From 2a43ee016453e39e2cc4cae510ce7d75606e7199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Sun, 16 Oct 2022 23:46:34 +0900
Subject: [PATCH 341/884] doc.close() now unused

---
 helix-view/src/document.rs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 9fa1241e..78c6d032 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -601,14 +601,6 @@ impl Document {
         Ok(future)
     }
 
-    /// Prepares the Document for being closed by stopping any new writes
-    /// and flushing through the queue of pending writes. If any fail,
-    /// it stops early before emptying the rest of the queue.
-    pub async fn close(&mut self) -> Option<DocumentSavedEventResult> {
-        // TODO
-        None
-    }
-
     /// Detect the programming language based on the file type.
     pub fn detect_language(&mut self, config_loader: Arc<syntax::Loader>) {
         if let Some(path) = &self.path {

From 52ba550098745b463f59211a0172c334daef350b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Mon, 17 Oct 2022 00:02:14 +0900
Subject: [PATCH 342/884] Use flush_writes in application.close()

---
 helix-term/src/application.rs | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 2e49e6d1..6ca5b657 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -977,18 +977,7 @@ impl Application {
             errs.push(err);
         };
 
-        for doc in self.editor.documents_mut() {
-            if let Some(Err(err)) = doc.close().await {
-                if let Some(path) = doc.path() {
-                    log::error!(
-                        "Error saving document '{}': {}",
-                        path.to_string_lossy(),
-                        err
-                    );
-                }
-                errs.push(err);
-            }
-        }
+        self.editor.flush_writes().await;
 
         if self.editor.close_language_servers(None).await.is_err() {
             log::error!("Timed out waiting for language servers to shutdown");

From e645804b0a8e42c9fb9ef8259a9b2ad47a57a6e6 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Sun, 16 Oct 2022 21:40:40 -0400
Subject: [PATCH 343/884] Editor::flush_writes returns an error

---
 helix-term/src/application.rs    |  5 ++++-
 helix-term/src/commands/typed.rs | 23 +++++++++++------------
 helix-term/src/compositor.rs     |  4 +---
 helix-view/src/editor.rs         | 22 ++++++++++++----------
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 6ca5b657..b4b4a675 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -977,7 +977,10 @@ impl Application {
             errs.push(err);
         };
 
-        self.editor.flush_writes().await;
+        if let Err(err) = self.editor.flush_writes().await {
+            log::error!("Error writing: {}", err);
+            errs.push(err);
+        }
 
         if self.editor.close_language_servers(None).await.is_err() {
             log::error!("Timed out waiting for language servers to shutdown");
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index c18f3c39..eeeb4625 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -75,17 +75,16 @@ fn open(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) ->
 }
 
 fn buffer_close_by_ids_impl(
-    editor: &mut Editor,
+    cx: &mut compositor::Context,
     doc_ids: &[DocumentId],
     force: bool,
 ) -> anyhow::Result<()> {
-    // TODO: deduplicate with ctx.block_try_flush_writes
-    tokio::task::block_in_place(|| helix_lsp::block_on(editor.flush_writes()));
+    cx.block_try_flush_writes()?;
 
     let (modified_ids, modified_names): (Vec<_>, Vec<_>) = doc_ids
         .iter()
         .filter_map(|&doc_id| {
-            if let Err(CloseError::BufferModified(name)) = editor.close_document(doc_id, force) {
+            if let Err(CloseError::BufferModified(name)) = cx.editor.close_document(doc_id, force) {
                 Some((doc_id, name))
             } else {
                 None
@@ -94,11 +93,11 @@ fn buffer_close_by_ids_impl(
         .unzip();
 
     if let Some(first) = modified_ids.first() {
-        let current = doc!(editor);
+        let current = doc!(cx.editor);
         // If the current document is unmodified, and there are modified
         // documents, switch focus to the first modified doc.
         if !modified_ids.contains(&current.id()) {
-            editor.switch(*first, Action::Replace);
+            cx.editor.switch(*first, Action::Replace);
         }
         bail!(
             "{} unsaved buffer(s) remaining: {:?}",
@@ -157,7 +156,7 @@ fn buffer_close(
     }
 
     let document_ids = buffer_gather_paths_impl(cx.editor, args);
-    buffer_close_by_ids_impl(cx.editor, &document_ids, false)
+    buffer_close_by_ids_impl(cx, &document_ids, false)
 }
 
 fn force_buffer_close(
@@ -170,7 +169,7 @@ fn force_buffer_close(
     }
 
     let document_ids = buffer_gather_paths_impl(cx.editor, args);
-    buffer_close_by_ids_impl(cx.editor, &document_ids, true)
+    buffer_close_by_ids_impl(cx, &document_ids, true)
 }
 
 fn buffer_gather_others_impl(editor: &mut Editor) -> Vec<DocumentId> {
@@ -192,7 +191,7 @@ fn buffer_close_others(
     }
 
     let document_ids = buffer_gather_others_impl(cx.editor);
-    buffer_close_by_ids_impl(cx.editor, &document_ids, false)
+    buffer_close_by_ids_impl(cx, &document_ids, false)
 }
 
 fn force_buffer_close_others(
@@ -205,7 +204,7 @@ fn force_buffer_close_others(
     }
 
     let document_ids = buffer_gather_others_impl(cx.editor);
-    buffer_close_by_ids_impl(cx.editor, &document_ids, true)
+    buffer_close_by_ids_impl(cx, &document_ids, true)
 }
 
 fn buffer_gather_all_impl(editor: &mut Editor) -> Vec<DocumentId> {
@@ -222,7 +221,7 @@ fn buffer_close_all(
     }
 
     let document_ids = buffer_gather_all_impl(cx.editor);
-    buffer_close_by_ids_impl(cx.editor, &document_ids, false)
+    buffer_close_by_ids_impl(cx, &document_ids, false)
 }
 
 fn force_buffer_close_all(
@@ -235,7 +234,7 @@ fn force_buffer_close_all(
     }
 
     let document_ids = buffer_gather_all_impl(cx.editor);
-    buffer_close_by_ids_impl(cx.editor, &document_ids, true)
+    buffer_close_by_ids_impl(cx, &document_ids, true)
 }
 
 fn buffer_next(
diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs
index 76703780..971dc52d 100644
--- a/helix-term/src/compositor.rs
+++ b/helix-term/src/compositor.rs
@@ -32,9 +32,7 @@ impl<'a> Context<'a> {
     /// operations for all documents.
     pub fn block_try_flush_writes(&mut self) -> anyhow::Result<()> {
         tokio::task::block_in_place(|| helix_lsp::block_on(self.jobs.finish(self.editor, None)))?;
-
-        tokio::task::block_in_place(|| helix_lsp::block_on(self.editor.flush_writes()));
-
+        tokio::task::block_in_place(|| helix_lsp::block_on(self.editor.flush_writes()))?;
         Ok(())
     }
 }
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index dc1a800e..9f74c5ec 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -29,7 +29,7 @@ use tokio::{
     time::{sleep, Duration, Instant, Sleep},
 };
 
-use anyhow::{anyhow, Error};
+use anyhow::{anyhow, bail, Error};
 
 pub use helix_core::diagnostic::Severity;
 pub use helix_core::register::Registers;
@@ -1355,22 +1355,24 @@ impl Editor {
         }
     }
 
-    pub async fn flush_writes(&mut self) {
+    pub async fn flush_writes(&mut self) -> anyhow::Result<()> {
         while self.write_count > 0 {
             if let Some(save_event) = self.save_queue.next().await {
-                match &save_event {
-                    Ok(event) => {
-                        let doc = doc_mut!(self, &event.doc_id);
-                        doc.set_last_saved_revision(event.revision);
-                    }
+                self.write_count -= 1;
+
+                let save_event = match save_event {
+                    Ok(event) => event,
                     Err(err) => {
-                        log::error!("error saving document: {}", err);
+                        self.set_error(err.to_string());
+                        bail!(err);
                     }
                 };
-                // TODO: if is_err: break?
 
-                self.write_count -= 1;
+                let doc = doc_mut!(self, &save_event.doc_id);
+                doc.set_last_saved_revision(save_event.revision);
             }
         }
+
+        Ok(())
     }
 }

From 759d55cc81da10c93f6cbfcbe605806b9dc37d2f Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Sun, 16 Oct 2022 22:41:01 -0400
Subject: [PATCH 344/884] fail if doc save sender is closed

---
 helix-view/src/editor.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 9f74c5ec..ee84dbd3 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1202,10 +1202,12 @@ impl Editor {
         let path = path.map(|path| path.into());
         let doc = doc_mut!(self, &doc_id);
         let future = doc.save(path, force)?;
-        // TODO: if no self.saves for that doc id then bail
-        // bail!("saves are closed for this document!");
+
         use futures_util::stream;
-        self.saves[&doc_id]
+
+        self.saves
+            .get(&doc_id)
+            .ok_or_else(|| anyhow::format_err!("saves are closed for this document!"))?
             .send(stream::once(Box::pin(future)))
             .map_err(|err| anyhow!("failed to send save event: {}", err))?;
 

From 9a406b569b1b75c1970b81aac068110232ead2fd Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Tue, 18 Oct 2022 21:37:28 -0400
Subject: [PATCH 345/884] reduce LSP timeout to 3s

---
 helix-view/src/editor.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index ee84dbd3..cd2b1ad4 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1323,7 +1323,7 @@ impl Editor {
         timeout: Option<u64>,
     ) -> Result<(), tokio::time::error::Elapsed> {
         tokio::time::timeout(
-            Duration::from_millis(timeout.unwrap_or(10000)),
+            Duration::from_millis(timeout.unwrap_or(3000)),
             future::join_all(
                 self.language_servers
                     .iter_clients()

From 756253b43f5ec1d8cc6fce9e6ebcf3f9fee5bc5a Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Wed, 19 Oct 2022 00:01:00 -0400
Subject: [PATCH 346/884] fix tree_sitter_scopes

---
 helix-term/src/commands/typed.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index eeeb4625..c1971d81 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1077,12 +1077,13 @@ fn tree_sitter_scopes(
     let contents = format!("```json\n{:?}\n````", scopes);
 
     let callback = async move {
-        let call: job::Callback =
-            Box::new(move |editor: &mut Editor, compositor: &mut Compositor| {
+        let call: job::Callback = Callback::EditorCompositor(Box::new(
+            move |editor: &mut Editor, compositor: &mut Compositor| {
                 let contents = ui::Markdown::new(contents, editor.syn_loader.clone());
                 let popup = Popup::new("hover", contents).auto_close(true);
                 compositor.replace_or_push("hover", popup);
-            });
+            },
+        ));
         Ok(call)
     };
 

From a7e7c2cc05d0998d8e45664cd3cb8b3ac46cca0e Mon Sep 17 00:00:00 2001
From: Sukera <11753998+Seelengrab@users.noreply.github.com>
Date: Wed, 19 Oct 2022 14:53:22 +0200
Subject: [PATCH 347/884] Add `roots` for julia to languages.toml (#4361)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 3c324c78..39b81731 100644
--- a/languages.toml
+++ b/languages.toml
@@ -591,7 +591,7 @@ name = "julia"
 scope = "source.julia"
 injection-regex = "julia"
 file-types = ["jl"]
-roots = []
+roots = ["Manifest.toml", "Project.toml"]
 comment-token = "#"
 language-server = { command = "julia", args = [
     "--startup-file=no",

From 4174b25b3d0d39c09a6d4bcd7fa22ee98be52ed1 Mon Sep 17 00:00:00 2001
From: Fisher Darling <fdarlingco@gmail.com>
Date: Thu, 20 Oct 2022 00:17:50 +0200
Subject: [PATCH 348/884] Pretty print `tree-sitter-subtree` expression (#4295)

---
 helix-core/src/syntax.rs         | 108 +++++++++++++++++++++++++++++++
 helix-term/src/commands/typed.rs |   4 +-
 2 files changed, 111 insertions(+), 1 deletion(-)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 61d382fd..b5083f55 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -2030,6 +2030,57 @@ impl<I: Iterator<Item = HighlightEvent>> Iterator for Merge<I> {
     }
 }
 
+pub fn pretty_print_tree<W: fmt::Write>(fmt: &mut W, node: Node) -> fmt::Result {
+    pretty_print_tree_impl(fmt, node, true, None, 0)
+}
+
+fn pretty_print_tree_impl<W: fmt::Write>(
+    fmt: &mut W,
+    node: Node,
+    is_root: bool,
+    field_name: Option<&str>,
+    depth: usize,
+) -> fmt::Result {
+    fn is_visible(node: Node) -> bool {
+        node.is_missing()
+            || (node.is_named() && node.language().node_kind_is_visible(node.kind_id()))
+    }
+
+    if is_visible(node) {
+        let indentation_columns = depth * 2;
+        write!(fmt, "{:indentation_columns$}", "")?;
+
+        if let Some(field_name) = field_name {
+            write!(fmt, "{}: ", field_name)?;
+        }
+
+        write!(fmt, "({}", node.kind())?;
+    } else if is_root {
+        write!(fmt, "(\"{}\")", node.kind())?;
+    }
+
+    for child_idx in 0..node.child_count() {
+        if let Some(child) = node.child(child_idx) {
+            if is_visible(child) {
+                fmt.write_char('\n')?;
+            }
+
+            pretty_print_tree_impl(
+                fmt,
+                child,
+                false,
+                node.field_name_for_child(child_idx as u32),
+                depth + 1,
+            )?;
+        }
+    }
+
+    if is_visible(node) {
+        write!(fmt, ")")?;
+    }
+
+    Ok(())
+}
 #[cfg(test)]
 mod test {
     use super::*;
@@ -2201,6 +2252,63 @@ mod test {
         );
     }
 
+    #[track_caller]
+    fn assert_pretty_print(source: &str, expected: &str, start: usize, end: usize) {
+        let source = Rope::from_str(source);
+
+        let loader = Loader::new(Configuration { language: vec![] });
+        let language = get_language("Rust").unwrap();
+
+        let config = HighlightConfiguration::new(language, "", "", "").unwrap();
+        let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader));
+
+        let root = syntax
+            .tree()
+            .root_node()
+            .descendant_for_byte_range(start, end)
+            .unwrap();
+
+        let mut output = String::new();
+        pretty_print_tree(&mut output, root).unwrap();
+
+        assert_eq!(expected, output);
+    }
+
+    #[test]
+    fn test_pretty_print() {
+        let source = r#"/// Hello"#;
+        assert_pretty_print(source, "(line_comment)", 0, source.len());
+
+        // A large tree should be indented with fields:
+        let source = r#"fn main() {
+            println!("Hello, World!");
+        }"#;
+        assert_pretty_print(
+            source,
+            concat!(
+                "(function_item\n",
+                "  name: (identifier)\n",
+                "  parameters: (parameters)\n",
+                "  body: (block\n",
+                "    (expression_statement\n",
+                "      (macro_invocation\n",
+                "        macro: (identifier)\n",
+                "        (token_tree\n",
+                "          (string_literal))))))",
+            ),
+            0,
+            source.len(),
+        );
+
+        // Selecting a token should print just that token:
+        let source = r#"fn main() {}"#;
+        assert_pretty_print(source, r#"("fn")"#, 0, 1);
+
+        // Error nodes are printed as errors:
+        let source = r#"}{"#;
+        assert_pretty_print(source, "(ERROR)", 0, source.len());
+    }
+
     #[test]
     fn test_load_runtime_file() {
         // Test to make sure we can load some data from the runtime directory.
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 1bfc8153..13a0adcf 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1487,7 +1487,9 @@ fn tree_sitter_subtree(
             .root_node()
             .descendant_for_byte_range(from, to)
         {
-            let contents = format!("```tsq\n{}\n```", selected_node.to_sexp());
+            let mut contents = String::from("```tsq\n");
+            helix_core::syntax::pretty_print_tree(&mut contents, selected_node)?;
+            contents.push_str("\n```");
 
             let callback = async move {
                 let call: job::Callback =

From 8c9bb23650ba3c0c0bc7b25a359f997e130feb25 Mon Sep 17 00:00:00 2001
From: Alex <3957610+CptPotato@users.noreply.github.com>
Date: Thu, 20 Oct 2022 00:19:03 +0200
Subject: [PATCH 349/884] Update windows install instructions (#4351)

---
 README.md           | 20 ++++++++++++++++++--
 book/src/install.md | 43 ++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 85f80b65..5847a612 100644
--- a/README.md
+++ b/README.md
@@ -48,9 +48,25 @@ config directory (for example `~/.config/helix/runtime` on Linux/macOS, or `%App
 
 | OS                   | Command                                          |
 | -------------------- | ------------------------------------------------ |
-| Windows (cmd.exe)    | `xcopy /e /i runtime %AppData%\helix\runtime`    |
+| Windows (Cmd)        | `xcopy /e /i runtime %AppData%\helix\runtime`    |
 | Windows (PowerShell) | `xcopy /e /i runtime $Env:AppData\helix\runtime` |
-| Linux/macOS          | `ln -s $PWD/runtime ~/.config/helix/runtime`     |
+| Linux / MacOS        | `ln -s $PWD/runtime ~/.config/helix/runtime`     |
+
+Starting with Windows Vista you can also create symbolic links on Windows. Note that this requires
+elevated priviliges - i.e. PowerShell or Cmd must be run as administrator.
+
+**PowerShell:**
+
+```powershell
+New-Item -ItemType SymbolicLink -Target "runtime" -Path "$Env:AppData\helix\runtime"
+```
+
+**Cmd:**
+
+```cmd
+cd %appdata%\helix
+mklink /D runtime "<helix-repo>\runtime"
+```
 
 This location can be overridden via the `HELIX_RUNTIME` environment variable.
 
diff --git a/book/src/install.md b/book/src/install.md
index 136e12c9..4e7ea8dc 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -50,6 +50,23 @@ sudo dnf install helix
 sudo xbps-install helix
 ```
 
+## Windows
+
+Helix can be installed using [Scoop](https://scoop.sh/) or [Chocolatey](https://chocolatey.org/).
+
+**Scoop:**
+
+```
+scoop install helix
+```
+
+**Chocolatey:**
+
+```
+choco install helix
+```
+
+
 ## Build from source
 
 ```
@@ -64,11 +81,27 @@ Helix also needs its runtime files so make sure to copy/symlink the `runtime/` d
 config directory (for example `~/.config/helix/runtime` on Linux/macOS). This location can be overridden
 via the `HELIX_RUNTIME` environment variable.
 
-| OS                  | command                                          |
-| ------------------- | ------------------------------------------------ |
-| windows(cmd.exe)    | `xcopy /e /i runtime %AppData%/helix/runtime`    |
-| windows(powershell) | `xcopy /e /i runtime $Env:AppData\helix\runtime` |
-| linux/macos         | `ln -s $PWD/runtime ~/.config/helix/runtime`     |
+| OS                   | Command                                          |
+| -------------------- | ------------------------------------------------ |
+| Windows (Cmd)        | `xcopy /e /i runtime %AppData%\helix\runtime`    |
+| Windows (PowerShell) | `xcopy /e /i runtime $Env:AppData\helix\runtime` |
+| Linux / MacOS        | `ln -s $PWD/runtime ~/.config/helix/runtime`     |
+
+Starting with Windows Vista you can also create symbolic links on Windows. Note that this requires
+elevated priviliges - i.e. PowerShell or Cmd must be run as administrator.
+
+**PowerShell:**
+
+```powershell
+New-Item -ItemType SymbolicLink -Target "runtime" -Path "$Env:AppData\helix\runtime"
+```
+
+**Cmd:**
+
+```cmd
+cd %appdata%\helix
+mklink /D runtime "<helix-repo>\runtime"
+```
 
 To use Helix in desktop environments that supports [XDG desktop menu](https://specifications.freedesktop.org/menu-spec/menu-spec-latest.html), including Gnome and KDE, copy the provided `.desktop` file to the correct folder:
 

From d801a6693c3d475b3942f705d3ef48d7966bdf65 Mon Sep 17 00:00:00 2001
From: midnightexigent <36641328+midnightexigent@users.noreply.github.com>
Date: Thu, 20 Oct 2022 14:13:56 +0000
Subject: [PATCH 350/884] Allow using path suffixes to associate language
 file-types (#2455)

* feat(syntax): add strategy to associate file to language through pattern

File path will match if it ends with any of the file types provided in the config.
Also used this feature to add support for the .git/config and .ssh/config files

* Add /etc/ssh/ssh_config to languages.toml

* cargo xtask docgen

* Update languages.md

* Update languages.md

* Update book/src/languages.md

Co-authored-by: Ivan Tham <pickfire@riseup.net>

* Update book/src/languages.md

Co-authored-by: Ivan Tham <pickfire@riseup.net>

Co-authored-by: Ivan Tham <pickfire@riseup.net>
---
 book/src/languages.md    |  2 +-
 helix-core/src/syntax.rs | 14 +++++++++++++-
 languages.toml           |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/book/src/languages.md b/book/src/languages.md
index 73c81213..9b90a211 100644
--- a/book/src/languages.md
+++ b/book/src/languages.md
@@ -50,7 +50,7 @@ These configuration keys are available:
 | `name`                | The name of the language                                      |
 | `scope`               | A string like `source.js` that identifies the language. Currently, we strive to match the scope names used by popular TextMate grammars and by the Linguist library. Usually `source.<name>` or `text.<name>` in case of markup languages |
 | `injection-regex`     | regex pattern that will be tested against a language name in order to determine whether this language should be used for a potential [language injection][treesitter-language-injection] site. |
-| `file-types`          | The filetypes of the language, for example `["yml", "yaml"]`. Extensions and full file names are supported.  |
+| `file-types`          | The filetypes of the language, for example `["yml", "yaml"]`. This attempts to match by exact file name (`.zshrc`), then by file extension (`toml`), then by path suffix (`.git/config`). |
 | `shebangs`            | The interpreters from the shebang line, for example `["sh", "bash"]` |
 | `roots`               | A set of marker files to look for when trying to find the workspace root. For example `Cargo.lock`, `yarn.lock` |
 | `auto-format`         | Whether to autoformat this language when saving               |
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index a08e5084..f9a2ea5f 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -471,9 +471,10 @@ impl Loader {
 
             for file_type in &config.file_types {
                 // entry().or_insert(Vec::new).push(language_id);
+                let file_type = file_type.replace('/', &std::path::MAIN_SEPARATOR.to_string());
                 loader
                     .language_config_ids_by_file_type
-                    .insert(file_type.clone(), language_id);
+                    .insert(file_type, language_id);
             }
             for shebang in &config.shebangs {
                 loader
@@ -498,6 +499,17 @@ impl Loader {
                 path.extension()
                     .and_then(|extension| extension.to_str())
                     .and_then(|extension| self.language_config_ids_by_file_type.get(extension))
+            })
+            .or_else(|| {
+                self.language_config_ids_by_file_type
+                    .iter()
+                    .find_map(|(file_type, id)| {
+                        if path.to_str()?.ends_with(file_type) {
+                            Some(id)
+                        } else {
+                            None
+                        }
+                    })
             });
 
         configuration_id.and_then(|&id| self.language_configs.get(id).cloned())
diff --git a/languages.toml b/languages.toml
index 39b81731..ce3ba20a 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1054,7 +1054,7 @@ name = "git-config"
 scope = "source.gitconfig"
 roots = []
 # TODO: allow specifying file-types as a regex so we can read directory names (e.g. `.git/config`)
-file-types = [".gitmodules", ".gitconfig"]
+file-types = [".gitmodules", ".gitconfig", ".git/config", ".config/git/config"]
 injection-regex = "git-config"
 comment-token = "#"
 indent = { tab-width = 4, unit = "\t" }

From eee83620158bd710272c69194ac2ae2b51fdc708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= <matousdzivjak@gmail.com>
Date: Thu, 20 Oct 2022 22:50:54 +0200
Subject: [PATCH 351/884] fix(commands): no last picker error (#4387)

---
 helix-term/src/commands.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 87bbd6c6..db10d851 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2478,12 +2478,12 @@ pub fn command_palette(cx: &mut Context) {
 
 fn last_picker(cx: &mut Context) {
     // TODO: last picker does not seem to work well with buffer_picker
-    cx.callback = Some(Box::new(|compositor: &mut Compositor, _| {
+    cx.callback = Some(Box::new(|compositor, cx| {
         if let Some(picker) = compositor.last_picker.take() {
             compositor.push(picker);
+        } else {
+            cx.editor.set_error("no last picker")
         }
-        // XXX: figure out how to show error when no last picker lifetime
-        // cx.editor.set_error("no last picker")
     }));
 }
 

From de607830a2e9643dfe99828b9329f533a4f31fa9 Mon Sep 17 00:00:00 2001
From: Jared Ramirez <jaredramirez@hey.com>
Date: Thu, 20 Oct 2022 14:30:16 -0700
Subject: [PATCH 352/884] Upgrade rescript tree sitter & highlights (#4356)

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 languages.toml                           |  2 +-
 runtime/queries/rescript/highlights.scm  | 84 +++++++++++++++-----
 runtime/queries/rescript/injections.scm  |  2 +-
 runtime/queries/rescript/locals.scm      |  7 ++
 runtime/queries/rescript/textobjects.scm | 98 +++++++++++++++++++++++-
 5 files changed, 169 insertions(+), 24 deletions(-)
 create mode 100644 runtime/queries/rescript/locals.scm

diff --git a/languages.toml b/languages.toml
index ce3ba20a..51ffaef1 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1140,7 +1140,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "rescript"
-source = { git = "https://github.com/jaredramirez/tree-sitter-rescript", rev = "4cd7ba91696886fdaca086fb32b5fd8cc294a129" }
+source = { git = "https://github.com/jaredramirez/tree-sitter-rescript", rev = "65609807c628477f3b94052e7ef895885ac51c3c" }
 
 [[language]]
 name = "erlang"
diff --git a/runtime/queries/rescript/highlights.scm b/runtime/queries/rescript/highlights.scm
index a9cbeb5c..ed41322b 100644
--- a/runtime/queries/rescript/highlights.scm
+++ b/runtime/queries/rescript/highlights.scm
@@ -10,20 +10,23 @@
 [
   (type_identifier)
   (unit_type)
-  "list"
 ] @type
 
+(list ["list{" "}"] @type)
+(list_pattern ["list{" "}"] @type)
+
 [
   (variant_identifier)
   (polyvar_identifier)
-] @constant
+] @constructor
 
-(property_identifier) @variable.other.member
+(record_type_field (property_identifier) @type)
+(object_type (field (property_identifier) @type))
+(record_field (property_identifier) @variable.other.member)
+(object (field (property_identifier) @variable.other.member))
+(member_expression (property_identifier) @variable.other.member)
 (module_identifier) @namespace
 
-(jsx_identifier) @tag
-(jsx_attribute (property_identifier) @variable.parameter)
-
 ; Parameters
 ;----------------
 
@@ -42,8 +45,8 @@
   "${" @punctuation.bracket
   "}" @punctuation.bracket) @embedded
 
-(character) @constant.character
-(escape_sequence) @constant.character.escape
+(character) @string.special
+(escape_sequence) @string.special
 
 ; Other literals
 ;---------------
@@ -60,11 +63,13 @@
 ; Functions
 ;----------
 
+; parameter(s) in parens
 [
- (formal_parameters (value_identifier))
+ (parameter (value_identifier))
  (labeled_parameter (value_identifier))
 ] @variable.parameter
 
+; single parameter with no parens
 (function parameter: (value_identifier) @variable.parameter)
 
 ; Meta
@@ -74,7 +79,7 @@
  "@"
  "@@"
  (decorator_identifier)
-] @label
+] @keyword.directive
 
 (extension_identifier) @keyword
 ("%") @keyword
@@ -82,13 +87,13 @@
 ; Misc
 ;-----
 
-(subscript_expression index: (string) @variable.other.member)
+; (subscript_expression index: (string) @attribute)
 (polyvar_type_pattern "#" @constant)
 
 [
   ("include")
   ("open")
-] @keyword
+] @keyword.control.import
 
 [
   "as"
@@ -96,25 +101,43 @@
   "external"
   "let"
   "module"
-  "mutable"
   "private"
   "rec"
   "type"
   "and"
-] @keyword
+  "assert"
+  "async"
+  "await"
+  "with"
+  "unpack"
+] @keyword.storage.type
+
+"mutable" @keyword.storage.modifier
 
 [
   "if"
   "else"
   "switch"
-] @keyword
+  "when"
+] @keyword.control.conditional
 
 [
   "exception"
   "try"
   "catch"
-  "raise"
-] @keyword
+] @keyword.control.exception
+
+(call_expression
+  function: (value_identifier) @keyword.control.exception
+  (#eq? @keyword.control.exception "raise"))
+
+[
+  "for"
+  "in"
+  "to"
+  "downto"
+  "while"
+] @keyword.control.conditional
 
 [
   "."
@@ -129,17 +152,15 @@
   "-"
   "-."
   "*"
+  "**"
   "*."
-  "/"
   "/."
-  "<"
   "<="
   "=="
   "==="
   "!"
   "!="
   "!=="
-  ">"
   ">="
   "&&"
   "||"
@@ -151,6 +172,10 @@
   (uncurry)
 ] @operator
 
+; Explicitly enclose these operators with binary_expression
+; to avoid confusion with JSX tag delimiters
+(binary_expression ["<" ">" "/"] @operator)
+
 [
   "("
   ")"
@@ -172,7 +197,24 @@
   "~"
   "?"
   "=>"
+  ".."
   "..."
-] @punctuation
+] @punctuation.special
 
 (ternary_expression ["?" ":"] @operator)
+
+; JSX
+;----------
+(jsx_identifier) @tag
+(jsx_element
+  open_tag: (jsx_opening_element ["<" ">"] @punctuation.special))
+(jsx_element
+  close_tag: (jsx_closing_element ["<" "/" ">"] @punctuation.special))
+(jsx_self_closing_element ["/" ">" "<"] @punctuation.special)
+(jsx_fragment [">" "<" "/"] @punctuation.special)
+(jsx_attribute (property_identifier) @attribute)
+
+; Error
+;----------
+
+(ERROR) @keyword.control.exception
diff --git a/runtime/queries/rescript/injections.scm b/runtime/queries/rescript/injections.scm
index 201cce75..03e29b00 100644
--- a/runtime/queries/rescript/injections.scm
+++ b/runtime/queries/rescript/injections.scm
@@ -5,4 +5,4 @@
  (#set! injection.language "javascript"))
 
 ((raw_gql) @injection.content
- (#set! injection.language "graphql"))
+ (#set! injection.language "graphql"))
\ No newline at end of file
diff --git a/runtime/queries/rescript/locals.scm b/runtime/queries/rescript/locals.scm
new file mode 100644
index 00000000..1240ed16
--- /dev/null
+++ b/runtime/queries/rescript/locals.scm
@@ -0,0 +1,7 @@
+(switch_expression) @local.scope
+(if_expression) @local.scope
+
+; Definitions
+;------------
+(type_declaration) @local.defintion
+(let_binding) @local.defintion
diff --git a/runtime/queries/rescript/textobjects.scm b/runtime/queries/rescript/textobjects.scm
index fa1c4ff0..4f1d8c53 100644
--- a/runtime/queries/rescript/textobjects.scm
+++ b/runtime/queries/rescript/textobjects.scm
@@ -3,14 +3,110 @@
 
 (module_declaration definition: ((_) @class.inside)) @class.around
 
+; Blocks
+;-------
+
+(block (_) @function.inside) @function.around
+
 ; Functions
 ;----------
 
 (function body: (_) @function.inside) @function.around
 
+; Calls
+;------
+
+(call_expression arguments: ((_) @parameter.inside)) @parameter.around
+
 ; Comments
 ;---------
 
 (comment) @comment.inside
-
 (comment)+ @comment.around
+
+; Parameters
+;-----------
+
+(function parameter: (_) @parameter.inside @parameter.around)
+
+(formal_parameters
+  ","
+  . (_) @parameter.inside
+  @parameter.around)
+(formal_parameters
+  . (_) @parameter.inside
+  . ","?
+  @parameter.around)
+
+(arguments
+  "," @_arguments_start
+  . (_) @parameter.inside
+  @parameter.around)
+(arguments
+  . (_) @parameter.inside
+  . ","?
+  @parameter.around)
+
+(function_type_parameters
+  ","
+  . (_) @parameter.inside
+  @parameter.around)
+(function_type_parameters
+  . (_) @parameter.inside
+  . ","?
+  @parameter.around)
+
+(functor_parameters
+  ","
+  . (_) @parameter.inside
+  @parameter.around)
+(functor_parameters
+  . (_) @parameter.inside
+  . ","?
+  @parameter.around)
+
+(type_parameters
+  ","
+  . (_) @parameter.inside
+  @parameter.around)
+(type_parameters
+  . (_) @parameter.inside
+  . ","?
+  @parameter.around)
+
+(type_arguments
+  ","
+  . (_) @parameter.inside
+  @parameter.around)
+(type_arguments
+  . (_) @parameter.inside
+  . ","?
+  @parameter.around)
+
+(decorator_arguments
+  ","
+  . (_) @parameter.inside
+  @parameter.around)
+(decorator_arguments
+  . (_) @parameter.inside
+  . ","?
+  @parameter.around)
+
+(variant_parameters
+  ","
+  . (_) @parameter.inside
+  @parameter.around)
+(variant_parameters
+  . (_) @parameter.inside
+  . ","?
+  @parameter.around)
+
+(polyvar_parameters
+  ","
+  . (_) @parameter.inside
+  @parameter.around)
+(polyvar_parameters
+  . (_) @parameter.inside
+  . ","?
+  @parameter.around)
+

From 36f97b6aadec1a5c0cc61859d4f456f005983be0 Mon Sep 17 00:00:00 2001
From: Garrett D'Amore <garrett@damore.org>
Date: Thu, 20 Oct 2022 14:54:17 -0700
Subject: [PATCH 353/884] Add support for D (#4372)

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/generated/lang-support.md |   1 +
 languages.toml                     |  15 ++
 runtime/queries/d/highlights.scm   | 231 +++++++++++++++++++++++++++++
 runtime/queries/d/indents.scm      |  17 +++
 runtime/queries/d/injections.scm   |   2 +
 runtime/queries/d/textobjects.scm  |   9 ++
 6 files changed, 275 insertions(+)
 create mode 100644 runtime/queries/d/highlights.scm
 create mode 100644 runtime/queries/d/indents.scm
 create mode 100644 runtime/queries/d/injections.scm
 create mode 100644 runtime/queries/d/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 3fe9ef70..c6edc66d 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -15,6 +15,7 @@
 | cpp | ✓ | ✓ | ✓ | `clangd` |
 | css | ✓ |  |  | `vscode-css-language-server` |
 | cue | ✓ |  |  | `cuelsp` |
+| d | ✓ | ✓ | ✓ | `serve-d` |
 | dart | ✓ |  | ✓ | `dart` |
 | devicetree | ✓ |  |  |  |
 | diff | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 51ffaef1..5ad5c6e6 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1835,3 +1835,18 @@ roots = []
 [[grammar]]
 name = "wast"
 source = { git = "https://github.com/wasm-lsp/tree-sitter-wasm", rev = "2ca28a9f9d709847bf7a3de0942a84e912f59088", subpath = "wast" }
+
+[[language]]
+name = "d"
+scope = "source.d"
+file-types = [ "d", "dd" ]
+roots = []
+comment-token = "//"
+injection-regex = "d"
+indent = { tab-width = 4, unit = "    "}
+language-server = { command = "serve-d" }
+formatter = { command = "dfmt" }
+
+[[grammar]]
+name = "d"
+source = { git = "https://github.com/gdamore/tree-sitter-d", rev="601c4a1e8310fb2f3c43fa8a923d0d27497f3c04" }
diff --git a/runtime/queries/d/highlights.scm b/runtime/queries/d/highlights.scm
new file mode 100644
index 00000000..b5db8431
--- /dev/null
+++ b/runtime/queries/d/highlights.scm
@@ -0,0 +1,231 @@
+; highlights.scm
+;
+; Highlighting queries for D code for use by Tree-Sitter.
+;
+; Copyright 2022 Garrett D'Amore
+;
+; Distributed under the MIT License.
+; (See accompanying file LICENSE.txt or https://opensource.org/licenses/MIT)
+; SPDX-License-Identifier: MIT
+
+; these are listed first, because they override keyword queries
+(identity_expression (in) @operator)
+(identity_expression (is) @operator)
+
+(storage_class) @keyword.storage
+
+(function_declaration (identifier) @function)
+
+(call_expression (identifier) @function)
+(call_expression (type (identifier) @function))
+
+(module_fqn) @namespace
+
+[
+    (abstract)
+    (alias)
+    (align)
+    (asm)
+    (assert)
+    (auto)
+    (cast)
+    (const)
+    (debug)
+    (delete)
+    (deprecated)
+    (export)
+    (extern)
+    (final)
+    (immutable)
+    (in)
+    (inout)
+    (invariant)
+    (is)
+    (lazy)
+    ; "macro" - obsolete
+    (mixin)
+    (module)
+    (new)
+    (nothrow)
+    (out)
+    (override)
+    (package)
+    (pragma)
+    (private)
+    (protected)
+    (public)
+    (pure)
+    (ref)
+    (scope)
+    (shared)
+    (static)
+    (super)
+    (synchronized)
+    (template)
+    (this)
+    (throw)
+    (typeid)
+    (typeof)
+    (unittest)
+    (version)
+    (with)
+    (gshared)
+    (traits)
+    (vector)
+    (parameters_)
+] @keyword
+
+[
+    (class)
+    (struct)
+    (interface)
+    (union)
+    (enum)
+    (function)
+    (delegate)
+] @keyword.storage.type
+
+[
+    (break)
+    (case)
+    (catch)
+    (continue)
+    (do)
+    (default)
+    (finally)
+    (else)
+    (goto)
+    (if)
+    (switch)
+    (try)
+] @keyword.control
+
+(return) @keyword.control.return
+
+(import) @keyword.control.import
+
+[
+    (for)
+    (foreach)
+    (foreach_reverse)
+    (while)
+] @keyword.control.repeat
+
+[
+    (not_in)
+    (not_is)
+    "/="
+    "/"
+    ".."
+    "..."
+    "&"
+    "&="
+    "&&"
+    "|"
+    "|="
+    "||"
+    "-"
+    "-="
+    "--"
+    "+"
+    "+="
+    "++"
+    "<"
+    "<="
+    "<<"
+    "<<="
+    ">"
+    ">="
+    ">>="
+    ">>>="
+    ">>"
+    ">>>"
+    "!"
+    "!="
+    "?"
+    "$"
+    "="
+    "=="
+    "*"
+    "*="
+    "%"
+    "%="
+    "^"
+    "^="
+    "^^"
+    "^^="
+    "~"
+    "~="
+    "@"
+    "=>"
+] @operator
+
+[
+    "("
+    ")"
+    "["
+    "]"
+] @punctuation.bracket
+
+[
+    ";"
+    "."
+    ":"
+    ","
+] @punctuation.delimiter
+
+[
+    (true)
+    (false)
+] @constant.builtin.boolean
+
+(null) @constant.builtin
+
+(special_keyword) @constant.builtin
+
+(directive) @keyword.directive
+(shebang) @keyword.directive
+
+(comment) @comment
+
+[
+    (void)
+    (bool)
+    (byte)
+    (ubyte)
+    (char)
+    (short)
+    (ushort)
+    (wchar)
+    (dchar)
+    (int)
+    (uint)
+    (long)
+    (ulong)
+    (real)
+    (double)
+] @type.builtin
+
+[
+    (cent)
+    (ucent)
+    (ireal)
+    (idouble)
+    (ifloat)
+    (creal)
+    (double)
+    (cfloat)
+] @warning ; these types are deprecated
+
+(label (identifier) @label)
+(goto_statement (goto) @keyword (identifier) @label)
+
+(string_literal) @string
+(int_literal) @constant.numeric.integer
+(float_literal) @constant.numeric.float
+(char_literal) @constant.character
+(identifier) @variable
+(at_attribute) @attribute
+
+; everything after __EOF_ is plain text
+(end_file) @ui.text
diff --git a/runtime/queries/d/indents.scm b/runtime/queries/d/indents.scm
new file mode 100644
index 00000000..73ff0b82
--- /dev/null
+++ b/runtime/queries/d/indents.scm
@@ -0,0 +1,17 @@
+[
+  (parameters)
+  (template_parameters)
+  (expression_statement)
+  (aggregate_body)
+  (function_body)
+  (scope_statement)
+  (block_statement)
+  (case_statement)
+] @indent
+
+[
+  (case)
+  (default)
+  "}"
+  "]"
+] @outdent
diff --git a/runtime/queries/d/injections.scm b/runtime/queries/d/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/d/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/d/textobjects.scm b/runtime/queries/d/textobjects.scm
new file mode 100644
index 00000000..9ca07160
--- /dev/null
+++ b/runtime/queries/d/textobjects.scm
@@ -0,0 +1,9 @@
+(function_declaration (function_body) @function.inside) @function.around
+(comment) @comment.inside
+(comment)+ @comment.around
+(class_declaration (aggregate_body) @class.inside) @class.around
+(interface_declaration (aggregate_body) @class.inside) @class.around
+(struct_declaration (aggregate_body) @class.inside) @class.around
+(unittest_declaration (block_statement) @test.insid) @test.around
+(parameter) @parameter.inside
+(template_parameter) @parameter.inside
\ No newline at end of file

From 4cff6250548d279ab69627177bd55312adb822a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= <matousdzivjak@gmail.com>
Date: Fri, 21 Oct 2022 00:05:04 +0200
Subject: [PATCH 354/884] chore(view): remove indent_unit helper fn (#4389)

---
 helix-term/src/commands.rs | 6 +++---
 helix-view/src/document.rs | 8 --------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index db10d851..a8dafc33 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3022,7 +3022,7 @@ pub mod insert {
         // TODO: round out to nearest indentation level (for example a line with 3 spaces should
         // indent by one to reach 4 spaces).
 
-        let indent = Tendril::from(doc.indent_unit());
+        let indent = Tendril::from(doc.indent_style.as_str());
         let transaction = Transaction::insert(
             doc.text(),
             &doc.selection(view.id).clone().cursors(doc.text().slice(..)),
@@ -3122,7 +3122,7 @@ pub mod insert {
         let count = cx.count();
         let (view, doc) = current_ref!(cx.editor);
         let text = doc.text().slice(..);
-        let indent_unit = doc.indent_unit();
+        let indent_unit = doc.indent_style.as_str();
         let tab_size = doc.tab_width();
         let auto_pairs = doc.auto_pairs(cx.editor);
 
@@ -3647,7 +3647,7 @@ fn indent(cx: &mut Context) {
     let lines = get_lines(doc, view.id);
 
     // Indent by one level
-    let indent = Tendril::from(doc.indent_unit().repeat(count));
+    let indent = Tendril::from(doc.indent_style.as_str().repeat(count));
 
     let transaction = Transaction::change(
         doc.text(),
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 78c6d032..a723b89b 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -1052,14 +1052,6 @@ impl Document {
             .map_or(4, |config| config.tab_width) // fallback to 4 columns
     }
 
-    /// Returns a string containing a single level of indentation.
-    ///
-    /// TODO: we might not need this function anymore, since the information
-    /// is conveniently available in `Document::indent_style` now.
-    pub fn indent_unit(&self) -> &'static str {
-        self.indent_style.as_str()
-    }
-
     pub fn changes(&self) -> &ChangeSet {
         &self.changes
     }

From 1243db11a55a9f431a4b6bbf56c1953b2262d8b7 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 20 Oct 2022 13:36:21 -0500
Subject: [PATCH 355/884] Use helix_view::apply_transaction in
 integration-tests

`helix_view::apply_transaction` closes over `Document::apply` and
`View::apply` to ensure that jumplist entries are updated when a
document changes from a transaction. `Document::apply` shouldn't
be called directly - this helper function should be used instead.
---
 helix-term/tests/test/helpers.rs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/helix-term/tests/test/helpers.rs b/helix-term/tests/test/helpers.rs
index 5adc3354..a2d53e9d 100644
--- a/helix-term/tests/test/helpers.rs
+++ b/helix-term/tests/test/helpers.rs
@@ -125,13 +125,12 @@ pub async fn test_key_sequence_with_input_text<T: Into<TestCase>>(
     let sel = doc.selection(view.id).clone();
 
     // replace the initial text with the input text
-    doc.apply(
-        &Transaction::change_by_selection(doc.text(), &sel, |_| {
-            (0, doc.text().len_chars(), Some((&test_case.in_text).into()))
-        })
-        .with_selection(test_case.in_selection.clone()),
-        view.id,
-    );
+    let transaction = Transaction::change_by_selection(doc.text(), &sel, |_| {
+        (0, doc.text().len_chars(), Some((&test_case.in_text).into()))
+    })
+    .with_selection(test_case.in_selection.clone());
+
+    helix_view::apply_transaction(&transaction, doc, view);
 
     test_key_sequence(
         &mut app,
@@ -286,7 +285,7 @@ impl AppBuilder {
             .with_selection(selection);
 
             // replace the initial text with the input text
-            doc.apply(&trans, view.id);
+            helix_view::apply_transaction(&trans, doc, view);
         }
 
         Ok(app)

From 313579d27ce6ad55b5c2410856e6aa62a7778320 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 20 Oct 2022 14:14:27 -0500
Subject: [PATCH 356/884] Remove language-server configuration in integration
 tests

This change removes language server configuration from the default
languages.toml config for integration tests. No integration-tests
currently depend on the availability of a language server but if any
future test needs to, it may provide a language server configuration
by passing an override into the `test_syntax_conf` helper.

Language-servers in integration tests cause false-positive failures
when running integration tests in GitHub Actions CI. The Windows
runner appears to have `clangd` installed and all OS runners have
the `R` binary installed but not the `R` language server package.
If a test file created by `tempfile::NamedTempFile` happens to have a
file extension of `r`, the test will most likely fail because the
R language server will fail to start and will become a broken pipe,
meaning that it will fail to shutdown within the timeout, causing a
false-positive failure. This happens surprisingly often in practice.

Language servers (especially rust-analyzer) also emit unnecessary
log output when initializing, which this change silences.
---
 helix-term/tests/test/helpers.rs | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/helix-term/tests/test/helpers.rs b/helix-term/tests/test/helpers.rs
index a2d53e9d..e8bd6c35 100644
--- a/helix-term/tests/test/helpers.rs
+++ b/helix-term/tests/test/helpers.rs
@@ -143,9 +143,27 @@ pub async fn test_key_sequence_with_input_text<T: Into<TestCase>>(
 
 /// Generates language configs that merge in overrides, like a user language
 /// config. The argument string must be a raw TOML document.
+///
+/// By default, language server configuration is dropped from the languages.toml
+/// document. If a language-server is necessary for a test, it must be explicitly
+/// added in `overrides`.
 pub fn test_syntax_conf(overrides: Option<String>) -> helix_core::syntax::Configuration {
     let mut lang = helix_loader::config::default_lang_config();
 
+    for lang_config in lang
+        .as_table_mut()
+        .expect("Expected languages.toml to be a table")
+        .get_mut("language")
+        .expect("Expected languages.toml to have \"language\" keys")
+        .as_array_mut()
+        .expect("Expected an array of language configurations")
+    {
+        lang_config
+            .as_table_mut()
+            .expect("Expected language config to be a TOML table")
+            .remove("language-server");
+    }
+
     if let Some(overrides) = overrides {
         let override_toml = toml::from_str(&overrides).unwrap();
         lang = helix_loader::merge_toml_values(lang, override_toml, 3);
@@ -236,7 +254,6 @@ pub fn new_readonly_tempfile() -> anyhow::Result<NamedTempFile> {
     Ok(file)
 }
 
-#[derive(Default)]
 pub struct AppBuilder {
     args: Args,
     config: Config,
@@ -244,6 +261,17 @@ pub struct AppBuilder {
     input: Option<(String, Selection)>,
 }
 
+impl Default for AppBuilder {
+    fn default() -> Self {
+        Self {
+            args: Args::default(),
+            config: Config::default(),
+            syn_conf: test_syntax_conf(None),
+            input: None,
+        }
+    }
+}
+
 impl AppBuilder {
     pub fn new() -> Self {
         AppBuilder::default()

From 66238e855666f979306dc8698aeb0f35aaa84776 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 20 Oct 2022 14:27:29 -0500
Subject: [PATCH 357/884] Silence dead_code warning on AppBuilder::with_config

This function is not currently used but is likely to be useful in
the future, so this change silences the dead_code warning.
---
 helix-term/tests/test/helpers.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/helix-term/tests/test/helpers.rs b/helix-term/tests/test/helpers.rs
index e8bd6c35..2c5043d6 100644
--- a/helix-term/tests/test/helpers.rs
+++ b/helix-term/tests/test/helpers.rs
@@ -286,6 +286,8 @@ impl AppBuilder {
         self
     }
 
+    // Remove this attribute once `with_config` is used in a test:
+    #[allow(dead_code)]
     pub fn with_config(mut self, config: Config) -> Self {
         self.config = config;
         self

From e25af1f7441fd1eccae580ba2e8e0eebc2be74f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= <matousdzivjak@gmail.com>
Date: Fri, 21 Oct 2022 01:53:05 +0200
Subject: [PATCH 358/884] feat(view): re-use align_view function (#4390)

---
 helix-view/src/editor.rs | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index cd2b1ad4..fe243b92 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1,4 +1,5 @@
 use crate::{
+    align_view,
     clipboard::{get_clipboard_provider, ClipboardProvider},
     document::{DocumentSavedEventFuture, DocumentSavedEventResult, Mode},
     graphics::{CursorKind, Rect},
@@ -6,7 +7,7 @@ use crate::{
     input::KeyEvent,
     theme::{self, Theme},
     tree::{self, Tree},
-    Document, DocumentId, View, ViewId,
+    Align, Document, DocumentId, View, ViewId,
 };
 
 use futures_util::stream::select_all::SelectAll;
@@ -957,13 +958,7 @@ impl Editor {
         let doc = doc_mut!(self, &doc_id);
         doc.ensure_view_init(view.id);
 
-        // TODO: reuse align_view
-        let pos = doc
-            .selection(view.id)
-            .primary()
-            .cursor(doc.text().slice(..));
-        let line = doc.text().char_to_line(pos);
-        view.offset.row = line.saturating_sub(view.inner_area().height as usize / 2);
+        align_view(doc, view, Align::Center);
     }
 
     pub fn switch(&mut self, id: DocumentId, action: Action) {

From 6a0b450f55675c76d67bfb026caa2df4b601153b Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Thu, 20 Oct 2022 20:22:20 -0400
Subject: [PATCH 359/884] Fix multi byte auto pairs (#4024)

* Fix test::print for Unicode

The print function was not generating correct translations when
the input has Unicode (non-ASCII) in it. This is due to its use of
String::len, which gives the length in bytes, not chars.

* Fix multi-code point auto pairs

The current code for auto pairs is counting offsets by summing the
length of the open and closing chars with char::len_utf8. Unfortunately,
this gives back bytes, and the offset needs to be in chars.

Additionally, it was discovered that there was a preexisting bug where
the selection was not computed correctly in the case that the cursor
was:

1. a single grapheme in width
2. this grapheme was more than one char
3. the direction of the cursor is backwards
4. a secondary range

In this case, the offset was not being added into the anchor. This was
fixed.

* migrate auto pairs tests to integration

* review comments
---
 helix-core/src/auto_pairs.rs        | 594 +---------------------------
 helix-core/src/test.rs              | 127 +++++-
 helix-term/tests/test/auto_pairs.rs | 551 +++++++++++++++++++++++++-
 helix-view/src/clipboard.rs         |   2 +-
 4 files changed, 683 insertions(+), 591 deletions(-)

diff --git a/helix-core/src/auto_pairs.rs b/helix-core/src/auto_pairs.rs
index edc404ac..072c93d0 100644
--- a/helix-core/src/auto_pairs.rs
+++ b/helix-core/src/auto_pairs.rs
@@ -146,13 +146,7 @@ fn prev_char(doc: &Rope, pos: usize) -> Option<char> {
 }
 
 /// calculate what the resulting range should be for an auto pair insertion
-fn get_next_range(
-    doc: &Rope,
-    start_range: &Range,
-    offset: usize,
-    typed_char: char,
-    len_inserted: usize,
-) -> Range {
+fn get_next_range(doc: &Rope, start_range: &Range, offset: usize, len_inserted: usize) -> Range {
     // When the character under the cursor changes due to complete pair
     // insertion, we must look backward a grapheme and then add the length
     // of the insertion to put the resulting cursor in the right place, e.g.
@@ -172,8 +166,8 @@ fn get_next_range(
     // inserting at the very end of the document after the last newline
     if start_range.head == doc.len_chars() && start_range.anchor == doc.len_chars() {
         return Range::new(
-            start_range.anchor + offset + typed_char.len_utf8(),
-            start_range.head + offset + typed_char.len_utf8(),
+            start_range.anchor + offset + 1,
+            start_range.head + offset + 1,
         );
     }
 
@@ -203,21 +197,18 @@ fn get_next_range(
     // trivial case: only inserted a single-char opener, just move the selection
     if len_inserted == 1 {
         let end_anchor = if single_grapheme || start_range.direction() == Direction::Backward {
-            start_range.anchor + offset + typed_char.len_utf8()
+            start_range.anchor + offset + 1
         } else {
             start_range.anchor + offset
         };
 
-        return Range::new(
-            end_anchor,
-            start_range.head + offset + typed_char.len_utf8(),
-        );
+        return Range::new(end_anchor, start_range.head + offset + 1);
     }
 
     // If the head = 0, then we must be in insert mode with a backward
     // cursor, which implies the head will just move
     let end_head = if start_range.head == 0 || start_range.direction() == Direction::Backward {
-        start_range.head + offset + typed_char.len_utf8()
+        start_range.head + offset + 1
     } else {
         // We must have a forward cursor, which means we must move to the
         // other end of the grapheme to get to where the new characters
@@ -243,8 +234,7 @@ fn get_next_range(
 
         (_, Direction::Forward) => {
             if single_grapheme {
-                graphemes::prev_grapheme_boundary(doc.slice(..), start_range.head)
-                    + typed_char.len_utf8()
+                graphemes::prev_grapheme_boundary(doc.slice(..), start_range.head) + 1
 
             // if we are appending, the anchor stays where it is; only offset
             // for multiple range insertions
@@ -258,7 +248,9 @@ fn get_next_range(
                 // if we're backward, then the head is at the first char
                 // of the typed char, so we need to add the length of
                 // the closing char
-                graphemes::prev_grapheme_boundary(doc.slice(..), start_range.anchor) + len_inserted
+                graphemes::prev_grapheme_boundary(doc.slice(..), start_range.anchor)
+                    + len_inserted
+                    + offset
             } else {
                 // when we are inserting in front of a selection, we need to move
                 // the anchor over by however many characters were inserted overall
@@ -279,9 +271,12 @@ fn handle_open(doc: &Rope, selection: &Selection, pair: &Pair) -> Transaction {
         let next_char = doc.get_char(cursor);
         let len_inserted;
 
+        // Since auto pairs are currently limited to single chars, we're either
+        // inserting exactly one or two chars. When arbitrary length pairs are
+        // added, these will need to be changed.
         let change = match next_char {
             Some(_) if !pair.should_close(doc, start_range) => {
-                len_inserted = pair.open.len_utf8();
+                len_inserted = 1;
                 let mut tendril = Tendril::new();
                 tendril.push(pair.open);
                 (cursor, cursor, Some(tendril))
@@ -289,12 +284,12 @@ fn handle_open(doc: &Rope, selection: &Selection, pair: &Pair) -> Transaction {
             _ => {
                 // insert open & close
                 let pair_str = Tendril::from_iter([pair.open, pair.close]);
-                len_inserted = pair.open.len_utf8() + pair.close.len_utf8();
+                len_inserted = 2;
                 (cursor, cursor, Some(pair_str))
             }
         };
 
-        let next_range = get_next_range(doc, start_range, offs, pair.open, len_inserted);
+        let next_range = get_next_range(doc, start_range, offs, len_inserted);
         end_ranges.push(next_range);
         offs += len_inserted;
 
@@ -308,7 +303,6 @@ fn handle_open(doc: &Rope, selection: &Selection, pair: &Pair) -> Transaction {
 
 fn handle_close(doc: &Rope, selection: &Selection, pair: &Pair) -> Transaction {
     let mut end_ranges = SmallVec::with_capacity(selection.len());
-
     let mut offs = 0;
 
     let transaction = Transaction::change_by_selection(doc, selection, |start_range| {
@@ -320,13 +314,13 @@ fn handle_close(doc: &Rope, selection: &Selection, pair: &Pair) -> Transaction {
             // return transaction that moves past close
             (cursor, cursor, None) // no-op
         } else {
-            len_inserted += pair.close.len_utf8();
+            len_inserted = 1;
             let mut tendril = Tendril::new();
             tendril.push(pair.close);
             (cursor, cursor, Some(tendril))
         };
 
-        let next_range = get_next_range(doc, start_range, offs, pair.close, len_inserted);
+        let next_range = get_next_range(doc, start_range, offs, len_inserted);
         end_ranges.push(next_range);
         offs += len_inserted;
 
@@ -362,11 +356,11 @@ fn handle_same(doc: &Rope, selection: &Selection, pair: &Pair) -> Transaction {
                 pair_str.push(pair.close);
             }
 
-            len_inserted += pair_str.len();
+            len_inserted += pair_str.chars().count();
             (cursor, cursor, Some(pair_str))
         };
 
-        let next_range = get_next_range(doc, start_range, offs, pair.open, len_inserted);
+        let next_range = get_next_range(doc, start_range, offs, len_inserted);
         end_ranges.push(next_range);
         offs += len_inserted;
 
@@ -377,551 +371,3 @@ fn handle_same(doc: &Rope, selection: &Selection, pair: &Pair) -> Transaction {
     log::debug!("auto pair transaction: {:#?}", t);
     t
 }
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use smallvec::smallvec;
-
-    const LINE_END: &str = crate::DEFAULT_LINE_ENDING.as_str();
-
-    fn differing_pairs() -> impl Iterator<Item = &'static (char, char)> {
-        DEFAULT_PAIRS.iter().filter(|(open, close)| open != close)
-    }
-
-    fn matching_pairs() -> impl Iterator<Item = &'static (char, char)> {
-        DEFAULT_PAIRS.iter().filter(|(open, close)| open == close)
-    }
-
-    fn test_hooks(
-        in_doc: &Rope,
-        in_sel: &Selection,
-        ch: char,
-        pairs: &[(char, char)],
-        expected_doc: &Rope,
-        expected_sel: &Selection,
-    ) {
-        let pairs = AutoPairs::new(pairs.iter());
-        let trans = hook(in_doc, in_sel, ch, &pairs).unwrap();
-        let mut actual_doc = in_doc.clone();
-        assert!(trans.apply(&mut actual_doc));
-        assert_eq!(expected_doc, &actual_doc);
-        assert_eq!(expected_sel, trans.selection().unwrap());
-    }
-
-    fn test_hooks_with_pairs<I, F, R>(
-        in_doc: &Rope,
-        in_sel: &Selection,
-        test_pairs: I,
-        pairs: &[(char, char)],
-        get_expected_doc: F,
-        actual_sel: &Selection,
-    ) where
-        I: IntoIterator<Item = &'static (char, char)>,
-        F: Fn(char, char) -> R,
-        R: Into<Rope>,
-        Rope: From<R>,
-    {
-        test_pairs.into_iter().for_each(|(open, close)| {
-            test_hooks(
-                in_doc,
-                in_sel,
-                *open,
-                pairs,
-                &Rope::from(get_expected_doc(*open, *close)),
-                actual_sel,
-            )
-        });
-    }
-
-    // [] indicates range
-
-    /// [] -> insert ( -> ([])
-    #[test]
-    fn test_insert_blank() {
-        test_hooks_with_pairs(
-            &Rope::from(LINE_END),
-            &Selection::single(1, 0),
-            DEFAULT_PAIRS,
-            DEFAULT_PAIRS,
-            |open, close| format!("{}{}{}", open, close, LINE_END),
-            &Selection::single(2, 1),
-        );
-
-        let empty_doc = Rope::from(format!("{line_end}{line_end}", line_end = LINE_END));
-
-        test_hooks_with_pairs(
-            &empty_doc,
-            &Selection::single(empty_doc.len_chars(), LINE_END.len()),
-            DEFAULT_PAIRS,
-            DEFAULT_PAIRS,
-            |open, close| {
-                format!(
-                    "{line_end}{open}{close}{line_end}",
-                    open = open,
-                    close = close,
-                    line_end = LINE_END
-                )
-            },
-            &Selection::single(LINE_END.len() + 2, LINE_END.len() + 1),
-        );
-    }
-
-    #[test]
-    fn test_insert_before_multi_code_point_graphemes() {
-        for (_, close) in differing_pairs() {
-            test_hooks(
-                &Rope::from(format!("hello 👨‍👩‍👧‍👦 goodbye{}", LINE_END)),
-                &Selection::single(13, 6),
-                *close,
-                DEFAULT_PAIRS,
-                &Rope::from(format!("hello {}👨‍👩‍👧‍👦 goodbye{}", close, LINE_END)),
-                &Selection::single(14, 7),
-            );
-        }
-    }
-
-    #[test]
-    fn test_insert_at_end_of_document() {
-        test_hooks_with_pairs(
-            &Rope::from(LINE_END),
-            &Selection::single(LINE_END.len(), LINE_END.len()),
-            DEFAULT_PAIRS,
-            DEFAULT_PAIRS,
-            |open, close| format!("{}{}{}", LINE_END, open, close),
-            &Selection::single(LINE_END.len() + 1, LINE_END.len() + 1),
-        );
-
-        test_hooks_with_pairs(
-            &Rope::from(format!("foo{}", LINE_END)),
-            &Selection::single(3 + LINE_END.len(), 3 + LINE_END.len()),
-            DEFAULT_PAIRS,
-            DEFAULT_PAIRS,
-            |open, close| format!("foo{}{}{}", LINE_END, open, close),
-            &Selection::single(LINE_END.len() + 4, LINE_END.len() + 4),
-        );
-    }
-
-    /// [] -> append ( -> ([])
-    #[test]
-    fn test_append_blank() {
-        test_hooks_with_pairs(
-            // this is what happens when you have a totally blank document and then append
-            &Rope::from(format!("{line_end}{line_end}", line_end = LINE_END)),
-            // before inserting the pair, the cursor covers all of both empty lines
-            &Selection::single(0, LINE_END.len() * 2),
-            DEFAULT_PAIRS,
-            DEFAULT_PAIRS,
-            |open, close| {
-                format!(
-                    "{line_end}{open}{close}{line_end}",
-                    line_end = LINE_END,
-                    open = open,
-                    close = close
-                )
-            },
-            // after inserting pair, the cursor covers the first new line and the open char
-            &Selection::single(0, LINE_END.len() + 2),
-        );
-    }
-
-    /// []              ([])
-    /// [] -> insert -> ([])
-    /// []              ([])
-    #[test]
-    fn test_insert_blank_multi_cursor() {
-        test_hooks_with_pairs(
-            &Rope::from("\n\n\n"),
-            &Selection::new(
-                smallvec!(Range::new(1, 0), Range::new(2, 1), Range::new(3, 2),),
-                0,
-            ),
-            DEFAULT_PAIRS,
-            DEFAULT_PAIRS,
-            |open, close| {
-                format!(
-                    "{open}{close}\n{open}{close}\n{open}{close}\n",
-                    open = open,
-                    close = close
-                )
-            },
-            &Selection::new(
-                smallvec!(Range::new(2, 1), Range::new(5, 4), Range::new(8, 7),),
-                0,
-            ),
-        );
-    }
-
-    /// fo[o] -> append ( -> fo[o(])
-    #[test]
-    fn test_append() {
-        test_hooks_with_pairs(
-            &Rope::from("foo\n"),
-            &Selection::single(2, 4),
-            differing_pairs(),
-            DEFAULT_PAIRS,
-            |open, close| format!("foo{}{}\n", open, close),
-            &Selection::single(2, 5),
-        );
-    }
-
-    /// foo[] -> append to end of line ( -> foo([])
-    #[test]
-    fn test_append_single_cursor() {
-        test_hooks_with_pairs(
-            &Rope::from(format!("foo{}", LINE_END)),
-            &Selection::single(3, 3 + LINE_END.len()),
-            differing_pairs(),
-            DEFAULT_PAIRS,
-            |open, close| format!("foo{}{}{}", open, close, LINE_END),
-            &Selection::single(4, 5),
-        );
-    }
-
-    /// fo[o]                fo[o(])
-    /// fo[o] -> append ( -> fo[o(])
-    /// fo[o]                fo[o(])
-    #[test]
-    fn test_append_multi() {
-        test_hooks_with_pairs(
-            &Rope::from("foo\nfoo\nfoo\n"),
-            &Selection::new(
-                smallvec!(Range::new(2, 4), Range::new(6, 8), Range::new(10, 12)),
-                0,
-            ),
-            differing_pairs(),
-            DEFAULT_PAIRS,
-            |open, close| {
-                format!(
-                    "foo{open}{close}\nfoo{open}{close}\nfoo{open}{close}\n",
-                    open = open,
-                    close = close
-                )
-            },
-            &Selection::new(
-                smallvec!(Range::new(2, 5), Range::new(8, 11), Range::new(14, 17)),
-                0,
-            ),
-        );
-    }
-
-    /// ([)] -> insert ) -> ()[]
-    #[test]
-    fn test_insert_close_inside_pair() {
-        for (open, close) in DEFAULT_PAIRS {
-            let doc = Rope::from(format!("{}{}{}", open, close, LINE_END));
-
-            test_hooks(
-                &doc,
-                &Selection::single(2, 1),
-                *close,
-                DEFAULT_PAIRS,
-                &doc,
-                &Selection::single(2 + LINE_END.len(), 2),
-            );
-        }
-    }
-
-    /// [(]) -> append ) -> [()]
-    #[test]
-    fn test_append_close_inside_pair() {
-        for (open, close) in DEFAULT_PAIRS {
-            let doc = Rope::from(format!("{}{}{}", open, close, LINE_END));
-
-            test_hooks(
-                &doc,
-                &Selection::single(0, 2),
-                *close,
-                DEFAULT_PAIRS,
-                &doc,
-                &Selection::single(0, 2 + LINE_END.len()),
-            );
-        }
-    }
-
-    /// ([])                ()[]
-    /// ([]) -> insert ) -> ()[]
-    /// ([])                ()[]
-    #[test]
-    fn test_insert_close_inside_pair_multi_cursor() {
-        let sel = Selection::new(
-            smallvec!(Range::new(2, 1), Range::new(5, 4), Range::new(8, 7),),
-            0,
-        );
-
-        let expected_sel = Selection::new(
-            smallvec!(Range::new(3, 2), Range::new(6, 5), Range::new(9, 8),),
-            0,
-        );
-
-        for (open, close) in DEFAULT_PAIRS {
-            let doc = Rope::from(format!(
-                "{open}{close}\n{open}{close}\n{open}{close}\n",
-                open = open,
-                close = close
-            ));
-
-            test_hooks(&doc, &sel, *close, DEFAULT_PAIRS, &doc, &expected_sel);
-        }
-    }
-
-    /// [(])                [()]
-    /// [(]) -> append ) -> [()]
-    /// [(])                [()]
-    #[test]
-    fn test_append_close_inside_pair_multi_cursor() {
-        let sel = Selection::new(
-            smallvec!(Range::new(0, 2), Range::new(3, 5), Range::new(6, 8),),
-            0,
-        );
-
-        let expected_sel = Selection::new(
-            smallvec!(Range::new(0, 3), Range::new(3, 6), Range::new(6, 9),),
-            0,
-        );
-
-        for (open, close) in DEFAULT_PAIRS {
-            let doc = Rope::from(format!(
-                "{open}{close}\n{open}{close}\n{open}{close}\n",
-                open = open,
-                close = close
-            ));
-
-            test_hooks(&doc, &sel, *close, DEFAULT_PAIRS, &doc, &expected_sel);
-        }
-    }
-
-    /// ([]) -> insert ( -> (([]))
-    #[test]
-    fn test_insert_open_inside_pair() {
-        let sel = Selection::single(2, 1);
-        let expected_sel = Selection::single(3, 2);
-
-        for (open, close) in differing_pairs() {
-            let doc = Rope::from(format!("{}{}", open, close));
-            let expected_doc = Rope::from(format!(
-                "{open}{open}{close}{close}",
-                open = open,
-                close = close
-            ));
-
-            test_hooks(
-                &doc,
-                &sel,
-                *open,
-                DEFAULT_PAIRS,
-                &expected_doc,
-                &expected_sel,
-            );
-        }
-    }
-
-    /// [word(]) -> append ( -> [word((]))
-    #[test]
-    fn test_append_open_inside_pair() {
-        let sel = Selection::single(0, 6);
-        let expected_sel = Selection::single(0, 7);
-
-        for (open, close) in differing_pairs() {
-            let doc = Rope::from(format!("word{}{}", open, close));
-            let expected_doc = Rope::from(format!(
-                "word{open}{open}{close}{close}",
-                open = open,
-                close = close
-            ));
-
-            test_hooks(
-                &doc,
-                &sel,
-                *open,
-                DEFAULT_PAIRS,
-                &expected_doc,
-                &expected_sel,
-            );
-        }
-    }
-
-    /// ([]) -> insert " -> ("[]")
-    #[test]
-    fn test_insert_nested_open_inside_pair() {
-        let sel = Selection::single(2, 1);
-        let expected_sel = Selection::single(3, 2);
-
-        for (outer_open, outer_close) in differing_pairs() {
-            let doc = Rope::from(format!("{}{}", outer_open, outer_close,));
-
-            for (inner_open, inner_close) in matching_pairs() {
-                let expected_doc = Rope::from(format!(
-                    "{}{}{}{}",
-                    outer_open, inner_open, inner_close, outer_close
-                ));
-
-                test_hooks(
-                    &doc,
-                    &sel,
-                    *inner_open,
-                    DEFAULT_PAIRS,
-                    &expected_doc,
-                    &expected_sel,
-                );
-            }
-        }
-    }
-
-    /// [(]) -> append " -> [("]")
-    #[test]
-    fn test_append_nested_open_inside_pair() {
-        let sel = Selection::single(0, 2);
-        let expected_sel = Selection::single(0, 3);
-
-        for (outer_open, outer_close) in differing_pairs() {
-            let doc = Rope::from(format!("{}{}", outer_open, outer_close,));
-
-            for (inner_open, inner_close) in matching_pairs() {
-                let expected_doc = Rope::from(format!(
-                    "{}{}{}{}",
-                    outer_open, inner_open, inner_close, outer_close
-                ));
-
-                test_hooks(
-                    &doc,
-                    &sel,
-                    *inner_open,
-                    DEFAULT_PAIRS,
-                    &expected_doc,
-                    &expected_sel,
-                );
-            }
-        }
-    }
-
-    /// []word -> insert ( -> ([]word
-    #[test]
-    fn test_insert_open_before_non_pair() {
-        test_hooks_with_pairs(
-            &Rope::from("word"),
-            &Selection::single(1, 0),
-            DEFAULT_PAIRS,
-            DEFAULT_PAIRS,
-            |open, _| format!("{}word", open),
-            &Selection::single(2, 1),
-        )
-    }
-
-    /// [wor]d -> insert ( -> ([wor]d
-    #[test]
-    fn test_insert_open_with_selection() {
-        test_hooks_with_pairs(
-            &Rope::from("word"),
-            &Selection::single(3, 0),
-            DEFAULT_PAIRS,
-            DEFAULT_PAIRS,
-            |open, _| format!("{}word", open),
-            &Selection::single(4, 1),
-        )
-    }
-
-    /// [wor]d -> append ) -> [wor)]d
-    #[test]
-    fn test_append_close_inside_non_pair_with_selection() {
-        let sel = Selection::single(0, 4);
-        let expected_sel = Selection::single(0, 5);
-
-        for (_, close) in DEFAULT_PAIRS {
-            let doc = Rope::from("word");
-            let expected_doc = Rope::from(format!("wor{}d", close));
-            test_hooks(
-                &doc,
-                &sel,
-                *close,
-                DEFAULT_PAIRS,
-                &expected_doc,
-                &expected_sel,
-            );
-        }
-    }
-
-    /// foo[ wor]d -> insert ( -> foo([) wor]d
-    #[test]
-    fn test_insert_open_trailing_word_with_selection() {
-        test_hooks_with_pairs(
-            &Rope::from("foo word"),
-            &Selection::single(7, 3),
-            differing_pairs(),
-            DEFAULT_PAIRS,
-            |open, close| format!("foo{}{} word", open, close),
-            &Selection::single(9, 4),
-        )
-    }
-
-    /// foo([) wor]d -> insert ) -> foo()[ wor]d
-    #[test]
-    fn test_insert_close_inside_pair_trailing_word_with_selection() {
-        for (open, close) in differing_pairs() {
-            test_hooks(
-                &Rope::from(format!("foo{}{} word{}", open, close, LINE_END)),
-                &Selection::single(9, 4),
-                *close,
-                DEFAULT_PAIRS,
-                &Rope::from(format!("foo{}{} word{}", open, close, LINE_END)),
-                &Selection::single(9, 5),
-            )
-        }
-    }
-
-    /// we want pairs that are *not* the same char to be inserted after
-    /// a non-pair char, for cases like functions, but for pairs that are
-    /// the same char, we want to *not* insert a pair to handle cases like "I'm"
-    ///
-    /// word[]  -> insert ( -> word([])
-    /// word[]  -> insert ' -> word'[]
-    #[test]
-    fn test_insert_open_after_non_pair() {
-        let doc = Rope::from(format!("word{}", LINE_END));
-        let sel = Selection::single(5, 4);
-        let expected_sel = Selection::single(6, 5);
-
-        test_hooks_with_pairs(
-            &doc,
-            &sel,
-            differing_pairs(),
-            DEFAULT_PAIRS,
-            |open, close| format!("word{}{}{}", open, close, LINE_END),
-            &expected_sel,
-        );
-
-        test_hooks_with_pairs(
-            &doc,
-            &sel,
-            matching_pairs(),
-            DEFAULT_PAIRS,
-            |open, _| format!("word{}{}", open, LINE_END),
-            &expected_sel,
-        );
-    }
-
-    #[test]
-    fn test_configured_pairs() {
-        let test_pairs = &[('`', ':'), ('+', '-')];
-
-        test_hooks_with_pairs(
-            &Rope::from(LINE_END),
-            &Selection::single(1, 0),
-            test_pairs,
-            test_pairs,
-            |open, close| format!("{}{}{}", open, close, LINE_END),
-            &Selection::single(2, 1),
-        );
-
-        let doc = Rope::from(format!("foo`: word{}", LINE_END));
-
-        test_hooks(
-            &doc,
-            &Selection::single(9, 4),
-            ':',
-            test_pairs,
-            &doc,
-            &Selection::single(9, 5),
-        )
-    }
-}
diff --git a/helix-core/src/test.rs b/helix-core/src/test.rs
index 45503107..3e54d2c2 100644
--- a/helix-core/src/test.rs
+++ b/helix-core/src/test.rs
@@ -34,7 +34,7 @@ pub fn print(s: &str) -> (String, Selection) {
     let mut left = String::with_capacity(s.len());
 
     'outer: while let Some(c) = iter.next() {
-        let start = left.len();
+        let start = left.chars().count();
 
         if c != '#' {
             left.push(c);
@@ -63,6 +63,7 @@ pub fn print(s: &str) -> (String, Selection) {
                 left.push(c);
                 continue;
             }
+
             if !head_at_beg {
                 let prev = left.pop().unwrap();
                 if prev != '|' {
@@ -71,15 +72,18 @@ pub fn print(s: &str) -> (String, Selection) {
                     continue;
                 }
             }
+
             iter.next(); // skip "#"
 
             if is_primary {
                 primary_idx = Some(ranges.len());
             }
+
             let (anchor, head) = match head_at_beg {
-                true => (left.len(), start),
-                false => (start, left.len()),
+                true => (left.chars().count(), start),
+                false => (start, left.chars().count()),
             };
+
             ranges.push(Range::new(anchor, head));
             continue 'outer;
         }
@@ -95,6 +99,7 @@ pub fn print(s: &str) -> (String, Selection) {
         Some(i) => i,
         None => panic!("missing primary `#[|]#` {:?}", s),
     };
+
     let selection = Selection::new(ranges, primary);
     (left, selection)
 }
@@ -141,3 +146,119 @@ pub fn plain(s: &str, selection: Selection) -> String {
     }
     out
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn print_single() {
+        assert_eq!(
+            (String::from("hello"), Selection::single(1, 0)),
+            print("#[|h]#ello")
+        );
+        assert_eq!(
+            (String::from("hello"), Selection::single(0, 1)),
+            print("#[h|]#ello")
+        );
+        assert_eq!(
+            (String::from("hello"), Selection::single(4, 0)),
+            print("#[|hell]#o")
+        );
+        assert_eq!(
+            (String::from("hello"), Selection::single(0, 4)),
+            print("#[hell|]#o")
+        );
+        assert_eq!(
+            (String::from("hello"), Selection::single(5, 0)),
+            print("#[|hello]#")
+        );
+        assert_eq!(
+            (String::from("hello"), Selection::single(0, 5)),
+            print("#[hello|]#")
+        );
+    }
+
+    #[test]
+    fn print_multi() {
+        assert_eq!(
+            (
+                String::from("hello"),
+                Selection::new(
+                    SmallVec::from_slice(&[Range::new(1, 0), Range::new(5, 4)]),
+                    0
+                )
+            ),
+            print("#[|h]#ell#(|o)#")
+        );
+        assert_eq!(
+            (
+                String::from("hello"),
+                Selection::new(
+                    SmallVec::from_slice(&[Range::new(0, 1), Range::new(4, 5)]),
+                    0
+                )
+            ),
+            print("#[h|]#ell#(o|)#")
+        );
+        assert_eq!(
+            (
+                String::from("hello"),
+                Selection::new(
+                    SmallVec::from_slice(&[Range::new(2, 0), Range::new(5, 3)]),
+                    0
+                )
+            ),
+            print("#[|he]#l#(|lo)#")
+        );
+        assert_eq!(
+            (
+                String::from("hello\r\nhello\r\nhello\r\n"),
+                Selection::new(
+                    SmallVec::from_slice(&[
+                        Range::new(7, 5),
+                        Range::new(21, 19),
+                        Range::new(14, 12)
+                    ]),
+                    0
+                )
+            ),
+            print("hello#[|\r\n]#hello#(|\r\n)#hello#(|\r\n)#")
+        );
+    }
+
+    #[test]
+    fn print_multi_byte_code_point() {
+        assert_eq!(
+            (String::from("„“"), Selection::single(1, 0)),
+            print("#[|„]#“")
+        );
+        assert_eq!(
+            (String::from("„“"), Selection::single(2, 1)),
+            print("„#[|“]#")
+        );
+        assert_eq!(
+            (String::from("„“"), Selection::single(0, 1)),
+            print("#[„|]#“")
+        );
+        assert_eq!(
+            (String::from("„“"), Selection::single(1, 2)),
+            print("„#[“|]#")
+        );
+        assert_eq!(
+            (String::from("they said „hello“"), Selection::single(11, 10)),
+            print("they said #[|„]#hello“")
+        );
+    }
+
+    #[test]
+    fn print_multi_code_point_grapheme() {
+        assert_eq!(
+            (
+                String::from("hello 👨‍👩‍👧‍👦 goodbye"),
+                Selection::single(13, 6)
+            ),
+            print("hello #[|👨‍👩‍👧‍👦]# goodbye")
+        );
+    }
+}
diff --git a/helix-term/tests/test/auto_pairs.rs b/helix-term/tests/test/auto_pairs.rs
index caf80bd4..f2ab49c7 100644
--- a/helix-term/tests/test/auto_pairs.rs
+++ b/helix-term/tests/test/auto_pairs.rs
@@ -1,22 +1,547 @@
+use helix_core::{auto_pairs::DEFAULT_PAIRS, hashmap};
+
 use super::*;
 
+const LINE_END: &str = helix_core::DEFAULT_LINE_ENDING.as_str();
+
+fn differing_pairs() -> impl Iterator<Item = &'static (char, char)> {
+    DEFAULT_PAIRS.iter().filter(|(open, close)| open != close)
+}
+
+fn matching_pairs() -> impl Iterator<Item = &'static (char, char)> {
+    DEFAULT_PAIRS.iter().filter(|(open, close)| open == close)
+}
+
 #[tokio::test]
-async fn auto_pairs_basic() -> anyhow::Result<()> {
-    test(("#[\n|]#", "i(<esc>", "(#[|)]#\n")).await?;
+async fn insert_basic() -> anyhow::Result<()> {
+    for pair in DEFAULT_PAIRS {
+        test((
+            format!("#[{}|]#", LINE_END),
+            format!("i{}", pair.0),
+            format!("{}#[|{}]#{}", pair.0, pair.1, LINE_END),
+        ))
+        .await?;
+    }
 
-    test_with_config(
-        Args::default(),
-        Config {
-            editor: helix_view::editor::Config {
-                auto_pairs: AutoPairConfig::Enable(false),
-                ..Default::default()
-            },
+    Ok(())
+}
+
+#[tokio::test]
+async fn insert_configured_multi_byte_chars() -> anyhow::Result<()> {
+    // NOTE: these are multi-byte Unicode characters
+    let pairs = hashmap!('„' => '“', '‚' => '‘', '「' => '」');
+
+    let config = Config {
+        editor: helix_view::editor::Config {
+            auto_pairs: AutoPairConfig::Pairs(pairs.clone()),
             ..Default::default()
         },
-        helpers::test_syntax_conf(None),
-        ("#[\n|]#", "i(<esc>", "(#[|\n]#"),
-    )
-    .await?;
+        ..Default::default()
+    };
+
+    for (open, close) in pairs.iter() {
+        test_with_config(
+            Args::default(),
+            config.clone(),
+            helpers::test_syntax_conf(None),
+            (
+                format!("#[{}|]#", LINE_END),
+                format!("i{}", open),
+                format!("{}#[|{}]#{}", open, close, LINE_END),
+            ),
+        )
+        .await?;
+
+        test_with_config(
+            Args::default(),
+            config.clone(),
+            helpers::test_syntax_conf(None),
+            (
+                format!("{}#[{}|]#{}", open, close, LINE_END),
+                format!("i{}", close),
+                format!("{}{}#[|{}]#", open, close, LINE_END),
+            ),
+        )
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn insert_after_word() -> anyhow::Result<()> {
+    for pair in differing_pairs() {
+        test((
+            format!("foo#[{}|]#", LINE_END),
+            format!("i{}", pair.0),
+            format!("foo{}#[|{}]#{}", pair.0, pair.1, LINE_END),
+        ))
+        .await?;
+    }
+
+    for pair in matching_pairs() {
+        test((
+            format!("foo#[{}|]#", LINE_END),
+            format!("i{}", pair.0),
+            format!("foo{}#[|{}]#", pair.0, LINE_END),
+        ))
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn insert_before_word() -> anyhow::Result<()> {
+    for pair in DEFAULT_PAIRS {
+        test((
+            format!("#[f|]#oo{}", LINE_END),
+            format!("i{}", pair.0),
+            format!("{}#[|f]#oo{}", pair.0, LINE_END),
+        ))
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn insert_before_word_selection() -> anyhow::Result<()> {
+    for pair in DEFAULT_PAIRS {
+        test((
+            format!("#[foo|]#{}", LINE_END),
+            format!("i{}", pair.0),
+            format!("{}#[|foo]#{}", pair.0, LINE_END),
+        ))
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn insert_before_word_selection_trailing_word() -> anyhow::Result<()> {
+    for pair in differing_pairs() {
+        test((
+            format!("foo#[ wor|]#{}", LINE_END),
+            format!("i{}", pair.0),
+            format!("foo{}#[|{} wor]#{}", pair.0, pair.1, LINE_END),
+        ))
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn insert_closer_selection_trailing_word() -> anyhow::Result<()> {
+    for pair in differing_pairs() {
+        test((
+            format!("foo{}#[|{} wor]#{}", pair.0, pair.1, LINE_END),
+            format!("i{}", pair.1),
+            format!("foo{}{}#[| wor]#{}", pair.0, pair.1, LINE_END),
+        ))
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn insert_before_eol() -> anyhow::Result<()> {
+    for pair in DEFAULT_PAIRS {
+        test((
+            format!("{0}#[{0}|]#", LINE_END),
+            format!("i{}", pair.0),
+            format!(
+                "{eol}{open}#[|{close}]#{eol}",
+                eol = LINE_END,
+                open = pair.0,
+                close = pair.1
+            ),
+        ))
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn insert_auto_pairs_disabled() -> anyhow::Result<()> {
+    for pair in DEFAULT_PAIRS {
+        test_with_config(
+            Args::default(),
+            Config {
+                editor: helix_view::editor::Config {
+                    auto_pairs: AutoPairConfig::Enable(false),
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+            helpers::test_syntax_conf(None),
+            (
+                format!("#[{}|]#", LINE_END),
+                format!("i{}", pair.0),
+                format!("{}#[|{}]#", pair.0, LINE_END),
+            ),
+        )
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn insert_multi_range() -> anyhow::Result<()> {
+    for pair in DEFAULT_PAIRS {
+        test((
+            format!("#[{eol}|]##({eol}|)##({eol}|)#", eol = LINE_END),
+            format!("i{}", pair.0),
+            format!(
+                "{open}#[|{close}]#{eol}{open}#(|{close})#{eol}{open}#(|{close})#{eol}",
+                open = pair.0,
+                close = pair.1,
+                eol = LINE_END
+            ),
+        ))
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn insert_before_multi_code_point_graphemes() -> anyhow::Result<()> {
+    for pair in differing_pairs() {
+        test((
+            format!("hello #[👨‍👩‍👧‍👦|]# goodbye{}", LINE_END),
+            format!("i{}", pair.1),
+            format!("hello {}#[|👨‍👩‍👧‍👦]# goodbye{}", pair.1, LINE_END),
+        ))
+        .await?;
+    }
+    Ok(())
+}
+
+#[tokio::test]
+async fn insert_at_end_of_document() -> anyhow::Result<()> {
+    for pair in DEFAULT_PAIRS {
+        test(TestCase {
+            in_text: String::from(LINE_END),
+            in_selection: Selection::single(LINE_END.len(), LINE_END.len()),
+            in_keys: format!("i{}", pair.0),
+            out_text: format!("{}{}{}", LINE_END, pair.0, pair.1),
+            out_selection: Selection::single(LINE_END.len() + 1, LINE_END.len() + 2),
+        })
+        .await?;
+
+        test(TestCase {
+            in_text: format!("foo{}", LINE_END),
+            in_selection: Selection::single(3 + LINE_END.len(), 3 + LINE_END.len()),
+            in_keys: format!("i{}", pair.0),
+            out_text: format!("foo{}{}{}", LINE_END, pair.0, pair.1),
+            out_selection: Selection::single(LINE_END.len() + 4, LINE_END.len() + 5),
+        })
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn insert_close_inside_pair() -> anyhow::Result<()> {
+    for pair in DEFAULT_PAIRS {
+        test((
+            format!(
+                "{open}#[{close}|]#{eol}",
+                open = pair.0,
+                close = pair.1,
+                eol = LINE_END
+            ),
+            format!("i{}", pair.1),
+            format!(
+                "{open}{close}#[|{eol}]#",
+                open = pair.0,
+                close = pair.1,
+                eol = LINE_END
+            ),
+        ))
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn insert_close_inside_pair_multi() -> anyhow::Result<()> {
+    for pair in DEFAULT_PAIRS {
+        test((
+            format!(
+                "{open}#[{close}|]#{eol}{open}#({close}|)#{eol}{open}#({close}|)#{eol}",
+                open = pair.0,
+                close = pair.1,
+                eol = LINE_END
+            ),
+            format!("i{}", pair.1),
+            format!(
+                "{open}{close}#[|{eol}]#{open}{close}#(|{eol})#{open}{close}#(|{eol})#",
+                open = pair.0,
+                close = pair.1,
+                eol = LINE_END
+            ),
+        ))
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn insert_nested_open_inside_pair() -> anyhow::Result<()> {
+    for pair in differing_pairs() {
+        test((
+            format!(
+                "{open}#[{close}|]#{eol}",
+                open = pair.0,
+                close = pair.1,
+                eol = LINE_END
+            ),
+            format!("i{}", pair.0),
+            format!(
+                "{open}{open}#[|{close}]#{close}{eol}",
+                open = pair.0,
+                close = pair.1,
+                eol = LINE_END
+            ),
+        ))
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn insert_nested_open_inside_pair_multi() -> anyhow::Result<()> {
+    for outer_pair in DEFAULT_PAIRS {
+        for inner_pair in DEFAULT_PAIRS {
+            if inner_pair.0 == outer_pair.0 {
+                continue;
+            }
+
+            test((
+                format!(
+                    "{outer_open}#[{outer_close}|]#{eol}{outer_open}#({outer_close}|)#{eol}{outer_open}#({outer_close}|)#{eol}",
+                    outer_open = outer_pair.0,
+                    outer_close = outer_pair.1,
+                    eol = LINE_END
+                ),
+                format!("i{}", inner_pair.0),
+                format!(
+                    "{outer_open}{inner_open}#[|{inner_close}]#{outer_close}{eol}{outer_open}{inner_open}#(|{inner_close})#{outer_close}{eol}{outer_open}{inner_open}#(|{inner_close})#{outer_close}{eol}",
+                    outer_open = outer_pair.0,
+                    outer_close = outer_pair.1,
+                    inner_open = inner_pair.0,
+                    inner_close = inner_pair.1,
+                    eol = LINE_END
+                ),
+            ))
+            .await?;
+        }
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn append_basic() -> anyhow::Result<()> {
+    for pair in DEFAULT_PAIRS {
+        test((
+            format!("#[{}|]#", LINE_END),
+            format!("a{}", pair.0),
+            format!(
+                "#[{eol}{open}{close}|]#{eol}",
+                open = pair.0,
+                close = pair.1,
+                eol = LINE_END
+            ),
+        ))
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn append_multi_range() -> anyhow::Result<()> {
+    for pair in DEFAULT_PAIRS {
+        test((
+            format!("#[ |]#{eol}#( |)#{eol}#( |)#{eol}", eol = LINE_END),
+            format!("a{}", pair.0),
+            format!(
+                "#[ {open}{close}|]#{eol}#( {open}{close}|)#{eol}#( {open}{close}|)#{eol}",
+                open = pair.0,
+                close = pair.1,
+                eol = LINE_END
+            ),
+        ))
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn append_close_inside_pair() -> anyhow::Result<()> {
+    for pair in DEFAULT_PAIRS {
+        test((
+            format!(
+                "#[{open}|]#{close}{eol}",
+                open = pair.0,
+                close = pair.1,
+                eol = LINE_END
+            ),
+            format!("a{}", pair.1),
+            format!(
+                "#[{open}{close}{eol}|]#",
+                open = pair.0,
+                close = pair.1,
+                eol = LINE_END
+            ),
+        ))
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn append_close_inside_pair_multi() -> anyhow::Result<()> {
+    for pair in DEFAULT_PAIRS {
+        test((
+            format!(
+                "#[{open}|]#{close}{eol}#({open}|)#{close}{eol}#({open}|)#{close}{eol}",
+                open = pair.0,
+                close = pair.1,
+                eol = LINE_END
+            ),
+            format!("a{}", pair.1),
+            format!(
+                "#[{open}{close}{eol}|]##({open}{close}{eol}|)##({open}{close}{eol}|)#",
+                open = pair.0,
+                close = pair.1,
+                eol = LINE_END
+            ),
+        ))
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn append_end_of_word() -> anyhow::Result<()> {
+    for pair in differing_pairs() {
+        test((
+            format!("fo#[o|]#{}", LINE_END),
+            format!("a{}", pair.0),
+            format!(
+                "fo#[o{open}{close}|]#{eol}",
+                open = pair.0,
+                close = pair.1,
+                eol = LINE_END
+            ),
+        ))
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn append_middle_of_word() -> anyhow::Result<()> {
+    for pair in differing_pairs() {
+        test((
+            format!("#[wo|]#rd{}", LINE_END),
+            format!("a{}", pair.1),
+            format!("#[wo{}r|]#d{}", pair.1, LINE_END),
+        ))
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn append_end_of_word_multi() -> anyhow::Result<()> {
+    for pair in differing_pairs() {
+        test((
+            format!("fo#[o|]#{eol}fo#(o|)#{eol}fo#(o|)#{eol}", eol = LINE_END),
+            format!("a{}", pair.0),
+            format!(
+                "fo#[o{open}{close}|]#{eol}fo#(o{open}{close}|)#{eol}fo#(o{open}{close}|)#{eol}",
+                open = pair.0,
+                close = pair.1,
+                eol = LINE_END
+            ),
+        ))
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn append_inside_nested_pair() -> anyhow::Result<()> {
+    for pair in differing_pairs() {
+        test((
+            format!(
+                "f#[oo{open}|]#{close}{eol}",
+                open = pair.0,
+                close = pair.1,
+                eol = LINE_END
+            ),
+            format!("a{}", pair.0),
+            format!(
+                "f#[oo{open}{open}{close}|]#{close}{eol}",
+                open = pair.0,
+                close = pair.1,
+                eol = LINE_END
+            ),
+        ))
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn append_inside_nested_pair_multi() -> anyhow::Result<()> {
+    for outer_pair in DEFAULT_PAIRS {
+        for inner_pair in DEFAULT_PAIRS {
+            if inner_pair.0 == outer_pair.0 {
+                continue;
+            }
+
+            test((
+                format!(
+                    "f#[oo{outer_open}|]#{outer_close}{eol}f#(oo{outer_open}|)#{outer_close}{eol}f#(oo{outer_open}|)#{outer_close}{eol}",
+                    outer_open = outer_pair.0,
+                    outer_close = outer_pair.1,
+                    eol = LINE_END
+                ),
+                format!("a{}", inner_pair.0),
+                format!(
+                    "f#[oo{outer_open}{inner_open}{inner_close}|]#{outer_close}{eol}f#(oo{outer_open}{inner_open}{inner_close}|)#{outer_close}{eol}f#(oo{outer_open}{inner_open}{inner_close}|)#{outer_close}{eol}",
+                    outer_open = outer_pair.0,
+                    outer_close = outer_pair.1,
+                    inner_open = inner_pair.0,
+                    inner_close = inner_pair.1,
+                    eol = LINE_END
+                ),
+            ))
+            .await?;
+        }
+    }
 
     Ok(())
 }
diff --git a/helix-view/src/clipboard.rs b/helix-view/src/clipboard.rs
index f3d94734..ad6f621a 100644
--- a/helix-view/src/clipboard.rs
+++ b/helix-view/src/clipboard.rs
@@ -17,7 +17,7 @@ pub trait ClipboardProvider: std::fmt::Debug {
 #[cfg(not(windows))]
 macro_rules! command_provider {
     (paste => $get_prg:literal $( , $get_arg:literal )* ; copy => $set_prg:literal $( , $set_arg:literal )* ; ) => {{
-        log::info!(
+        log::debug!(
             "Using {} to interact with the system clipboard",
             if $set_prg != $get_prg { format!("{}+{}", $set_prg, $get_prg)} else { $set_prg.to_string() }
         );

From fbf8078611abc2fa62856c84b758f2943c00cdec Mon Sep 17 00:00:00 2001
From: Greg Troszak <gdtroszak@gmail.com>
Date: Thu, 20 Oct 2022 20:39:30 -0400
Subject: [PATCH 360/884] Clarify use of `HELIX_RUNTIME` (#4382)

---
 README.md           | 11 +++++++++--
 book/src/install.md | 11 ++++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 5847a612..d09bbad5 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ cd helix
 cargo install --path helix-term
 ```
 
-This will install the `hx` binary to `$HOME/.cargo/bin` and build tree-sitter grammars.
+This will install the `hx` binary to `$HOME/.cargo/bin` and build tree-sitter grammars in `./runtime/grammars`.
 
 Helix needs its runtime files so make sure to copy/symlink the `runtime/` directory into the
 config directory (for example `~/.config/helix/runtime` on Linux/macOS, or `%AppData%/helix/runtime` on Windows).
@@ -68,7 +68,14 @@ cd %appdata%\helix
 mklink /D runtime "<helix-repo>\runtime"
 ```
 
-This location can be overridden via the `HELIX_RUNTIME` environment variable.
+The runtime location can be overridden via the `HELIX_RUNTIME` environment variable.
+
+> NOTE: if `HELIX_RUNTIME` is set prior to calling `cargo install --path helix-term`,
+> tree-sitter grammars will be built in `$HELIX_RUNTIME/grammars`.
+
+If you plan on keeping the repo locally, an alternative to copying/symlinking
+runtime files is to set `HELIX_RUNTIME=/path/to/helix/runtime`
+(`HELIX_RUNTIME=$PWD/runtime` if you're in the helix repo directory).
 
 Packages already solve this for you by wrapping the `hx` binary with a wrapper
 that sets the variable to the install dir.
diff --git a/book/src/install.md b/book/src/install.md
index 4e7ea8dc..6e2a1f3d 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -75,7 +75,7 @@ cd helix
 cargo install --path helix-term
 ```
 
-This will install the `hx` binary to `$HOME/.cargo/bin`.
+This will install the `hx` binary to `$HOME/.cargo/bin` and build tree-sitter grammars in `./runtime/grammars`.
 
 Helix also needs its runtime files so make sure to copy/symlink the `runtime/` directory into the
 config directory (for example `~/.config/helix/runtime` on Linux/macOS). This location can be overridden
@@ -103,6 +103,15 @@ cd %appdata%\helix
 mklink /D runtime "<helix-repo>\runtime"
 ```
 
+The runtime location can be overridden via the `HELIX_RUNTIME` environment variable.
+
+> NOTE: if `HELIX_RUNTIME` is set prior to calling `cargo install --path helix-term`,
+> tree-sitter grammars will be built in `$HELIX_RUNTIME/grammars`.
+
+If you plan on keeping the repo locally, an alternative to copying/symlinking
+runtime files is to set `HELIX_RUNTIME=/path/to/helix/runtime`
+(`HELIX_RUNTIME=$PWD/runtime` if you're in the helix repo directory).
+
 To use Helix in desktop environments that supports [XDG desktop menu](https://specifications.freedesktop.org/menu-spec/menu-spec-latest.html), including Gnome and KDE, copy the provided `.desktop` file to the correct folder:
 
 ```bash

From ce399471f047c241c63caba11ce154776df5024c Mon Sep 17 00:00:00 2001
From: Kirawi <67773714+kirawi@users.noreply.github.com>
Date: Thu, 20 Oct 2022 20:58:13 -0400
Subject: [PATCH 361/884] simplify encoding test macro (#4385)

---
 helix-view/src/document.rs | 108 ++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 63 deletions(-)

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index a723b89b..ca07431b 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -1354,84 +1354,66 @@ mod test {
         );
     }
 
-    macro_rules! test_decode {
-        ($label:expr, $label_override:expr) => {
-            let encoding = encoding::Encoding::for_label($label_override.as_bytes()).unwrap();
-            let base_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/encoding");
-            let path = base_path.join(format!("{}_in.txt", $label));
-            let ref_path = base_path.join(format!("{}_in_ref.txt", $label));
-            assert!(path.exists());
-            assert!(ref_path.exists());
-
-            let mut file = std::fs::File::open(path).unwrap();
-            let text = from_reader(&mut file, Some(encoding))
-                .unwrap()
-                .0
-                .to_string();
-            let expectation = std::fs::read_to_string(ref_path).unwrap();
-            assert_eq!(text[..], expectation[..]);
-        };
-    }
-
-    macro_rules! test_encode {
-        ($label:expr, $label_override:expr) => {
-            let encoding = encoding::Encoding::for_label($label_override.as_bytes()).unwrap();
-            let base_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/encoding");
-            let path = base_path.join(format!("{}_out.txt", $label));
-            let ref_path = base_path.join(format!("{}_out_ref.txt", $label));
-            assert!(path.exists());
-            assert!(ref_path.exists());
-
-            let text = Rope::from_str(&std::fs::read_to_string(path).unwrap());
-            let mut buf: Vec<u8> = Vec::new();
-            helix_lsp::block_on(to_writer(&mut buf, encoding, &text)).unwrap();
-
-            let expectation = std::fs::read(ref_path).unwrap();
-            assert_eq!(buf, expectation);
-        };
-    }
-
-    macro_rules! test_decode_fn {
+    macro_rules! decode {
         ($name:ident, $label:expr, $label_override:expr) => {
             #[test]
             fn $name() {
-                test_decode!($label, $label_override);
-            }
+                let encoding = encoding::Encoding::for_label($label_override.as_bytes()).unwrap();
+                let base_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/encoding");
+                let path = base_path.join(format!("{}_in.txt", $label));
+                let ref_path = base_path.join(format!("{}_in_ref.txt", $label));
+                assert!(path.exists());
+                assert!(ref_path.exists());
+
+                let mut file = std::fs::File::open(path).unwrap();
+                let text = from_reader(&mut file, Some(encoding))
+                    .unwrap()
+                    .0
+                    .to_string();
+                let expectation = std::fs::read_to_string(ref_path).unwrap();
+                assert_eq!(text[..], expectation[..]);
+            }  
         };
         ($name:ident, $label:expr) => {
-            #[test]
-            fn $name() {
-                test_decode!($label, $label);
-            }
+            decode!($name, $label, $label);
         };
     }
 
-    macro_rules! test_encode_fn {
+    macro_rules! encode {
         ($name:ident, $label:expr, $label_override:expr) => {
             #[test]
             fn $name() {
-                test_encode!($label, $label_override);
+                let encoding = encoding::Encoding::for_label($label_override.as_bytes()).unwrap();
+                let base_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/encoding");
+                let path = base_path.join(format!("{}_out.txt", $label));
+                let ref_path = base_path.join(format!("{}_out_ref.txt", $label));
+                assert!(path.exists());
+                assert!(ref_path.exists());
+    
+                let text = Rope::from_str(&std::fs::read_to_string(path).unwrap());
+                let mut buf: Vec<u8> = Vec::new();
+                helix_lsp::block_on(to_writer(&mut buf, encoding, &text)).unwrap();
+    
+                let expectation = std::fs::read(ref_path).unwrap();
+                assert_eq!(buf, expectation);
             }
         };
         ($name:ident, $label:expr) => {
-            #[test]
-            fn $name() {
-                test_encode!($label, $label);
-            }
+            encode!($name, $label, $label);
         };
     }
 
-    test_decode_fn!(test_big5_decode, "big5");
-    test_encode_fn!(test_big5_encode, "big5");
-    test_decode_fn!(test_euc_kr_decode, "euc_kr", "EUC-KR");
-    test_encode_fn!(test_euc_kr_encode, "euc_kr", "EUC-KR");
-    test_decode_fn!(test_gb18030_decode, "gb18030");
-    test_encode_fn!(test_gb18030_encode, "gb18030");
-    test_decode_fn!(test_iso_2022_jp_decode, "iso_2022_jp", "ISO-2022-JP");
-    test_encode_fn!(test_iso_2022_jp_encode, "iso_2022_jp", "ISO-2022-JP");
-    test_decode_fn!(test_jis0208_decode, "jis0208", "EUC-JP");
-    test_encode_fn!(test_jis0208_encode, "jis0208", "EUC-JP");
-    test_decode_fn!(test_jis0212_decode, "jis0212", "EUC-JP");
-    test_decode_fn!(test_shift_jis_decode, "shift_jis");
-    test_encode_fn!(test_shift_jis_encode, "shift_jis");
+    decode!(big5_decode, "big5");
+    encode!(big5_encode, "big5");
+    decode!(euc_kr_decode, "euc_kr", "EUC-KR");
+    encode!(euc_kr_encode, "euc_kr", "EUC-KR");
+    decode!(gb18030_decode, "gb18030");
+    encode!(gb18030_encode, "gb18030");
+    decode!(iso_2022_jp_decode, "iso_2022_jp", "ISO-2022-JP");
+    encode!(iso_2022_jp_encode, "iso_2022_jp", "ISO-2022-JP");
+    decode!(jis0208_decode, "jis0208", "EUC-JP");
+    encode!(jis0208_encode, "jis0208", "EUC-JP");
+    decode!(jis0212_decode, "jis0212", "EUC-JP");
+    decode!(shift_jis_decode, "shift_jis");
+    encode!(shift_jis_encode, "shift_jis");
 }

From 8673c1ec0cb4074a1082d4681b655110d5b7facb Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Fri, 7 Oct 2022 01:44:53 +0200
Subject: [PATCH 362/884] sort codeaction by their kind instead of
 alphabetically

---
 helix-term/src/commands/lsp.rs  | 84 ++++++++++++++++++++++++---------
 helix-term/src/ui/completion.rs |  2 +-
 helix-term/src/ui/menu.rs       |  9 +++-
 3 files changed, 70 insertions(+), 25 deletions(-)

diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 3fa5c96f..5fec38d4 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -452,43 +452,83 @@ pub fn code_action(cx: &mut Context) {
     cx.callback(
         future,
         move |editor, compositor, response: Option<lsp::CodeActionResponse>| {
-            let actions = match response {
+            let mut actions = match response {
                 Some(a) => a,
                 None => return,
             };
+
             if actions.is_empty() {
                 editor.set_status("No code actions available");
                 return;
             }
 
-            let mut picker = ui::Menu::new(actions, (), move |editor, code_action, event| {
-                if event != PromptEvent::Validate {
-                    return;
-                }
+            // sort by CodeActionKind
+            // this ensures that the most relevant codeactions (quickfix) show up first
+            // while more situational commands (like refactors) show up later
+            // this behaviour is modeled after the behaviour of vscode (editor/contrib/codeAction/browser/codeActionWidget.ts)
+
+            let mut categories = vec![Vec::new(); 8];
+            for action in actions.drain(..) {
+                let category = match &action {
+                    lsp::CodeActionOrCommand::CodeAction(lsp::CodeAction {
+                        kind: Some(kind),
+                        ..
+                    }) => {
+                        let mut components = kind.as_str().split('.');
+
+                        match components.next() {
+                            Some("quickfix") => 0,
+                            Some("refactor") => match components.next() {
+                                Some("extract") => 1,
+                                Some("inline") => 2,
+                                Some("rewrite") => 3,
+                                Some("move") => 4,
+                                Some("surround") => 5,
+                                _ => 7,
+                            },
+                            Some("source") => 6,
+                            _ => 7,
+                        }
+                    }
+                    _ => 7,
+                };
+
+                categories[category].push(action);
+            }
 
-                // always present here
-                let code_action = code_action.unwrap();
+            for category in categories {
+                actions.extend(category.into_iter())
+            }
 
-                match code_action {
-                    lsp::CodeActionOrCommand::Command(command) => {
-                        log::debug!("code action command: {:?}", command);
-                        execute_lsp_command(editor, command.clone());
+            let mut picker =
+                ui::Menu::new(actions, false, (), move |editor, code_action, event| {
+                    if event != PromptEvent::Validate {
+                        return;
                     }
-                    lsp::CodeActionOrCommand::CodeAction(code_action) => {
-                        log::debug!("code action: {:?}", code_action);
-                        if let Some(ref workspace_edit) = code_action.edit {
-                            log::debug!("edit: {:?}", workspace_edit);
-                            apply_workspace_edit(editor, offset_encoding, workspace_edit);
-                        }
 
-                        // if code action provides both edit and command first the edit
-                        // should be applied and then the command
-                        if let Some(command) = &code_action.command {
+                    // always present here
+                    let code_action = code_action.unwrap();
+
+                    match code_action {
+                        lsp::CodeActionOrCommand::Command(command) => {
+                            log::debug!("code action command: {:?}", command);
                             execute_lsp_command(editor, command.clone());
                         }
+                        lsp::CodeActionOrCommand::CodeAction(code_action) => {
+                            log::debug!("code action: {:?}", code_action);
+                            if let Some(ref workspace_edit) = code_action.edit {
+                                log::debug!("edit: {:?}", workspace_edit);
+                                apply_workspace_edit(editor, offset_encoding, workspace_edit);
+                            }
+
+                            // if code action provides both edit and command first the edit
+                            // should be applied and then the command
+                            if let Some(command) = &code_action.command {
+                                execute_lsp_command(editor, command.clone());
+                            }
+                        }
                     }
-                }
-            });
+                });
             picker.move_down(); // pre-select the first item
 
             let popup = Popup::new("code-action", picker);
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 7348dcf4..2e555e4b 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -97,7 +97,7 @@ impl Completion {
         start_offset: usize,
         trigger_offset: usize,
     ) -> Self {
-        let menu = Menu::new(items, (), move |editor: &mut Editor, item, event| {
+        let menu = Menu::new(items, true, (), move |editor: &mut Editor, item, event| {
             fn item_to_transaction(
                 doc: &Document,
                 item: &CompletionItem,
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index f77f5e80..b60e6454 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -74,6 +74,7 @@ impl<T: Item> Menu<T> {
     // rendering)
     pub fn new(
         options: Vec<T>,
+        sort: bool,
         editor_data: <T as Item>::Data,
         callback_fn: impl Fn(&mut Editor, Option<&T>, MenuEvent) + 'static,
     ) -> Self {
@@ -91,8 +92,12 @@ impl<T: Item> Menu<T> {
             recalculate: true,
         };
 
-        // TODO: scoring on empty input should just use a fastpath
-        menu.score("");
+        if sort {
+            // TODO: scoring on empty input should just use a fastpath
+            menu.score("");
+        } else {
+            menu.matches = (0..menu.options.len()).map(|i| (i, 0)).collect();
+        }
 
         menu
     }

From c70d762a7b6285684dd7c5f39a53f05394369981 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Fri, 7 Oct 2022 12:15:52 +0200
Subject: [PATCH 363/884] sort autocompletins by fuzzy match

---
 helix-term/src/ui/menu.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index b60e6454..f7712e4d 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -117,10 +117,7 @@ impl<T: Item> Menu<T> {
                         .map(|score| (index, score))
                 }),
         );
-        // matches.sort_unstable_by_key(|(_, score)| -score);
-        self.matches.sort_unstable_by_key(|(index, _score)| {
-            self.options[*index].sort_text(&self.editor_data)
-        });
+        self.matches.sort_unstable_by_key(|(_, score)| -score);
 
         // reset cursor position
         self.cursor = None;

From 8d8b5d6624901f34e99407e18fea0b8abbb058aa Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Sat, 8 Oct 2022 14:18:53 +0200
Subject: [PATCH 364/884] use stable sort instead of allocating new vectors

---
 helix-term/src/commands/lsp.rs | 50 ++++++++++++++--------------------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 5fec38d4..add6183f 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -467,38 +467,28 @@ pub fn code_action(cx: &mut Context) {
             // while more situational commands (like refactors) show up later
             // this behaviour is modeled after the behaviour of vscode (editor/contrib/codeAction/browser/codeActionWidget.ts)
 
-            let mut categories = vec![Vec::new(); 8];
-            for action in actions.drain(..) {
-                let category = match &action {
-                    lsp::CodeActionOrCommand::CodeAction(lsp::CodeAction {
-                        kind: Some(kind),
-                        ..
-                    }) => {
-                        let mut components = kind.as_str().split('.');
-
-                        match components.next() {
-                            Some("quickfix") => 0,
-                            Some("refactor") => match components.next() {
-                                Some("extract") => 1,
-                                Some("inline") => 2,
-                                Some("rewrite") => 3,
-                                Some("move") => 4,
-                                Some("surround") => 5,
-                                _ => 7,
-                            },
-                            Some("source") => 6,
+            actions.sort_by_key(|action| match &action {
+                lsp::CodeActionOrCommand::CodeAction(lsp::CodeAction {
+                    kind: Some(kind), ..
+                }) => {
+                    let mut components = kind.as_str().split('.');
+
+                    match components.next() {
+                        Some("quickfix") => 0,
+                        Some("refactor") => match components.next() {
+                            Some("extract") => 1,
+                            Some("inline") => 2,
+                            Some("rewrite") => 3,
+                            Some("move") => 4,
+                            Some("surround") => 5,
                             _ => 7,
-                        }
+                        },
+                        Some("source") => 6,
+                        _ => 7,
                     }
-                    _ => 7,
-                };
-
-                categories[category].push(action);
-            }
-
-            for category in categories {
-                actions.extend(category.into_iter())
-            }
+                }
+                _ => 7,
+            });
 
             let mut picker =
                 ui::Menu::new(actions, false, (), move |editor, code_action, event| {

From dc3527f52df27ae20294ca14bac60994725519aa Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Tue, 11 Oct 2022 19:37:22 +0200
Subject: [PATCH 365/884] use permalink to vscode repo

---
 helix-term/src/commands/lsp.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index add6183f..ecaab169 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -465,7 +465,7 @@ pub fn code_action(cx: &mut Context) {
             // sort by CodeActionKind
             // this ensures that the most relevant codeactions (quickfix) show up first
             // while more situational commands (like refactors) show up later
-            // this behaviour is modeled after the behaviour of vscode (editor/contrib/codeAction/browser/codeActionWidget.ts)
+            // this behaviour is modeled after the behaviour of vscode (https://github.com/microsoft/vscode/blob/eaec601dd69aeb4abb63b9601a6f44308c8d8c6e/src/vs/editor/contrib/codeAction/browser/codeActionWidget.ts)
 
             actions.sort_by_key(|action| match &action {
                 lsp::CodeActionOrCommand::CodeAction(lsp::CodeAction {

From 189aa0bfcfb6841ced946289e112cc9cdd4919a5 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Thu, 13 Oct 2022 20:10:10 +0200
Subject: [PATCH 366/884] never sort menu items when no fuzzy matching is
 possible

---
 helix-term/src/commands/lsp.rs  | 45 ++++++++++++++++-----------------
 helix-term/src/ui/completion.rs |  2 +-
 helix-term/src/ui/menu.rs       | 15 +++--------
 3 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index ecaab169..100fa196 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -490,35 +490,34 @@ pub fn code_action(cx: &mut Context) {
                 _ => 7,
             });
 
-            let mut picker =
-                ui::Menu::new(actions, false, (), move |editor, code_action, event| {
-                    if event != PromptEvent::Validate {
-                        return;
-                    }
+            let mut picker = ui::Menu::new(actions, (), move |editor, code_action, event| {
+                if event != PromptEvent::Validate {
+                    return;
+                }
 
-                    // always present here
-                    let code_action = code_action.unwrap();
+                // always present here
+                let code_action = code_action.unwrap();
 
-                    match code_action {
-                        lsp::CodeActionOrCommand::Command(command) => {
-                            log::debug!("code action command: {:?}", command);
-                            execute_lsp_command(editor, command.clone());
+                match code_action {
+                    lsp::CodeActionOrCommand::Command(command) => {
+                        log::debug!("code action command: {:?}", command);
+                        execute_lsp_command(editor, command.clone());
+                    }
+                    lsp::CodeActionOrCommand::CodeAction(code_action) => {
+                        log::debug!("code action: {:?}", code_action);
+                        if let Some(ref workspace_edit) = code_action.edit {
+                            log::debug!("edit: {:?}", workspace_edit);
+                            apply_workspace_edit(editor, offset_encoding, workspace_edit);
                         }
-                        lsp::CodeActionOrCommand::CodeAction(code_action) => {
-                            log::debug!("code action: {:?}", code_action);
-                            if let Some(ref workspace_edit) = code_action.edit {
-                                log::debug!("edit: {:?}", workspace_edit);
-                                apply_workspace_edit(editor, offset_encoding, workspace_edit);
-                            }
 
-                            // if code action provides both edit and command first the edit
-                            // should be applied and then the command
-                            if let Some(command) = &code_action.command {
-                                execute_lsp_command(editor, command.clone());
-                            }
+                        // if code action provides both edit and command first the edit
+                        // should be applied and then the command
+                        if let Some(command) = &code_action.command {
+                            execute_lsp_command(editor, command.clone());
                         }
                     }
-                });
+                }
+            });
             picker.move_down(); // pre-select the first item
 
             let popup = Popup::new("code-action", picker);
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 2e555e4b..7348dcf4 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -97,7 +97,7 @@ impl Completion {
         start_offset: usize,
         trigger_offset: usize,
     ) -> Self {
-        let menu = Menu::new(items, true, (), move |editor: &mut Editor, item, event| {
+        let menu = Menu::new(items, (), move |editor: &mut Editor, item, event| {
             fn item_to_transaction(
                 doc: &Document,
                 item: &CompletionItem,
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index f7712e4d..4b1155e3 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -74,15 +74,15 @@ impl<T: Item> Menu<T> {
     // rendering)
     pub fn new(
         options: Vec<T>,
-        sort: bool,
         editor_data: <T as Item>::Data,
         callback_fn: impl Fn(&mut Editor, Option<&T>, MenuEvent) + 'static,
     ) -> Self {
-        let mut menu = Self {
+        let matches = (0..options.len()).map(|i| (i, 0)).collect();
+        Self {
             options,
             editor_data,
             matcher: Box::new(Matcher::default()),
-            matches: Vec::new(),
+            matches,
             cursor: None,
             widths: Vec::new(),
             callback_fn: Box::new(callback_fn),
@@ -90,16 +90,7 @@ impl<T: Item> Menu<T> {
             size: (0, 0),
             viewport: (0, 0),
             recalculate: true,
-        };
-
-        if sort {
-            // TODO: scoring on empty input should just use a fastpath
-            menu.score("");
-        } else {
-            menu.matches = (0..menu.options.len()).map(|i| (i, 0)).collect();
         }
-
-        menu
     }
 
     pub fn score(&mut self, pattern: &str) {

From 9af7c1c9f3aa498719bd0fa39d4d35746f23adaa Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Fri, 14 Oct 2022 11:50:09 +0200
Subject: [PATCH 367/884] Sort by fixed diagnostics/is_preffered within
 codeaction categories

---
 helix-term/src/commands/lsp.rs | 128 +++++++++++++++++++++++++--------
 1 file changed, 100 insertions(+), 28 deletions(-)

diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 100fa196..987fc4ce 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -1,6 +1,6 @@
 use helix_lsp::{
     block_on,
-    lsp::{self, DiagnosticSeverity, NumberOrString},
+    lsp::{self, CodeAction, CodeActionOrCommand, DiagnosticSeverity, NumberOrString},
     util::{diagnostic_to_lsp_diagnostic, lsp_pos_to_pos, lsp_range_to_range, range_to_lsp_range},
     OffsetEncoding,
 };
@@ -18,7 +18,7 @@ use crate::{
     },
 };
 
-use std::{borrow::Cow, collections::BTreeMap, path::PathBuf, sync::Arc};
+use std::{borrow::Cow, cmp::Ordering, collections::BTreeMap, path::PathBuf, sync::Arc};
 
 /// Gets the language server that is attached to a document, and
 /// if it's not active displays a status message. Using this macro
@@ -211,7 +211,6 @@ fn sym_picker(
                     Ok(path) => path,
                     Err(_) => {
                         let err = format!("unable to convert URI to filepath: {}", uri);
-                        log::error!("{}", err);
                         cx.editor.set_error(err);
                         return;
                     }
@@ -421,6 +420,63 @@ impl ui::menu::Item for lsp::CodeActionOrCommand {
     }
 }
 
+/// Determines the category of the `CodeAction` using the `CodeAction::kind` field.
+/// Returns a number that represent these categories.
+/// Categories with a lower number should be displayed first.
+///
+///
+/// While the `kind` field is defined as open ended in the LSP spec (any value may be used)
+/// in practice a closed set of common values (mostly suggested in the LSP spec) are used.
+/// VSCode displays each of these categories seperatly (seperated by a heading in the codeactions picker)
+/// to make them easier to navigate. Helix does not display these  headings to the user.
+/// However it does sort code actions by their categories to achieve the same order as the VScode picker,
+/// just without the headings.
+///
+/// The order used here is modeled after the [vscode sourcecode](https://github.com/microsoft/vscode/blob/eaec601dd69aeb4abb63b9601a6f44308c8d8c6e/src/vs/editor/contrib/codeAction/browser/codeActionWidget.ts>)
+fn action_category(action: &CodeActionOrCommand) -> u32 {
+    if let CodeActionOrCommand::CodeAction(CodeAction {
+        kind: Some(kind), ..
+    }) = action
+    {
+        let mut components = kind.as_str().split('.');
+        match components.next() {
+            Some("quickfix") => 0,
+            Some("refactor") => match components.next() {
+                Some("extract") => 1,
+                Some("inline") => 2,
+                Some("rewrite") => 3,
+                Some("move") => 4,
+                Some("surround") => 5,
+                _ => 7,
+            },
+            Some("source") => 6,
+            _ => 7,
+        }
+    } else {
+        7
+    }
+}
+
+fn action_prefered(action: &CodeActionOrCommand) -> bool {
+    matches!(
+        action,
+        CodeActionOrCommand::CodeAction(CodeAction {
+            is_preferred: Some(true),
+            ..
+        })
+    )
+}
+
+fn action_fixes_diagnostics(action: &CodeActionOrCommand) -> bool {
+    matches!(
+        action,
+        CodeActionOrCommand::CodeAction(CodeAction {
+            diagnostics: Some(diagnostics),
+            ..
+        }) if !diagnostics.is_empty()
+    )
+}
+
 pub fn code_action(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
 
@@ -457,37 +513,53 @@ pub fn code_action(cx: &mut Context) {
                 None => return,
             };
 
+            // remove disabled code actions
+            actions.retain(|action| {
+                matches!(
+                    action,
+                    CodeActionOrCommand::Command(_)
+                        | CodeActionOrCommand::CodeAction(CodeAction { disabled: None, .. })
+                )
+            });
+
             if actions.is_empty() {
                 editor.set_status("No code actions available");
                 return;
             }
 
-            // sort by CodeActionKind
-            // this ensures that the most relevant codeactions (quickfix) show up first
-            // while more situational commands (like refactors) show up later
-            // this behaviour is modeled after the behaviour of vscode (https://github.com/microsoft/vscode/blob/eaec601dd69aeb4abb63b9601a6f44308c8d8c6e/src/vs/editor/contrib/codeAction/browser/codeActionWidget.ts)
-
-            actions.sort_by_key(|action| match &action {
-                lsp::CodeActionOrCommand::CodeAction(lsp::CodeAction {
-                    kind: Some(kind), ..
-                }) => {
-                    let mut components = kind.as_str().split('.');
-
-                    match components.next() {
-                        Some("quickfix") => 0,
-                        Some("refactor") => match components.next() {
-                            Some("extract") => 1,
-                            Some("inline") => 2,
-                            Some("rewrite") => 3,
-                            Some("move") => 4,
-                            Some("surround") => 5,
-                            _ => 7,
-                        },
-                        Some("source") => 6,
-                        _ => 7,
-                    }
+            // Sort codeactions into a useful order. This behaviour is only partially described in the LSP spec.
+            // Many details are modeled after vscode because langauge servers are usually tested against it.
+            // VScode sorts the codeaction two times:
+            //
+            // First the codeactions that fix some diagnostics are moved to the front.
+            // If both codeactions fix some diagnostics (or both fix none) the codeaction
+            // that is marked with `is_preffered` is shown first. The codeactions are then shown in seperate
+            // submenus that only contain a certain category (see `action_category`) of actions.
+            //
+            // Below this done in in a single sorting step
+            actions.sort_by(|action1, action2| {
+                // sort actions by category
+                let order = action_category(action1).cmp(&action_category(action2));
+                if order != Ordering::Equal {
+                    return order;
                 }
-                _ => 7,
+                // within the categories sort by relevancy.
+                // Modeled after the `codeActionsComparator` function in vscode:
+                // https://github.com/microsoft/vscode/blob/eaec601dd69aeb4abb63b9601a6f44308c8d8c6e/src/vs/editor/contrib/codeAction/browser/codeAction.ts
+
+                // if one code action fixes a diagnostic but the other one doesn't show it first
+                let order = action_fixes_diagnostics(action1)
+                    .cmp(&action_fixes_diagnostics(action2))
+                    .reverse();
+                if order != Ordering::Equal {
+                    return order;
+                }
+
+                // if one of the codeactions is marked as prefered show it first
+                // otherwise keep the original LSP sorting
+                action_prefered(action1)
+                    .cmp(&action_prefered(action2))
+                    .reverse()
             });
 
             let mut picker = ui::Menu::new(actions, (), move |editor, code_action, event| {

From 4ff5feeb0c6c1ce012aa1179a44f35b6f0df4da1 Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Fri, 21 Oct 2022 04:06:57 +0300
Subject: [PATCH 368/884] Fix shellwords delimiter handling (#4098)

* Fix shellwords delimiter handling

This allows commands such as `:set statusline.center ["file-type"]` to
work. Before the quotes within the list would mess it up.
Also added a test to ensure correct behavior

* Rename Delimiter -> OnWhitespace
---
 helix-core/src/shellwords.rs | 63 +++++++++++++++++++++++++++---------
 1 file changed, 47 insertions(+), 16 deletions(-)

diff --git a/helix-core/src/shellwords.rs b/helix-core/src/shellwords.rs
index 4323039a..afc83496 100644
--- a/helix-core/src/shellwords.rs
+++ b/helix-core/src/shellwords.rs
@@ -3,8 +3,9 @@ use std::borrow::Cow;
 /// Get the vec of escaped / quoted / doublequoted filenames from the input str
 pub fn shellwords(input: &str) -> Vec<Cow<'_, str>> {
     enum State {
-        Normal,
-        NormalEscaped,
+        OnWhitespace,
+        Unquoted,
+        UnquotedEscaped,
         Quoted,
         QuoteEscaped,
         Dquoted,
@@ -13,7 +14,7 @@ pub fn shellwords(input: &str) -> Vec<Cow<'_, str>> {
 
     use State::*;
 
-    let mut state = Normal;
+    let mut state = Unquoted;
     let mut args: Vec<Cow<str>> = Vec::new();
     let mut escaped = String::with_capacity(input.len());
 
@@ -22,31 +23,47 @@ pub fn shellwords(input: &str) -> Vec<Cow<'_, str>> {
 
     for (i, c) in input.char_indices() {
         state = match state {
-            Normal => match c {
+            OnWhitespace => match c {
+                '"' => {
+                    end = i;
+                    Dquoted
+                }
+                '\'' => {
+                    end = i;
+                    Quoted
+                }
                 '\\' => {
                     if cfg!(unix) {
                         escaped.push_str(&input[start..i]);
                         start = i + 1;
-                        NormalEscaped
+                        UnquotedEscaped
                     } else {
-                        Normal
+                        OnWhitespace
                     }
                 }
-                '"' => {
+                c if c.is_ascii_whitespace() => {
                     end = i;
-                    Dquoted
+                    OnWhitespace
                 }
-                '\'' => {
-                    end = i;
-                    Quoted
+                _ => Unquoted,
+            },
+            Unquoted => match c {
+                '\\' => {
+                    if cfg!(unix) {
+                        escaped.push_str(&input[start..i]);
+                        start = i + 1;
+                        UnquotedEscaped
+                    } else {
+                        Unquoted
+                    }
                 }
                 c if c.is_ascii_whitespace() => {
                     end = i;
-                    Normal
+                    OnWhitespace
                 }
-                _ => Normal,
+                _ => Unquoted,
             },
-            NormalEscaped => Normal,
+            UnquotedEscaped => Unquoted,
             Quoted => match c {
                 '\\' => {
                     if cfg!(unix) {
@@ -59,7 +76,7 @@ pub fn shellwords(input: &str) -> Vec<Cow<'_, str>> {
                 }
                 '\'' => {
                     end = i;
-                    Normal
+                    OnWhitespace
                 }
                 _ => Quoted,
             },
@@ -76,7 +93,7 @@ pub fn shellwords(input: &str) -> Vec<Cow<'_, str>> {
                 }
                 '"' => {
                     end = i;
-                    Normal
+                    OnWhitespace
                 }
                 _ => Dquoted,
             },
@@ -195,4 +212,18 @@ mod test {
         ];
         assert_eq!(expected, result);
     }
+
+    #[test]
+    fn test_lists() {
+        let input =
+            r#":set statusline.center ["file-type","file-encoding"] '["list", "in", "qoutes"]'"#;
+        let result = shellwords(input);
+        let expected = vec![
+            Cow::from(":set"),
+            Cow::from("statusline.center"),
+            Cow::from(r#"["file-type","file-encoding"]"#),
+            Cow::from(r#"["list", "in", "qoutes"]"#),
+        ];
+        assert_eq!(expected, result);
+    }
 }

From 7e29ee6daeb86fbd20a8b5eaae30b2e0f868147d Mon Sep 17 00:00:00 2001
From: Charlie Groves <c@sevorg.org>
Date: Thu, 20 Oct 2022 21:35:02 -0400
Subject: [PATCH 369/884] Autosave all when the terminal loses focus (#3178)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Autosave all when the terminal loses focus

* Correct comment on focus config

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>

* Need a block_try_flush_writes in all quit_all paths

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
---
 book/src/configuration.md        |  1 +
 helix-term/src/application.rs    | 12 ++++--
 helix-term/src/commands/typed.rs | 70 ++++++++++++--------------------
 helix-term/src/ui/editor.rs      | 10 ++++-
 helix-view/src/editor.rs         |  3 ++
 5 files changed, 47 insertions(+), 49 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 996c5fb6..9f3fe2fa 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -49,6 +49,7 @@ on unix operating systems.
 | `gutters` | Gutters to display: Available are `diagnostics` and `line-numbers` and `spacer`, note that `diagnostics` also includes other features like breakpoints, 1-width padding will be inserted if gutters is non-empty | `["diagnostics", "line-numbers"]` |
 | `auto-completion` | Enable automatic pop up of auto-completion. | `true` |
 | `auto-format` | Enable automatic formatting on save. | `true` |
+| `auto-save` | Enable automatic saving on focus moving away from Helix. Requires [focus event support](https://github.com/helix-editor/helix/wiki/Terminal-Support) from your terminal. | `false` |
 | `idle-timeout` | Time in milliseconds since last keypress before idle timers trigger. Used for autocompletion, set to 0 for instant. | `400` |
 | `completion-trigger-len` | The min-length of word under cursor to trigger autocompletion | `2` |
 | `auto-info` | Whether to display infoboxes | `true` |
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index b4b4a675..8ee0802f 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -37,8 +37,8 @@ use anyhow::{Context, Error};
 
 use crossterm::{
     event::{
-        DisableBracketedPaste, DisableMouseCapture, EnableBracketedPaste, EnableMouseCapture,
-        Event as CrosstermEvent,
+        DisableBracketedPaste, DisableFocusChange, DisableMouseCapture, EnableBracketedPaste,
+        EnableFocusChange, EnableMouseCapture, Event as CrosstermEvent,
     },
     execute, terminal,
     tty::IsTty,
@@ -102,6 +102,7 @@ fn restore_term() -> Result<(), Error> {
     execute!(
         stdout,
         DisableBracketedPaste,
+        DisableFocusChange,
         terminal::LeaveAlternateScreen
     )?;
     terminal::disable_raw_mode()?;
@@ -925,7 +926,12 @@ impl Application {
     async fn claim_term(&mut self) -> Result<(), Error> {
         terminal::enable_raw_mode()?;
         let mut stdout = stdout();
-        execute!(stdout, terminal::EnterAlternateScreen, EnableBracketedPaste)?;
+        execute!(
+            stdout,
+            terminal::EnterAlternateScreen,
+            EnableBracketedPaste,
+            EnableFocusChange
+        )?;
         execute!(stdout, terminal::Clear(terminal::ClearType::All))?;
         if self.config.load().editor.mouse {
             execute!(stdout, EnableMouseCapture)?;
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index f20e71c2..f154fd38 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -559,17 +559,11 @@ pub(super) fn buffers_remaining_impl(editor: &mut Editor) -> anyhow::Result<()>
     Ok(())
 }
 
-fn write_all_impl(
+pub fn write_all_impl(
     cx: &mut compositor::Context,
-    _args: &[Cow<str>],
-    event: PromptEvent,
-    quit: bool,
     force: bool,
+    write_scratch: bool,
 ) -> anyhow::Result<()> {
-    if event != PromptEvent::Validate {
-        return Ok(());
-    }
-
     let mut errors: Vec<&'static str> = Vec::new();
     let auto_format = cx.editor.config().auto_format;
     let jobs = &mut cx.jobs;
@@ -580,12 +574,13 @@ fn write_all_impl(
         .documents
         .values()
         .filter_map(|doc| {
-            if doc.path().is_none() {
-                errors.push("cannot write a buffer without a filename\n");
+            if !doc.is_modified() {
                 return None;
             }
-
-            if !doc.is_modified() {
+            if doc.path().is_none() {
+                if write_scratch {
+                    errors.push("cannot write a buffer without a filename\n");
+                }
                 return None;
             }
 
@@ -611,20 +606,6 @@ fn write_all_impl(
         cx.editor.save::<PathBuf>(id, None, force)?;
     }
 
-    if quit {
-        cx.block_try_flush_writes()?;
-
-        if !force {
-            buffers_remaining_impl(cx.editor)?;
-        }
-
-        // close all views
-        let views: Vec<_> = cx.editor.tree.views().map(|(view, _)| view.id).collect();
-        for view_id in views {
-            cx.editor.close(view_id);
-        }
-    }
-
     if !errors.is_empty() && !force {
         bail!("{:?}", errors);
     }
@@ -634,49 +615,50 @@ fn write_all_impl(
 
 fn write_all(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    _args: &[Cow<str>],
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
 
-    write_all_impl(cx, args, event, false, false)
+    write_all_impl(cx, false, true)
 }
 
 fn write_all_quit(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    _args: &[Cow<str>],
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
-
-    write_all_impl(cx, args, event, true, false)
+    write_all_impl(cx, false, true)?;
+    quit_all_impl(cx, false)
 }
 
 fn force_write_all_quit(
     cx: &mut compositor::Context,
-    args: &[Cow<str>],
+    _args: &[Cow<str>],
     event: PromptEvent,
 ) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
-
-    write_all_impl(cx, args, event, true, true)
+    let _ = write_all_impl(cx, true, true);
+    quit_all_impl(cx, true)
 }
 
-fn quit_all_impl(editor: &mut Editor, force: bool) -> anyhow::Result<()> {
+fn quit_all_impl(cx: &mut compositor::Context, force: bool) -> anyhow::Result<()> {
+    cx.block_try_flush_writes()?;
     if !force {
-        buffers_remaining_impl(editor)?;
+        buffers_remaining_impl(cx.editor)?;
     }
 
     // close all views
-    let views: Vec<_> = editor.tree.views().map(|(view, _)| view.id).collect();
+    let views: Vec<_> = cx.editor.tree.views().map(|(view, _)| view.id).collect();
     for view_id in views {
-        editor.close(view_id);
+        cx.editor.close(view_id);
     }
 
     Ok(())
@@ -691,8 +673,7 @@ fn quit_all(
         return Ok(());
     }
 
-    cx.block_try_flush_writes()?;
-    quit_all_impl(cx.editor, false)
+    quit_all_impl(cx, false)
 }
 
 fn force_quit_all(
@@ -704,7 +685,7 @@ fn force_quit_all(
         return Ok(());
     }
 
-    quit_all_impl(cx.editor, true)
+    quit_all_impl(cx, true)
 }
 
 fn cquit(
@@ -722,8 +703,7 @@ fn cquit(
         .unwrap_or(1);
 
     cx.editor.exit_code = exit_code;
-    cx.block_try_flush_writes()?;
-    quit_all_impl(cx.editor, false)
+    quit_all_impl(cx, false)
 }
 
 fn force_cquit(
@@ -741,7 +721,7 @@ fn force_cquit(
         .unwrap_or(1);
     cx.editor.exit_code = exit_code;
 
-    quit_all_impl(cx.editor, true)
+    quit_all_impl(cx, true)
 }
 
 fn theme(
@@ -2141,7 +2121,7 @@ pub static TYPABLE_COMMAND_MAP: Lazy<HashMap<&'static str, &'static TypableComma
             .collect()
     });
 
-pub fn command_mode(cx: &mut Context) {
+pub(super) fn command_mode(cx: &mut Context) {
     let mut prompt = Prompt::new(
         ":".into(),
         Some(':'),
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 73dfd52c..43b1e7a0 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1426,7 +1426,15 @@ impl Component for EditorView {
 
             Event::Mouse(event) => self.handle_mouse_event(event, &mut cx),
             Event::IdleTimeout => self.handle_idle_timeout(&mut cx),
-            Event::FocusGained | Event::FocusLost => EventResult::Ignored(None),
+            Event::FocusGained => EventResult::Ignored(None),
+            Event::FocusLost => {
+                if context.editor.config().auto_save {
+                    if let Err(e) = commands::typed::write_all_impl(context, false, false) {
+                        context.editor.set_error(format!("{}", e));
+                    }
+                }
+                EventResult::Consumed(None)
+            }
         }
     }
 
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index fe243b92..af69ceea 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -140,6 +140,8 @@ pub struct Config {
     pub auto_completion: bool,
     /// Automatic formatting on save. Defaults to true.
     pub auto_format: bool,
+    /// Automatic save on focus lost. Defaults to false.
+    pub auto_save: bool,
     /// Time in milliseconds since last keypress before idle timers trigger.
     /// Used for autocompletion, set to 0 for instant. Defaults to 400ms.
     #[serde(
@@ -592,6 +594,7 @@ impl Default for Config {
             auto_pairs: AutoPairConfig::default(),
             auto_completion: true,
             auto_format: true,
+            auto_save: false,
             idle_timeout: Duration::from_millis(400),
             completion_trigger_len: 2,
             auto_info: true,

From 511d9d8a527d8c3dbce6ae1f9a0f5d7beaaf4b28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Fri, 21 Oct 2022 13:26:00 +0900
Subject: [PATCH 370/884] cargo fmt

---
 helix-view/src/document.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index ca07431b..9a7febd2 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -1372,7 +1372,7 @@ mod test {
                     .to_string();
                 let expectation = std::fs::read_to_string(ref_path).unwrap();
                 assert_eq!(text[..], expectation[..]);
-            }  
+            }
         };
         ($name:ident, $label:expr) => {
             decode!($name, $label, $label);
@@ -1389,11 +1389,11 @@ mod test {
                 let ref_path = base_path.join(format!("{}_out_ref.txt", $label));
                 assert!(path.exists());
                 assert!(ref_path.exists());
-    
+
                 let text = Rope::from_str(&std::fs::read_to_string(path).unwrap());
                 let mut buf: Vec<u8> = Vec::new();
                 helix_lsp::block_on(to_writer(&mut buf, encoding, &text)).unwrap();
-    
+
                 let expectation = std::fs::read(ref_path).unwrap();
                 assert_eq!(buf, expectation);
             }

From 74a6a2282e79190baa59cd52907e014b31331819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Fri, 21 Oct 2022 13:27:05 +0900
Subject: [PATCH 371/884] Add undercurl styles to the default theme

---
 theme.toml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/theme.toml b/theme.toml
index ab7c995a..05409319 100644
--- a/theme.toml
+++ b/theme.toml
@@ -72,11 +72,10 @@ label = "honey"
 "ui.menu.selected" = { fg = "revolver", bg = "white" }
 "ui.menu.scroll" = { fg = "lavender", bg = "comet" }
 
-diagnostic = { modifiers = ["underlined"] }
-# "diagnostic.hint" = { fg = "revolver", bg = "lilac" }
-# "diagnostic.info" = { fg = "revolver", bg = "lavender" }
-# "diagnostic.warning" = { fg = "revolver", bg = "honey" }
-# "diagnostic.error" = { fg = "revolver", bg = "apricot" }
+"diagnostic.hint" = { underline = { color = "silver", style = "curl" } }
+"diagnostic.info" = { underline = { color = "delta", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "lightning", style = "curl" } }
+"diagnostic.error" = { underline = { color = "apricot", style = "curl" } }
 
 warning = "lightning"
 error = "apricot"

From f486f34ebe0e21f0e109e24037e73182b2cf510a Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Fri, 21 Oct 2022 00:28:29 -0400
Subject: [PATCH 372/884] flush writes on force quit (#4397)

When force quitting, we need to block on the pending writes to ensure
that write commands succeed before exiting, and also to avoid a crash
when all the views are gone before the auto format call returns from
the LS.
---
 helix-term/src/commands/typed.rs     |  1 +
 helix-term/tests/integration.rs      |  2 +-
 helix-term/tests/test/auto_indent.rs |  2 +-
 helix-term/tests/test/auto_pairs.rs  | 50 ++++++++++++++--------------
 helix-term/tests/test/commands.rs    |  2 +-
 helix-term/tests/test/movement.rs    | 14 ++++----
 helix-term/tests/test/prompt.rs      |  2 +-
 helix-term/tests/test/write.rs       | 14 ++++----
 8 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index f154fd38..394c0733 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -51,6 +51,7 @@ fn force_quit(
 
     ensure!(args.is_empty(), ":quit! takes no arguments");
 
+    cx.block_try_flush_writes()?;
     cx.editor.close(view!(cx.editor).id);
 
     Ok(())
diff --git a/helix-term/tests/integration.rs b/helix-term/tests/integration.rs
index e3754c43..a378af7a 100644
--- a/helix-term/tests/integration.rs
+++ b/helix-term/tests/integration.rs
@@ -11,7 +11,7 @@ mod test {
 
     use self::helpers::*;
 
-    #[tokio::test]
+    #[tokio::test(flavor = "multi_thread")]
     async fn hello_world() -> anyhow::Result<()> {
         test(("#[\n|]#", "ihello world<esc>", "hello world#[|\n]#")).await?;
         Ok(())
diff --git a/helix-term/tests/test/auto_indent.rs b/helix-term/tests/test/auto_indent.rs
index 5c093a5d..d5c220b7 100644
--- a/helix-term/tests/test/auto_indent.rs
+++ b/helix-term/tests/test/auto_indent.rs
@@ -1,6 +1,6 @@
 use super::*;
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn auto_indent_c() -> anyhow::Result<()> {
     test_with_config(
         Args {
diff --git a/helix-term/tests/test/auto_pairs.rs b/helix-term/tests/test/auto_pairs.rs
index f2ab49c7..e18c7119 100644
--- a/helix-term/tests/test/auto_pairs.rs
+++ b/helix-term/tests/test/auto_pairs.rs
@@ -12,7 +12,7 @@ fn matching_pairs() -> impl Iterator<Item = &'static (char, char)> {
     DEFAULT_PAIRS.iter().filter(|(open, close)| open == close)
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn insert_basic() -> anyhow::Result<()> {
     for pair in DEFAULT_PAIRS {
         test((
@@ -26,7 +26,7 @@ async fn insert_basic() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn insert_configured_multi_byte_chars() -> anyhow::Result<()> {
     // NOTE: these are multi-byte Unicode characters
     let pairs = hashmap!('„' => '“', '‚' => '‘', '「' => '」');
@@ -68,7 +68,7 @@ async fn insert_configured_multi_byte_chars() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn insert_after_word() -> anyhow::Result<()> {
     for pair in differing_pairs() {
         test((
@@ -91,7 +91,7 @@ async fn insert_after_word() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn insert_before_word() -> anyhow::Result<()> {
     for pair in DEFAULT_PAIRS {
         test((
@@ -105,7 +105,7 @@ async fn insert_before_word() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn insert_before_word_selection() -> anyhow::Result<()> {
     for pair in DEFAULT_PAIRS {
         test((
@@ -119,7 +119,7 @@ async fn insert_before_word_selection() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn insert_before_word_selection_trailing_word() -> anyhow::Result<()> {
     for pair in differing_pairs() {
         test((
@@ -133,7 +133,7 @@ async fn insert_before_word_selection_trailing_word() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn insert_closer_selection_trailing_word() -> anyhow::Result<()> {
     for pair in differing_pairs() {
         test((
@@ -147,7 +147,7 @@ async fn insert_closer_selection_trailing_word() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn insert_before_eol() -> anyhow::Result<()> {
     for pair in DEFAULT_PAIRS {
         test((
@@ -166,7 +166,7 @@ async fn insert_before_eol() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn insert_auto_pairs_disabled() -> anyhow::Result<()> {
     for pair in DEFAULT_PAIRS {
         test_with_config(
@@ -191,7 +191,7 @@ async fn insert_auto_pairs_disabled() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn insert_multi_range() -> anyhow::Result<()> {
     for pair in DEFAULT_PAIRS {
         test((
@@ -210,7 +210,7 @@ async fn insert_multi_range() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn insert_before_multi_code_point_graphemes() -> anyhow::Result<()> {
     for pair in differing_pairs() {
         test((
@@ -223,7 +223,7 @@ async fn insert_before_multi_code_point_graphemes() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn insert_at_end_of_document() -> anyhow::Result<()> {
     for pair in DEFAULT_PAIRS {
         test(TestCase {
@@ -248,7 +248,7 @@ async fn insert_at_end_of_document() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn insert_close_inside_pair() -> anyhow::Result<()> {
     for pair in DEFAULT_PAIRS {
         test((
@@ -272,7 +272,7 @@ async fn insert_close_inside_pair() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn insert_close_inside_pair_multi() -> anyhow::Result<()> {
     for pair in DEFAULT_PAIRS {
         test((
@@ -296,7 +296,7 @@ async fn insert_close_inside_pair_multi() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn insert_nested_open_inside_pair() -> anyhow::Result<()> {
     for pair in differing_pairs() {
         test((
@@ -320,7 +320,7 @@ async fn insert_nested_open_inside_pair() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn insert_nested_open_inside_pair_multi() -> anyhow::Result<()> {
     for outer_pair in DEFAULT_PAIRS {
         for inner_pair in DEFAULT_PAIRS {
@@ -352,7 +352,7 @@ async fn insert_nested_open_inside_pair_multi() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn append_basic() -> anyhow::Result<()> {
     for pair in DEFAULT_PAIRS {
         test((
@@ -371,7 +371,7 @@ async fn append_basic() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn append_multi_range() -> anyhow::Result<()> {
     for pair in DEFAULT_PAIRS {
         test((
@@ -390,7 +390,7 @@ async fn append_multi_range() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn append_close_inside_pair() -> anyhow::Result<()> {
     for pair in DEFAULT_PAIRS {
         test((
@@ -414,7 +414,7 @@ async fn append_close_inside_pair() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn append_close_inside_pair_multi() -> anyhow::Result<()> {
     for pair in DEFAULT_PAIRS {
         test((
@@ -438,7 +438,7 @@ async fn append_close_inside_pair_multi() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn append_end_of_word() -> anyhow::Result<()> {
     for pair in differing_pairs() {
         test((
@@ -457,7 +457,7 @@ async fn append_end_of_word() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn append_middle_of_word() -> anyhow::Result<()> {
     for pair in differing_pairs() {
         test((
@@ -471,7 +471,7 @@ async fn append_middle_of_word() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn append_end_of_word_multi() -> anyhow::Result<()> {
     for pair in differing_pairs() {
         test((
@@ -490,7 +490,7 @@ async fn append_end_of_word_multi() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn append_inside_nested_pair() -> anyhow::Result<()> {
     for pair in differing_pairs() {
         test((
@@ -514,7 +514,7 @@ async fn append_inside_nested_pair() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn append_inside_nested_pair_multi() -> anyhow::Result<()> {
     for outer_pair in DEFAULT_PAIRS {
         for inner_pair in DEFAULT_PAIRS {
diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index 5238cc69..e24ee3e0 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -94,7 +94,7 @@ async fn test_buffer_close_concurrent() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn test_selection_duplication() -> anyhow::Result<()> {
     // Forward
     test((
diff --git a/helix-term/tests/test/movement.rs b/helix-term/tests/test/movement.rs
index 81c66e53..fedf4b0e 100644
--- a/helix-term/tests/test/movement.rs
+++ b/helix-term/tests/test/movement.rs
@@ -1,6 +1,6 @@
 use super::*;
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn insert_mode_cursor_position() -> anyhow::Result<()> {
     test(TestCase {
         in_text: String::new(),
@@ -19,7 +19,7 @@ async fn insert_mode_cursor_position() -> anyhow::Result<()> {
 }
 
 /// Range direction is preserved when escaping insert mode to normal
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn insert_to_normal_mode_cursor_position() -> anyhow::Result<()> {
     test(("#[f|]#oo\n", "vll<A-;><esc>", "#[|foo]#\n")).await?;
     test((
@@ -66,7 +66,7 @@ async fn insert_to_normal_mode_cursor_position() -> anyhow::Result<()> {
 
 /// Ensure the very initial cursor in an opened file is the width of
 /// the first grapheme
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn cursor_position_newly_opened_file() -> anyhow::Result<()> {
     let test = |content: &str, expected_sel: Selection| -> anyhow::Result<()> {
         let file = helpers::temp_file_with_contents(content)?;
@@ -88,7 +88,7 @@ async fn cursor_position_newly_opened_file() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn cursor_position_append_eof() -> anyhow::Result<()> {
     // Selection is fowards
     test((
@@ -109,7 +109,7 @@ async fn cursor_position_append_eof() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn select_mode_tree_sitter_next_function_is_union_of_objects() -> anyhow::Result<()> {
     test_with_config(
         Args {
@@ -141,7 +141,7 @@ async fn select_mode_tree_sitter_next_function_is_union_of_objects() -> anyhow::
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn select_mode_tree_sitter_prev_function_unselects_object() -> anyhow::Result<()> {
     test_with_config(
         Args {
@@ -173,7 +173,7 @@ async fn select_mode_tree_sitter_prev_function_unselects_object() -> anyhow::Res
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn select_mode_tree_sitter_prev_function_goes_backwards_to_object() -> anyhow::Result<()> {
     // Note: the anchor stays put and the head moves back.
     test_with_config(
diff --git a/helix-term/tests/test/prompt.rs b/helix-term/tests/test/prompt.rs
index 62ec03f1..4f3bf763 100644
--- a/helix-term/tests/test/prompt.rs
+++ b/helix-term/tests/test/prompt.rs
@@ -1,6 +1,6 @@
 use super::*;
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn test_history_completion() -> anyhow::Result<()> {
     test_key_sequence(
         &mut AppBuilder::new().build()?,
diff --git a/helix-term/tests/test/write.rs b/helix-term/tests/test/write.rs
index 6aa51a31..d0128edc 100644
--- a/helix-term/tests/test/write.rs
+++ b/helix-term/tests/test/write.rs
@@ -8,7 +8,7 @@ use helix_view::doc;
 
 use super::*;
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn test_write() -> anyhow::Result<()> {
     let mut file = tempfile::NamedTempFile::new()?;
     let mut app = helpers::AppBuilder::new()
@@ -92,7 +92,7 @@ async fn test_write_concurrent() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn test_write_fail_mod_flag() -> anyhow::Result<()> {
     let file = helpers::new_readonly_tempfile()?;
     let mut app = helpers::AppBuilder::new()
@@ -133,7 +133,7 @@ async fn test_write_fail_mod_flag() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn test_write_scratch_to_new_path() -> anyhow::Result<()> {
     let mut file = tempfile::NamedTempFile::new()?;
 
@@ -158,7 +158,7 @@ async fn test_write_scratch_to_new_path() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn test_write_scratch_no_path_fails() -> anyhow::Result<()> {
     helpers::test_key_sequence_with_input_text(
         None,
@@ -179,7 +179,7 @@ async fn test_write_scratch_no_path_fails() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn test_write_auto_format_fails_still_writes() -> anyhow::Result<()> {
     let mut file = tempfile::Builder::new().suffix(".rs").tempfile()?;
 
@@ -203,7 +203,7 @@ async fn test_write_auto_format_fails_still_writes() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn test_write_new_path() -> anyhow::Result<()> {
     let mut file1 = tempfile::NamedTempFile::new().unwrap();
     let mut file2 = tempfile::NamedTempFile::new().unwrap();
@@ -249,7 +249,7 @@ async fn test_write_new_path() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn test_write_fail_new_path() -> anyhow::Result<()> {
     let file = helpers::new_readonly_tempfile()?;
 

From bad49ef2d095cca88a9e0bd39da329b86bda3d75 Mon Sep 17 00:00:00 2001
From: Nimrod <rodhajaj@gmail.com>
Date: Fri, 21 Oct 2022 06:08:37 +0000
Subject: [PATCH 373/884] Fix unexpected behavior in delete_word_backward and
 delete_word_forward (#4392)

---
 helix-term/src/commands.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index a8dafc33..c5ee72d2 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3238,8 +3238,8 @@ pub mod insert {
         let text = doc.text().slice(..);
 
         let selection = doc.selection(view.id).clone().transform(|range| {
-            let cursor = Range::point(range.cursor(text));
-            let next = movement::move_prev_word_start(text, cursor, count);
+            let anchor = movement::move_prev_word_start(text, range, count).from();
+            let next = Range::new(anchor, range.cursor(text));
             exclude_cursor(text, next, range)
         });
         delete_selection_insert_mode(doc, view, &selection);
@@ -3252,10 +3252,11 @@ pub mod insert {
         let (view, doc) = current!(cx.editor);
         let text = doc.text().slice(..);
 
-        let selection = doc
-            .selection(view.id)
-            .clone()
-            .transform(|range| movement::move_next_word_start(text, range, count));
+        let selection = doc.selection(view.id).clone().transform(|range| {
+            let head = movement::move_next_word_end(text, range, count).to();
+            Range::new(range.cursor(text), head)
+        });
+
         delete_selection_insert_mode(doc, view, &selection);
 
         lsp::signature_help_impl(cx, SignatureHelpInvoked::Automatic);

From 5a848344a9b6f476922ea004e6a7f5b6d32ef768 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Fri, 21 Oct 2022 03:43:22 -0400
Subject: [PATCH 374/884] fix: write-all crash (#4384)

When we do auto formatting, the code that takes the LSP's response and applies
the changes to the document are just getting the currently focused view and
giving that to the function, basically always assuming that the document that
we're applying the change to is in focus, and not in a background view.

This is usually fine for a single view, even if it's a buffer in the
background, because it's still the same view and the selection will get updated
accordingly for when you switch back to it. But it's obviously a problem for
when there are multiple views, because if you don't have the target document in
focus, it will ask the document to update the wrong view, hence the crash.

The problem with this is picking which view to apply any selection change to.
In the absence of any more data points on the views themselves, we simply pick
the first view associated with the document we are saving.
---
 helix-term/src/commands.rs       |  5 +++--
 helix-term/src/commands/typed.rs | 35 ++++++++++++++++++++++++++------
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index c5ee72d2..e44b851e 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2515,19 +2515,20 @@ fn insert_at_line_end(cx: &mut Context) {
 async fn make_format_callback(
     doc_id: DocumentId,
     doc_version: i32,
+    view_id: ViewId,
     format: impl Future<Output = Result<Transaction, FormatterError>> + Send + 'static,
     write: Option<(Option<PathBuf>, bool)>,
 ) -> anyhow::Result<job::Callback> {
     let format = format.await;
 
     let call: job::Callback = Callback::Editor(Box::new(move |editor| {
-        if !editor.documents.contains_key(&doc_id) {
+        if !editor.documents.contains_key(&doc_id) || !editor.tree.contains(view_id) {
             return;
         }
 
         let scrolloff = editor.config().scrolloff;
         let doc = doc_mut!(editor, &doc_id);
-        let view = view_mut!(editor);
+        let view = view_mut!(editor, view_id);
 
         if let Ok(format) = format {
             if doc.version() == doc_version {
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 394c0733..7ea4c801 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -271,7 +271,7 @@ fn write_impl(
 ) -> anyhow::Result<()> {
     let editor_auto_fmt = cx.editor.config().auto_format;
     let jobs = &mut cx.jobs;
-    let doc = doc_mut!(cx.editor);
+    let (view, doc) = current!(cx.editor);
     let path = path.map(AsRef::as_ref);
 
     let fmt = if editor_auto_fmt {
@@ -279,6 +279,7 @@ fn write_impl(
             let callback = make_format_callback(
                 doc.id(),
                 doc.version(),
+                view.id,
                 fmt,
                 Some((path.map(Into::into), force)),
             );
@@ -344,9 +345,9 @@ fn format(
         return Ok(());
     }
 
-    let doc = doc!(cx.editor);
+    let (view, doc) = current!(cx.editor);
     if let Some(format) = doc.format() {
-        let callback = make_format_callback(doc.id(), doc.version(), format, None);
+        let callback = make_format_callback(doc.id(), doc.version(), view.id, format, None);
         cx.jobs.callback(callback);
     }
 
@@ -568,12 +569,13 @@ pub fn write_all_impl(
     let mut errors: Vec<&'static str> = Vec::new();
     let auto_format = cx.editor.config().auto_format;
     let jobs = &mut cx.jobs;
+    let current_view = view!(cx.editor);
 
     // save all documents
     let saves: Vec<_> = cx
         .editor
         .documents
-        .values()
+        .values_mut()
         .filter_map(|doc| {
             if !doc.is_modified() {
                 return None;
@@ -585,10 +587,30 @@ pub fn write_all_impl(
                 return None;
             }
 
+            // Look for a view to apply the formatting change to. If the document
+            // is in the current view, just use that. Otherwise, since we don't
+            // have any other metric available for better selection, just pick
+            // the first view arbitrarily so that we still commit the document
+            // state for undos. If somehow we have a document that has not been
+            // initialized with any view, initialize it with the current view.
+            let target_view = if doc.selections().contains_key(&current_view.id) {
+                current_view.id
+            } else if let Some(view) = doc.selections().keys().next() {
+                *view
+            } else {
+                doc.ensure_view_init(current_view.id);
+                current_view.id
+            };
+
             let fmt = if auto_format {
                 doc.auto_format().map(|fmt| {
-                    let callback =
-                        make_format_callback(doc.id(), doc.version(), fmt, Some((None, force)));
+                    let callback = make_format_callback(
+                        doc.id(),
+                        doc.version(),
+                        target_view,
+                        fmt,
+                        Some((None, force)),
+                    );
                     jobs.add(Job::with_callback(callback).wait_before_exiting());
                 })
             } else {
@@ -598,6 +620,7 @@ pub fn write_all_impl(
             if fmt.is_none() {
                 return Some(doc.id());
             }
+
             None
         })
         .collect();

From 3aea33a4152e8ad1018b7d7019b2d2fde971eea4 Mon Sep 17 00:00:00 2001
From: "Alexis (Poliorcetics) Bourget" <alexis.bourget@gmail.com>
Date: Sat, 15 Oct 2022 18:39:55 +0200
Subject: [PATCH 375/884] nit: move an allocation to happen after a `continue`,
 making sure it's not done for nothing

---
 helix-term/src/application.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 8ee0802f..173c5d49 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -597,14 +597,14 @@ impl Application {
 
                         // trigger textDocument/didOpen for docs that are already open
                         for doc in docs {
-                            let language_id =
-                                doc.language_id().map(ToOwned::to_owned).unwrap_or_default();
-
                             let url = match doc.url() {
                                 Some(url) => url,
                                 None => continue, // skip documents with no path
                             };
 
+                            let language_id =
+                                doc.language_id().map(ToOwned::to_owned).unwrap_or_default();
+
                             tokio::spawn(language_server.text_document_did_open(
                                 url,
                                 doc.version(),

From 34389e1d5472f458934b0af2a15192e2b8d83e1e Mon Sep 17 00:00:00 2001
From: "Alexis (Poliorcetics) Bourget" <alexis.bourget@gmail.com>
Date: Sat, 15 Oct 2022 19:16:17 +0200
Subject: [PATCH 376/884] nit: Do less allocations in `ui::menu::Item::label`
 implementations

This complicates the code a little but it often divides by two the number of allocations done by
the functions. LSP labels especially can easily be called dozens of time in a single menu popup,
when listing references for example.
---
 helix-term/src/commands.rs     | 25 +++++++------
 helix-term/src/commands/lsp.rs | 66 ++++++++++++++++++----------------
 2 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index e44b851e..468e9814 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -54,7 +54,7 @@ use crate::{
 
 use crate::job::{self, Jobs};
 use futures_util::StreamExt;
-use std::{collections::HashMap, fmt, future::Future};
+use std::{collections::HashMap, fmt, fmt::Write, future::Future};
 use std::{collections::HashSet, num::NonZeroUsize};
 
 use std::{
@@ -2416,19 +2416,18 @@ impl ui::menu::Item for MappableCommand {
     type Data = ReverseKeymap;
 
     fn label(&self, keymap: &Self::Data) -> Spans {
-        // formats key bindings, multiple bindings are comma separated,
-        // individual key presses are joined with `+`
         let fmt_binding = |bindings: &Vec<Vec<KeyEvent>>| -> String {
-            bindings
-                .iter()
-                .map(|bind| {
-                    bind.iter()
-                        .map(|key| key.to_string())
-                        .collect::<Vec<String>>()
-                        .join("+")
-                })
-                .collect::<Vec<String>>()
-                .join(", ")
+            bindings.iter().fold(String::new(), |mut acc, bind| {
+                if !acc.is_empty() {
+                    acc.push_str(", ");
+                }
+                bind.iter().fold(false, |needs_plus, key| {
+                    write!(&mut acc, "{}{}", if needs_plus { "+" } else { "" }, key)
+                        .expect("Writing to a string can only fail on an Out-Of-Memory error");
+                    true
+                });
+                acc
+            })
         };
 
         match self {
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 987fc4ce..3c72cd2a 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -18,7 +18,9 @@ use crate::{
     },
 };
 
-use std::{borrow::Cow, cmp::Ordering, collections::BTreeMap, path::PathBuf, sync::Arc};
+use std::{
+    borrow::Cow, cmp::Ordering, collections::BTreeMap, fmt::Write, path::PathBuf, sync::Arc,
+};
 
 /// Gets the language server that is attached to a document, and
 /// if it's not active displays a status message. Using this macro
@@ -43,23 +45,32 @@ impl ui::menu::Item for lsp::Location {
     type Data = PathBuf;
 
     fn label(&self, cwdir: &Self::Data) -> Spans {
-        let file: Cow<'_, str> = (self.uri.scheme() == "file")
-            .then(|| {
-                self.uri
-                    .to_file_path()
-                    .map(|path| {
-                        // strip root prefix
-                        path.strip_prefix(&cwdir)
-                            .map(|path| path.to_path_buf())
-                            .unwrap_or(path)
-                    })
-                    .map(|path| Cow::from(path.to_string_lossy().into_owned()))
-                    .ok()
-            })
-            .flatten()
-            .unwrap_or_else(|| self.uri.as_str().into());
-        let line = self.range.start.line;
-        format!("{}:{}", file, line).into()
+        // The preallocation here will overallocate a few characters since it will account for the
+        // URL's scheme, which is not used most of the time since that scheme will be "file://".
+        // Those extra chars will be used to avoid allocating when writing the line number (in the
+        // common case where it has 5 digits or less, which should be enough for a cast majority
+        // of usages).
+        let mut res = String::with_capacity(self.uri.as_str().len());
+
+        if self.uri.scheme() == "file" {
+            // With the preallocation above and UTF-8 paths already, this closure will do one (1)
+            // allocation, for `to_file_path`, else there will be two (2), with `to_string_lossy`.
+            let mut write_path_to_res = || -> Option<()> {
+                let path = self.uri.to_file_path().ok()?;
+                res.push_str(&path.strip_prefix(&cwdir).unwrap_or(&path).to_string_lossy());
+                Some(())
+            };
+            write_path_to_res();
+        } else {
+            // Never allocates since we declared the string with this capacity already.
+            res.push_str(self.uri.as_str());
+        }
+
+        // Most commonly, this will not allocate, especially on Unix systems where the root prefix
+        // is a simple `/` and not `C:\` (with whatever drive letter)
+        write!(&mut res, ":{}", self.range.start.line)
+            .expect("Will only failed if allocating fail");
+        res.into()
     }
 }
 
@@ -73,10 +84,8 @@ impl ui::menu::Item for lsp::SymbolInformation {
         } else {
             match self.location.uri.to_file_path() {
                 Ok(path) => {
-                    let relative_path = helix_core::path::get_relative_path(path.as_path())
-                        .to_string_lossy()
-                        .into_owned();
-                    format!("{} ({})", &self.name, relative_path).into()
+                    let get_relative_path = path::get_relative_path(path.as_path());
+                    format!("{} ({})", &self.name, get_relative_path.to_string_lossy()).into()
                 }
                 Err(_) => format!("{} ({})", &self.name, &self.location.uri).into(),
             }
@@ -115,24 +124,21 @@ impl ui::menu::Item for PickerDiagnostic {
         // remove background as it is distracting in the picker list
         style.bg = None;
 
-        let code = self
+        let code: Cow<'_, str> = self
             .diag
             .code
             .as_ref()
             .map(|c| match c {
-                NumberOrString::Number(n) => n.to_string(),
-                NumberOrString::String(s) => s.to_string(),
+                NumberOrString::Number(n) => n.to_string().into(),
+                NumberOrString::String(s) => s.as_str().into(),
             })
-            .map(|code| format!(" ({})", code))
             .unwrap_or_default();
 
         let path = match format {
             DiagnosticsFormat::HideSourcePath => String::new(),
             DiagnosticsFormat::ShowSourcePath => {
-                let path = path::get_truncated_path(self.url.path())
-                    .to_string_lossy()
-                    .into_owned();
-                format!("{}: ", path)
+                let path = path::get_truncated_path(self.url.path());
+                format!("{}: ", path.to_string_lossy())
             }
         };
 

From 4b85aeb2b68c0aaf2338d3e0d0ad4daff13a7baf Mon Sep 17 00:00:00 2001
From: Christian Speich <cspeich@emlix.com>
Date: Wed, 19 Oct 2022 10:13:39 +0200
Subject: [PATCH 377/884] grammar: Don't require lower-case (#4346)

Currently we always lower-case the grammar name when loading it. While it
is somewhat of an convention to name tree-sitter grammars in lowercase
there is no rule to enforce it.

This patch removes the lower-casing to allow all possible grammar names.

Signed-off-by: Christian Speich <cspeich@emlix.com>
---
 helix-loader/src/grammar.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/helix-loader/src/grammar.rs b/helix-loader/src/grammar.rs
index eb1895a5..a92cadb6 100644
--- a/helix-loader/src/grammar.rs
+++ b/helix-loader/src/grammar.rs
@@ -67,7 +67,6 @@ pub fn get_language(name: &str) -> Result<Language> {
 #[cfg(not(target_arch = "wasm32"))]
 pub fn get_language(name: &str) -> Result<Language> {
     use libloading::{Library, Symbol};
-    let name = name.to_ascii_lowercase();
     let mut library_path = crate::runtime_dir().join("grammars").join(&name);
     library_path.set_extension(DYLIB_EXTENSION);
 

From 79ef39ab3a41c32fcdcb660df6ee60aeb1eb80e6 Mon Sep 17 00:00:00 2001
From: Christian Speich <cspeich@emlix.com>
Date: Wed, 19 Oct 2022 10:29:09 +0200
Subject: [PATCH 378/884] syntax: Don't force lower-case for filenames (#4346)

Just like for grammars we currently force a lower-case of the name for
some actions (like filesystem lookup). To make this consistent and less
surprising for users, we remove this lower-casing here.

Note: it is still the preferred way to name both language and grammar in
lower-case

Signed-off-by: Christian Speich <cspeich@emlix.com>
---
 helix-core/src/syntax.rs | 26 +++++++++++++++-----------
 xtask/src/querycheck.rs  |  4 ++--
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index f9a2ea5f..21d19ce7 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -361,14 +361,12 @@ pub fn read_query(language: &str, filename: &str) -> String {
 
 impl LanguageConfiguration {
     fn initialize_highlight(&self, scopes: &[String]) -> Option<Arc<HighlightConfiguration>> {
-        let language = self.language_id.to_ascii_lowercase();
-
-        let highlights_query = read_query(&language, "highlights.scm");
+        let highlights_query = read_query(&self.language_id, "highlights.scm");
         // always highlight syntax errors
         // highlights_query += "\n(ERROR) @error";
 
-        let injections_query = read_query(&language, "injections.scm");
-        let locals_query = read_query(&language, "locals.scm");
+        let injections_query = read_query(&self.language_id, "injections.scm");
+        let locals_query = read_query(&self.language_id, "locals.scm");
 
         if highlights_query.is_empty() {
             None
@@ -432,14 +430,20 @@ impl LanguageConfiguration {
     }
 
     fn load_query(&self, kind: &str) -> Option<Query> {
-        let lang_name = self.language_id.to_ascii_lowercase();
-        let query_text = read_query(&lang_name, kind);
+        let query_text = read_query(&self.language_id, kind);
         if query_text.is_empty() {
             return None;
         }
         let lang = self.highlight_config.get()?.as_ref()?.language;
         Query::new(lang, &query_text)
-            .map_err(|e| log::error!("Failed to parse {} queries for {}: {}", kind, lang_name, e))
+            .map_err(|e| {
+                log::error!(
+                    "Failed to parse {} queries for {}: {}",
+                    kind,
+                    self.language_id,
+                    e
+                )
+            })
             .ok()
     }
 }
@@ -2119,7 +2123,7 @@ mod test {
         );
 
         let loader = Loader::new(Configuration { language: vec![] });
-        let language = get_language("Rust").unwrap();
+        let language = get_language("rust").unwrap();
 
         let query = Query::new(language, query_str).unwrap();
         let textobject = TextObjectQuery { query };
@@ -2179,7 +2183,7 @@ mod test {
 
         let loader = Loader::new(Configuration { language: vec![] });
 
-        let language = get_language("Rust").unwrap();
+        let language = get_language("rust").unwrap();
         let config = HighlightConfiguration::new(
             language,
             &std::fs::read_to_string("../runtime/grammars/sources/rust/queries/highlights.scm")
@@ -2275,7 +2279,7 @@ mod test {
         let source = Rope::from_str(source);
 
         let loader = Loader::new(Configuration { language: vec![] });
-        let language = get_language("Rust").unwrap();
+        let language = get_language("rust").unwrap();
 
         let config = HighlightConfiguration::new(language, "", "", "").unwrap();
         let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader));
diff --git a/xtask/src/querycheck.rs b/xtask/src/querycheck.rs
index 5595b8ec..7014c7d6 100644
--- a/xtask/src/querycheck.rs
+++ b/xtask/src/querycheck.rs
@@ -14,8 +14,8 @@ pub fn query_check() -> Result<(), DynError> {
     ];
 
     for language in lang_config().language {
-        let language_name = language.language_id.to_ascii_lowercase();
-        let grammar_name = language.grammar.unwrap_or(language.language_id);
+        let language_name = &language.language_id;
+        let grammar_name = language.grammar.as_ref().unwrap_or(language_name);
         for query_file in query_files {
             let language = get_language(&grammar_name);
             let query_text = read_query(&language_name, query_file);

From 664064b3cca49479c3e893f4865e64cb587d2f61 Mon Sep 17 00:00:00 2001
From: Sora <dream@neoncity.dev>
Date: Sat, 22 Oct 2022 00:32:29 +0200
Subject: [PATCH 379/884] Add textobjects.scm for zig (#4409)

---
 book/src/generated/lang-support.md  |  2 +-
 runtime/queries/zig/textobjects.scm | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/zig/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index c6edc66d..caf5d525 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -126,4 +126,4 @@
 | wgsl | ✓ |  |  | `wgsl_analyzer` |
 | xit | ✓ |  |  |  |
 | yaml | ✓ |  | ✓ | `yaml-language-server` |
-| zig | ✓ |  | ✓ | `zls` |
+| zig | ✓ | ✓ | ✓ | `zls` |
diff --git a/runtime/queries/zig/textobjects.scm b/runtime/queries/zig/textobjects.scm
new file mode 100644
index 00000000..67528943
--- /dev/null
+++ b/runtime/queries/zig/textobjects.scm
@@ -0,0 +1,23 @@
+(TopLevelDecl (FnProto)
+  (_) @function.inside) @function.around
+
+(TestDecl (_) @test.inside) @test.around
+
+; matches all of: struct, enum, union
+; this unfortunately cannot be split up because
+; of the way struct "container" types are defined
+(TopLevelDecl (VarDecl (ErrorUnionExpr (SuffixExpr (ContainerDecl
+    (_) @class.inside))))) @class.around
+
+(TopLevelDecl (VarDecl (ErrorUnionExpr (SuffixExpr (ErrorSetDecl
+    (_) @class.inside))))) @class.around
+
+(ParamDeclList
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+[
+  (doc_comment)
+  (line_comment)
+] @comment.inside
+(line_comment)+ @comment.around
+(doc_comment)+ @comment.around

From a449192ee9fb6ed59530b3c95e96d2211e6b7e5d Mon Sep 17 00:00:00 2001
From: PORTALSURFER <41680373+PORTALSURFER@users.noreply.github.com>
Date: Sat, 22 Oct 2022 00:35:02 +0200
Subject: [PATCH 380/884] Added 2 new themes (#4367)

---
 runtime/themes/hex_steel.toml | 105 ++++++++++++++++++++++++++++++++++
 runtime/themes/hex_toxic.toml |  30 ++++++++++
 2 files changed, 135 insertions(+)
 create mode 100644 runtime/themes/hex_steel.toml
 create mode 100644 runtime/themes/hex_toxic.toml

diff --git a/runtime/themes/hex_steel.toml b/runtime/themes/hex_steel.toml
new file mode 100644
index 00000000..06e91d01
--- /dev/null
+++ b/runtime/themes/hex_steel.toml
@@ -0,0 +1,105 @@
+"comment" = { fg = "highlight_three" }
+"comment.block.documentation" = { bg = "t4", modifiers = ["italic"] }
+
+"constant" = { fg = "t11" }
+"function" = { fg = "t10" }
+"function.method" = { fg = "t10" }
+"function.macro" = { fg = "t7" }
+"keyword.storage.modifier" = { fg = "t7" }
+"keyword.control.import" = { fg = "t8" }
+"keyword.control" = { fg = "t8" }
+"keyword.function" = { fg = "t7" }
+"keyword" = { fg = "t6" }
+"operator" = { fg = "t8" }
+"punctuation" = { fg = "t9" }
+"string" = { fg = "t6", modifiers = ["italic"] }
+"string.regexp" = { fg = "t6" }
+"tag" = { fg = "t4" }
+"type" = { fg = "t8", modifiers = ["bold"] }
+"namespace" = { fg = "t6", modifiers = ["bold"] }
+"variable" = { fg = "t4" }
+"label" = { fg = "t4" }
+
+"diff.plus" = { fg = "t4" }
+"diff.delta" = { fg = "t4" }
+"diff.minus" = { fg = "t4" }
+
+"ui.cursor.insert" = { fg = "t2", bg = "highlight" }
+"ui.cursor.select" = { fg = "t2", bg = "highlight_two" }
+"ui.cursor" = { fg = "t1", bg = "highlight_three" }
+"ui.cursor.match" = { fg = "highlight", bg = "t1", modifiers = ["bold"] }
+
+"ui.linenr" = { fg = "t3", bg = "t1" }
+"ui.linenr.selected" = { fg = "highlight_three", bg = "t1" }
+"ui.gutter" = { bg = "t1" }
+
+"ui.background" = { fg = "t4", bg = "t2" }
+"ui.background.separator" = { fg = "t3" }
+"ui.help" = { fg = "t4", bg = "t1" }
+"ui.menu" = { fg = "t4", bg = "t1" }
+"ui.menu.selected" = { fg = "highlight_three", bg = "t1" }
+"ui.popup" = { fg = "t4", bg = "t1" }
+"ui.window" = { fg = "t4" }
+
+"ui.selection.primary" = { bg = "selection" }
+"ui.selection" = { bg = "selection" }
+
+"ui.cursorline.primary" = { bg = "t1" }
+
+"ui.statusline" = { fg = "t4", bg = "t1" }
+"ui.statusline.inactive" = { fg = "t4", bg = "t1" }
+"ui.statusline.normal" = { fg = "t3", bg = "t1" }
+"ui.statusline.insert" = { fg = "t3", bg = "t1" }
+"ui.statusline.select" = { fg = "highlight", bg = "t4" }
+
+"ui.text" = { fg = "t4" }
+"ui.text.focus" = { fg = "highlight_three", modifiers = ["bold"] }
+#
+"ui.virtual.ruler" = { bg = "t1" }
+"ui.virtual.indent-guide" = { fg = "t3" }
+"ui.virtual.whitespace" = { fg = "t3" }
+
+"diagnostic" = { modifiers = ["underlined"] }
+"error" = { fg = "error", modifiers = ["bold"] }
+"warning" = { fg = "warning", modifiers = ["bold"] }
+"info" = { fg = "info", modifiers = ["bold"] }
+"hint" = { fg = "display", modifiers = ["bold"] }
+"special" = { fg = "t7", modifiers = ["bold"] }
+
+"markup.heading" = { fg = "t4" }
+"markup.list" = { fg = "t4" }
+"markup.bold" = { fg = "t4" }
+"markup.italic" = { fg = "t4" }
+"markup.link.url" = { fg = "t4", modifiers = ["underlined"] }
+"markup.link.text" = { fg = "t4" }
+"markup.quote" = { fg = "t4" }
+"markup.raw" = { fg = "t4" }
+
+[palette]
+t1 = "#0f0b0b"
+t2 = "#161010"
+t3 = "#5b5555"
+t4 = "#656869"
+t5 = "#727b7c"
+t6 = "#6e8789"
+t7 = "#d85c60"
+t8 = "#9bc1bb"
+t9 = "#b5c5c5"
+t10 = "#c0d0ce"
+t11 = "#f78c5e"
+
+highlight = "#3f36f2"
+highlight_two = "#f69c3c"
+highlight_three = "#d4d987"
+
+selection = "#032d4a"
+
+black = "#000000"
+
+comment = "#396884"
+comment_doc = "#234048"
+
+error = "#ff0900"
+warning = "#ffbf00"
+display = "#57ff89"
+info = "#dad7d5"
diff --git a/runtime/themes/hex_toxic.toml b/runtime/themes/hex_toxic.toml
new file mode 100644
index 00000000..3cd878be
--- /dev/null
+++ b/runtime/themes/hex_toxic.toml
@@ -0,0 +1,30 @@
+inherits = "hex_steel"
+
+[palette]
+t1 = "#101719"
+t2 = "#152432"
+t3 = "#4b5968"
+t4 = "#8792ab"
+t5 = "#6f91bc"
+t6 = "#8bb2b9"
+t7 = "#eeac90"
+t8 = "#b0bd9f"
+t9 = "#b3ccd0"
+t10 = "#b0d4d8"
+t11 = "#ffbf52"
+
+highlight = "#ff2e5f"
+highlight_two = "#0affa9"
+highlight_three = "#d7ff52"
+
+black = "#000000"
+
+selection = "#290019"
+
+comment = "#396884"
+comment_doc = "#234048"
+
+error = "#ff0900"
+warning = "#ffbf00"
+display = "#57ff89"
+info = "#dad7d5"

From 131d8392bbc3301ac4e0a392d92d08b08757b720 Mon Sep 17 00:00:00 2001
From: Mehedi Hasan <78611383+mehedir137@users.noreply.github.com>
Date: Sat, 22 Oct 2022 04:37:10 +0600
Subject: [PATCH 381/884] Theme: Papercolor: Fixed cursorline background
 (#4317)

---
 runtime/themes/papercolor-dark.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/themes/papercolor-dark.toml b/runtime/themes/papercolor-dark.toml
index 18a47292..940aacfe 100644
--- a/runtime/themes/papercolor-dark.toml
+++ b/runtime/themes/papercolor-dark.toml
@@ -97,7 +97,7 @@ bright6="#00afaf"
 bright7="#5f8787"
 selection_foreground="#585858"
 selection_background="#8787AF"
-cursorline_background="#d0d0d0"
+cursorline_background="#303030"
 paper_bar_bg="#5F8787"
 black="#1c1c1c"
 red="#af005f"

From 17daf6ac0a1a7ef4a44078ef11cc150a8fa41ff0 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Fri, 21 Oct 2022 19:34:15 -0500
Subject: [PATCH 382/884] Change syntax for suffix file-types configurations
 (#4414)

The change in d801a6693c3d475b3942f705d3ef48d7966bdf65 to search for
suffixes in `file-types` is too permissive: files like the tutor or
`*.txt` files are now mistakenly interpreted as R or perl,
respectively.

This change changes the syntax for specifying a file-types entry that
matches by suffix:

```toml
file-types = [{ suffix = ".git/config" }]
```

And changes the file-type detection to first search for any non-suffix
patterns and then search for suffixes only with the file-types entries
marked explicitly as suffixes.
---
 book/src/languages.md    |  28 ++++++++++-
 helix-core/src/syntax.rs | 102 ++++++++++++++++++++++++++++++++++-----
 languages.toml           |   5 +-
 3 files changed, 119 insertions(+), 16 deletions(-)

diff --git a/book/src/languages.md b/book/src/languages.md
index 9b90a211..133e6447 100644
--- a/book/src/languages.md
+++ b/book/src/languages.md
@@ -50,7 +50,7 @@ These configuration keys are available:
 | `name`                | The name of the language                                      |
 | `scope`               | A string like `source.js` that identifies the language. Currently, we strive to match the scope names used by popular TextMate grammars and by the Linguist library. Usually `source.<name>` or `text.<name>` in case of markup languages |
 | `injection-regex`     | regex pattern that will be tested against a language name in order to determine whether this language should be used for a potential [language injection][treesitter-language-injection] site. |
-| `file-types`          | The filetypes of the language, for example `["yml", "yaml"]`. This attempts to match by exact file name (`.zshrc`), then by file extension (`toml`), then by path suffix (`.git/config`). |
+| `file-types`          | The filetypes of the language, for example `["yml", "yaml"]`. See the file-type detection section below. |
 | `shebangs`            | The interpreters from the shebang line, for example `["sh", "bash"]` |
 | `roots`               | A set of marker files to look for when trying to find the workspace root. For example `Cargo.lock`, `yarn.lock` |
 | `auto-format`         | Whether to autoformat this language when saving               |
@@ -63,6 +63,32 @@ These configuration keys are available:
 | `formatter`           | The formatter for the language, it will take precedence over the lsp when defined. The formatter must be able to take the original file as input from stdin and write the formatted file to stdout |
 | `max-line-length`     | Maximum line length. Used for the `:reflow` command           |
 
+### File-type detection and the `file-types` key
+
+Helix determines which language configuration to use with the `file-types` key
+from the above section. `file-types` is a list of strings or tables, for
+example:
+
+```toml
+file-types = ["Makefile", "toml", { suffix = ".git/config" }]
+```
+
+When determining a language configuration to use, Helix searches the file-types
+with the following priorities:
+
+1. Exact match: if the filename of a file is an exact match of a string in a
+   `file-types` list, that language wins. In the example above, `"Makefile"`
+   will match against `Makefile` files.
+2. Extension: if there are no exact matches, any `file-types` string that
+   matches the file extension of a given file wins. In the example above, the
+   `"toml"` matches files like `Cargo.toml` or `languages.toml`.
+3. Suffix: if there are still no matches, any values in `suffix` tables
+   are checked against the full path of the given file. In the example above,
+   the `{ suffix = ".git/config" }` would match against any `config` files
+   in `.git` directories. Note: `/` is used as the directory separator but is
+   replaced at runtime with the appropriate path separator for the operating
+   system, so this rule would match against `.git\config` files on Windows.
+
 ### Language Server configuration
 
 The `language-server` field takes the following keys:
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 21d19ce7..c17655a9 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -73,11 +73,11 @@ impl Default for Configuration {
 pub struct LanguageConfiguration {
     #[serde(rename = "name")]
     pub language_id: String, // c-sharp, rust
-    pub scope: String,           // source.rust
-    pub file_types: Vec<String>, // filename ends_with? <Gemfile, rb, etc>
+    pub scope: String,             // source.rust
+    pub file_types: Vec<FileType>, // filename extension or ends_with? <Gemfile, rb, etc>
     #[serde(default)]
     pub shebangs: Vec<String>, // interpreter(s) associated with language
-    pub roots: Vec<String>,      // these indicate project roots <.git, Cargo.toml>
+    pub roots: Vec<String>,        // these indicate project roots <.git, Cargo.toml>
     pub comment_token: Option<String>,
     pub max_line_length: Option<usize>,
 
@@ -125,6 +125,78 @@ pub struct LanguageConfiguration {
     pub rulers: Option<Vec<u16>>, // if set, override editor's rulers
 }
 
+#[derive(Debug, PartialEq, Eq, Hash)]
+pub enum FileType {
+    /// The extension of the file, either the `Path::extension` or the full
+    /// filename if the file does not have an extension.
+    Extension(String),
+    /// The suffix of a file. This is compared to a given file's absolute
+    /// path, so it can be used to detect files based on their directories.
+    Suffix(String),
+}
+
+impl Serialize for FileType {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        use serde::ser::SerializeMap;
+
+        match self {
+            FileType::Extension(extension) => serializer.serialize_str(extension),
+            FileType::Suffix(suffix) => {
+                let mut map = serializer.serialize_map(Some(1))?;
+                map.serialize_entry("suffix", &suffix.replace(std::path::MAIN_SEPARATOR, "/"))?;
+                map.end()
+            }
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for FileType {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::de::Deserializer<'de>,
+    {
+        struct FileTypeVisitor;
+
+        impl<'de> serde::de::Visitor<'de> for FileTypeVisitor {
+            type Value = FileType;
+
+            fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+                formatter.write_str("string or table")
+            }
+
+            fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
+            where
+                E: serde::de::Error,
+            {
+                Ok(FileType::Extension(value.to_string()))
+            }
+
+            fn visit_map<M>(self, mut map: M) -> Result<Self::Value, M::Error>
+            where
+                M: serde::de::MapAccess<'de>,
+            {
+                match map.next_entry::<String, String>()? {
+                    Some((key, suffix)) if key == "suffix" => Ok(FileType::Suffix(
+                        suffix.replace('/', &std::path::MAIN_SEPARATOR.to_string()),
+                    )),
+                    Some((key, _value)) => Err(serde::de::Error::custom(format!(
+                        "unknown key in `file-types` list: {}",
+                        key
+                    ))),
+                    None => Err(serde::de::Error::custom(
+                        "expected a `suffix` key in the `file-types` entry",
+                    )),
+                }
+            }
+        }
+
+        deserializer.deserialize_any(FileTypeVisitor)
+    }
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct LanguageServerConfiguration {
@@ -454,7 +526,8 @@ impl LanguageConfiguration {
 pub struct Loader {
     // highlight_names ?
     language_configs: Vec<Arc<LanguageConfiguration>>,
-    language_config_ids_by_file_type: HashMap<String, usize>, // Vec<usize>
+    language_config_ids_by_extension: HashMap<String, usize>, // Vec<usize>
+    language_config_ids_by_suffix: HashMap<String, usize>,
     language_config_ids_by_shebang: HashMap<String, usize>,
 
     scopes: ArcSwap<Vec<String>>,
@@ -464,7 +537,8 @@ impl Loader {
     pub fn new(config: Configuration) -> Self {
         let mut loader = Self {
             language_configs: Vec::new(),
-            language_config_ids_by_file_type: HashMap::new(),
+            language_config_ids_by_extension: HashMap::new(),
+            language_config_ids_by_suffix: HashMap::new(),
             language_config_ids_by_shebang: HashMap::new(),
             scopes: ArcSwap::from_pointee(Vec::new()),
         };
@@ -475,10 +549,14 @@ impl Loader {
 
             for file_type in &config.file_types {
                 // entry().or_insert(Vec::new).push(language_id);
-                let file_type = file_type.replace('/', &std::path::MAIN_SEPARATOR.to_string());
-                loader
-                    .language_config_ids_by_file_type
-                    .insert(file_type, language_id);
+                match file_type {
+                    FileType::Extension(extension) => loader
+                        .language_config_ids_by_extension
+                        .insert(extension.clone(), language_id),
+                    FileType::Suffix(suffix) => loader
+                        .language_config_ids_by_suffix
+                        .insert(suffix.clone(), language_id),
+                };
             }
             for shebang in &config.shebangs {
                 loader
@@ -498,14 +576,14 @@ impl Loader {
         let configuration_id = path
             .file_name()
             .and_then(|n| n.to_str())
-            .and_then(|file_name| self.language_config_ids_by_file_type.get(file_name))
+            .and_then(|file_name| self.language_config_ids_by_extension.get(file_name))
             .or_else(|| {
                 path.extension()
                     .and_then(|extension| extension.to_str())
-                    .and_then(|extension| self.language_config_ids_by_file_type.get(extension))
+                    .and_then(|extension| self.language_config_ids_by_extension.get(extension))
             })
             .or_else(|| {
-                self.language_config_ids_by_file_type
+                self.language_config_ids_by_suffix
                     .iter()
                     .find_map(|(file_type, id)| {
                         if path.to_str()?.ends_with(file_type) {
diff --git a/languages.toml b/languages.toml
index 5ad5c6e6..a639ccad 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1053,8 +1053,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-regex", rev = "e1cf
 name = "git-config"
 scope = "source.gitconfig"
 roots = []
-# TODO: allow specifying file-types as a regex so we can read directory names (e.g. `.git/config`)
-file-types = [".gitmodules", ".gitconfig", ".git/config", ".config/git/config"]
+file-types = [".gitmodules", ".gitconfig", { suffix = ".git/config" }, { suffix = ".config/git/config" }]
 injection-regex = "git-config"
 comment-token = "#"
 indent = { tab-width = 4, unit = "\t" }
@@ -1491,7 +1490,7 @@ source = { git = "https://github.com/bearcove/tree-sitter-meson", rev = "feea83b
 [[language]]
 name = "sshclientconfig"
 scope = "source.sshclientconfig"
-file-types = [".ssh/config", "/etc/ssh/ssh_config"]
+file-types = [{ suffix = ".ssh/config" }, { suffix = "/etc/ssh/ssh_config" }]
 roots = []
 
 [[grammar]]

From d7d0d5ffb79b6f2e09c6ab8af6e112c41e6f73e8 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Fri, 21 Oct 2022 20:04:50 -0500
Subject: [PATCH 383/884] lsp: Resolve completion items missing documentation
 on idle (#4406)

Some language servers may not send the `documentation` field if it
is expensive to compute. Clients can request the missing field with
a completionItem/resolve request.

In this change we use the idle-timeout event to ensure that the current
completion item is resolved.
---
 helix-term/src/ui/completion.rs | 21 +++++++++++++++++++++
 helix-term/src/ui/editor.rs     | 13 +++++++++----
 helix-term/src/ui/menu.rs       |  8 ++++++++
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 7348dcf4..a21767f9 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -295,6 +295,27 @@ impl Completion {
     pub fn is_empty(&self) -> bool {
         self.popup.contents().is_empty()
     }
+
+    pub fn ensure_item_resolved(&mut self, cx: &mut commands::Context) -> bool {
+        // > If computing full completion items is expensive, servers can additionally provide a
+        // > handler for the completion item resolve request. ...
+        // > A typical use case is for example: the `textDocument/completion` request doesn't fill
+        // > in the `documentation` property for returned completion items since it is expensive
+        // > to compute. When the item is selected in the user interface then a
+        // > 'completionItem/resolve' request is sent with the selected completion item as a parameter.
+        // > The returned completion item should have the documentation property filled in.
+        // https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_completion
+        match self.popup.contents_mut().selection_mut() {
+            Some(item) if item.documentation.is_none() => {
+                let doc = doc!(cx.editor);
+                if let Some(resolved_item) = Self::resolve_completion_item(doc, item.clone()) {
+                    *item = resolved_item;
+                }
+                true
+            }
+            _ => false,
+        }
+    }
 }
 
 impl Component for Completion {
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 43b1e7a0..b1bb02c7 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1097,10 +1097,15 @@ impl EditorView {
     }
 
     pub fn handle_idle_timeout(&mut self, cx: &mut commands::Context) -> EventResult {
-        if self.completion.is_some()
-            || cx.editor.mode != Mode::Insert
-            || !cx.editor.config().auto_completion
-        {
+        if let Some(completion) = &mut self.completion {
+            return if completion.ensure_item_resolved(cx) {
+                EventResult::Consumed(None)
+            } else {
+                EventResult::Ignored(None)
+            };
+        }
+
+        if cx.editor.mode != Mode::Insert || !cx.editor.config().auto_completion {
             return EventResult::Ignored(None);
         }
 
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index 4b1155e3..75769b90 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -206,6 +206,14 @@ impl<T: Item> Menu<T> {
         })
     }
 
+    pub fn selection_mut(&mut self) -> Option<&mut T> {
+        self.cursor.and_then(|cursor| {
+            self.matches
+                .get(cursor)
+                .map(|(index, _score)| &mut self.options[*index])
+        })
+    }
+
     pub fn is_empty(&self) -> bool {
         self.matches.is_empty()
     }

From ce469abfe2e99b5156c948bff27aaec3fbff7a6e Mon Sep 17 00:00:00 2001
From: "Mr. E" <2804556+etienne-k@users.noreply.github.com>
Date: Sat, 22 Oct 2022 21:25:41 +0200
Subject: [PATCH 384/884] feat(themes): add mode-specific styles to the
 tokyonight themes (#4415)

Co-authored-by: SoraTenshi <dream@neoncity.dev>
---
 runtime/themes/tokyonight.toml       |  3 +
 runtime/themes/tokyonight_storm.toml | 82 +---------------------------
 2 files changed, 4 insertions(+), 81 deletions(-)

diff --git a/runtime/themes/tokyonight.toml b/runtime/themes/tokyonight.toml
index 4f1ea1cf..4847d92c 100644
--- a/runtime/themes/tokyonight.toml
+++ b/runtime/themes/tokyonight.toml
@@ -41,6 +41,9 @@
 "ui.selection.primary" = { bg = "background_highlight" }
 "ui.statusline" = { fg = "foreground", bg = "background_menu" }
 "ui.statusline.inactive" = { fg = "foreground_gutter", bg = "background_menu" }
+"ui.statusline.normal" = { fg = "black", bg = "blue" }
+"ui.statusline.insert" = { fg = "black", bg = "green" }
+"ui.statusline.select" = { fg = "black", bg = "magenta" }
 "ui.text" = { fg = "foreground" }
 "ui.text.focus" = { fg = "cyan" }
 "ui.virtual.ruler" = { bg = "foreground_gutter" }
diff --git a/runtime/themes/tokyonight_storm.toml b/runtime/themes/tokyonight_storm.toml
index c47ac54b..e82c4340 100644
--- a/runtime/themes/tokyonight_storm.toml
+++ b/runtime/themes/tokyonight_storm.toml
@@ -1,88 +1,8 @@
 # Author: Paul Graydon <p.y.graydon@gmail.com>
 
-"comment" = { fg = "comment", modifiers = ["italic"] }
-"constant" = { fg = "orange" }
-"constant.character.escape" = { fg = "magenta" }
-"function" = { fg = "blue", modifiers = ["italic"] }
-"function.macro" = { fg = "cyan" }
-"keyword" = { fg = "cyan", modifiers = ["italic"] }
-"keyword.control" = { fg = "magenta" }
-"keyword.control.import" = { fg = "cyan" }
-"keyword.operator" = { fg = "turquoise" }
-"keyword.function" = { fg = "magenta", modifiers = ["italic"] }
-"operator" = { fg = "turquoise" }
-"punctuation" = { fg = "turquoise" }
-"string" = { fg = "light-green" }
-"string.regexp" = { fg = "light-blue" }
-"tag" = { fg = "red" }
-"type" = { fg = "teal" }
-"namespace" = { fg = "blue" }
-"variable" = { fg = "white" }
-"variable.builtin" = { fg = "red" }
-"variable.other.member" = { fg = "green" }
-"variable.parameter" = { fg = "yellow", modifiers = ["italic"] }
-
-"diff.plus" = { fg = "green" }
-"diff.delta" = { fg = "orange" }
-"diff.minus" = { fg = "red" }
-
-"ui.background" = { fg = "foreground", bg = "background" }
-"ui.cursor" = { modifiers = ["reversed"] }
-"ui.cursor.match" = { fg = "orange", modifiers = ["bold"] }
-"ui.cursor.primary" = { modifiers = ["reversed"] }
-"ui.cursorline.primary" = { bg = "background_menu" }
-"ui.help" = { fg = "foreground", bg = "background_menu" }
-"ui.linenr" = { fg = "foreground_gutter" }
-"ui.linenr.selected" = { fg = "foreground" }
-"ui.menu" = { fg = "foreground", bg = "background_menu" }
-"ui.menu.selected" = { bg = "background_highlight" }
-"ui.popup" = { fg = "foreground", bg = "background_menu" }
-"ui.selection" = { bg = "background_highlight" }
-"ui.selection.primary" = { bg = "background_highlight" }
-"ui.statusline" = { fg = "foreground", bg = "background_menu" }
-"ui.statusline.inactive" = { fg = "foreground_gutter", bg = "background_menu" }
-"ui.text" = { fg = "foreground" }
-"ui.text.focus" = { fg = "cyan" }
-"ui.virtual.ruler" = { bg = "foreground_gutter" }
-"ui.virtual.whitespace" = { fg = "foreground_gutter" }
-"ui.window" = { fg = "black" }
-
-"error" = { fg = "red" }
-"warning" = { fg = "yellow" }
-"info" = { fg = "blue" }
-"hint" = { fg = "teal" }
-"diagnostic" = { modifiers = ["underlined"] }
-"special" = { fg = "orange" }
-
-"markup.heading" = { fg = "cyan", modifiers = ["bold"] }
-"markup.list" = { fg = "cyan" }
-"markup.bold" = { fg = "orange", modifiers = ["bold"] }
-"markup.italic" = { fg = "yellow", modifiers = ["italic"] }
-"markup.link.url" = { fg = "green" }
-"markup.link.text" = { fg = "light-gray" }
-"markup.quote" = { fg = "yellow", modifiers = ["italic"] }
-"markup.raw" = { fg = "cyan" }
+inherits = "tokyonight"
 
 [palette]
-red = "#f7768e"
-orange = "#ff9e64"
-yellow = "#e0af68"
-light-green = "#9ece6a"
-green = "#73daca"
-turquoise = "#89ddff"
-light-cyan = "#b4f9f8"
-teal = "#2ac3de"
-cyan = "#7dcfff"
-blue = "#7aa2f7"
-magenta = "#bb9af7"
-white = "#c0caf5"
-light-gray = "#9aa5ce"
-parameters = "#cfc9c2"
-comment = "#565f89"
-black = "#414868"
-foreground = "#a9b1d6"
-foreground_highlight = "#c0caf5"
-foreground_gutter = "#3b4261"
 background = "#24283b"
 background_highlight = "#373d5a"
 background_menu = "#1f2335"

From 801984c7fc2cd3f4072f1bdf42c5fbfe1a634348 Mon Sep 17 00:00:00 2001
From: Mike Trinkala <trink@acm.org>
Date: Sun, 23 Oct 2022 16:02:58 -0700
Subject: [PATCH 385/884] Update textwrap to 0.16.0 (#4437)

---
 Cargo.lock            | 29 +++++++++++++++++++++++++----
 helix-core/Cargo.toml |  2 +-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ec48c596..878f4fa4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,17 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "ahash"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+dependencies = [
+ "getrandom",
+ "once_cell",
+ "version_check",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "0.7.18"
@@ -383,6 +394,15 @@ dependencies = [
  "memmap2",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash",
+]
+
 [[package]]
 name = "helix-core"
 version = "0.6.0"
@@ -1112,9 +1132,9 @@ dependencies = [
 
 [[package]]
 name = "textwrap"
-version = "0.15.1"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 dependencies = [
  "smawk",
  "unicode-linebreak",
@@ -1264,10 +1284,11 @@ checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
 
 [[package]]
 name = "unicode-linebreak"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a52dcaab0c48d931f7cc8ef826fa51690a08e1ea55117ef26f89864f532383f"
+checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137"
 dependencies = [
+ "hashbrown",
  "regex",
 ]
 
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 4eaadd1e..7585c347 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -43,7 +43,7 @@ encoding_rs = "0.8"
 chrono = { version = "0.4", default-features = false, features = ["alloc", "std"] }
 
 etcetera = "0.4"
-textwrap = "0.15.1"
+textwrap = "0.16.0"
 
 [dev-dependencies]
 quickcheck = { version = "1", default-features = false }

From d8ffa02255b99f94475cfaa7f456c6ae991dda25 Mon Sep 17 00:00:00 2001
From: Owen Lynch <oclynch888@gmail.com>
Date: Mon, 24 Oct 2022 18:44:36 -0400
Subject: [PATCH 386/884] Update scala treesitter grammar (#4353)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index a639ccad..6f58112a 100644
--- a/languages.toml
+++ b/languages.toml
@@ -982,7 +982,7 @@ language-server = { command = "metals" }
 
 [[grammar]]
 name = "scala"
-source = { git = "https://github.com/tree-sitter/tree-sitter-scala", rev = "0a3dd53a7fc4b352a538397d054380aaa28be54c" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-scala", rev = "140c96cf398693189d4e50f76d19ddfcd8a018f8" }
 
 [[language]]
 name = "dockerfile"

From 45da569a4c2db545ffae041eab9fbc66bde44ed3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 18:14:05 -0500
Subject: [PATCH 387/884] build(deps): bump anyhow from 1.0.65 to 1.0.66
 (#4459)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 878f4fa4..7b2ea378 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -33,9 +33,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.65"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"
+checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
 
 [[package]]
 name = "arc-swap"

From 6ea2c541528a2d4ae3562f45e3e6206cca96b6c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 18:14:27 -0500
Subject: [PATCH 388/884] build(deps): bump futures-util from 0.3.24 to 0.3.25
 (#4460)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7b2ea378..84409051 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -288,9 +288,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
+checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
 
 [[package]]
 name = "futures-executor"
@@ -305,15 +305,15 @@ dependencies = [
 
 [[package]]
 name = "futures-task"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
+checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
 
 [[package]]
 name = "futures-util"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
+checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
 dependencies = [
  "futures-core",
  "futures-task",

From 093842988b6c7fcd15dc90f9bf012a2fa6005de4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 18:18:41 -0500
Subject: [PATCH 389/884] build(deps): bump termini from 0.1.2 to 0.1.4 (#4461)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 84409051..96682aa3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1123,9 +1123,9 @@ dependencies = [
 
 [[package]]
 name = "termini"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "394766021ef3dae8077f080518cdf5360831990f77f5708d5e3594c9b3efa2f9"
+checksum = "8c0f7ecb9c2a380d2686a747e4fc574043712326e8d39fbd220ab3bd29768a12"
 dependencies = [
  "dirs-next",
 ]

From 02385599e1e47ec46f5cfbba8b454378d5f19f41 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 18:18:50 -0500
Subject: [PATCH 390/884] build(deps): bump serde_json from 1.0.86 to 1.0.87
 (#4462)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 96682aa3..35813993 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -959,9 +959,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.86"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074"
+checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45"
 dependencies = [
  "itoa",
  "ryu",

From 6aacdaaf9f3e315b99aba8bae6d19c6dc0bae831 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 18:35:12 -0500
Subject: [PATCH 391/884] build(deps): bump futures-executor from 0.3.24 to
 0.3.25 (#4464)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 35813993..283fffe2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -294,9 +294,9 @@ checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
+checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
 dependencies = [
  "futures-core",
  "futures-task",

From 001e4e304b6177148b8a74a222e0d02b91f53a11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 18:37:25 -0500
Subject: [PATCH 392/884] build(deps): bump serde from 1.0.145 to 1.0.147
 (#4463)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 283fffe2..163b3ad4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -939,18 +939,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "serde"
-version = "1.0.145"
+version = "1.0.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
+checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.145"
+version = "1.0.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
+checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
 dependencies = [
  "proc-macro2",
  "quote",

From c47ca331374b28a70c8bb9fd0fe991c478c696a1 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 25 Oct 2022 07:03:35 -0500
Subject: [PATCH 393/884] Render diagnostics in the file picker preview (#4324)

This is mostly for the sake of the diagnostics pickers: without
rendering the diagnostic styles, it's hard to tell where the entries
in the picker are pointing to.
---
 helix-term/src/ui/picker.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index c7149c61..2505f219 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -248,8 +248,14 @@ impl<T: Item + 'static> Component for FilePicker<T> {
 
             let offset = Position::new(first_line, 0);
 
-            let highlights =
+            let mut highlights =
                 EditorView::doc_syntax_highlights(doc, offset, area.height, &cx.editor.theme);
+            for spans in EditorView::doc_diagnostics_highlights(doc, &cx.editor.theme) {
+                if spans.is_empty() {
+                    continue;
+                }
+                highlights = Box::new(helix_core::syntax::merge(highlights, spans));
+            }
             EditorView::render_text_highlights(
                 doc,
                 offset,

From 9fae4b81189e9ba02718595a09840535f6fb558b Mon Sep 17 00:00:00 2001
From: GabrielDertoni <gab.dertoni@gmail.com>
Date: Sun, 9 Oct 2022 00:23:02 -0300
Subject: [PATCH 394/884] fix: terminal freezing on `shell_insert_output`

This bug occurs on `shell_insert_output` and `shell_append_output`
commands.

The previous implementation would create a child process using the Rust
stdlib's `Command` builder. However, when nothing should be piped in
from the editor, the default value for `stdin` would be used. According
to the Rust stdlib documentation that is `Stdio::inherit` which will
make the child process inherit the parent process' stdin. This would
cause the terminal to freeze.

This change will set the child process' stdin to `Stdio::null` whenever
it doesn't pipe it. In the `if` statement where this change was made
there was an extra condition for windows that I am not sure if would
require some special treatment.
---
 helix-term/src/commands.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 468e9814..69870a27 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4665,6 +4665,8 @@ fn shell_impl(
 
     if input.is_some() || cfg!(windows) {
         process.stdin(Stdio::piped());
+    } else {
+        process.stdin(Stdio::null());
     }
 
     let mut process = match process.spawn() {

From 65edf9c19880fe4fd068db6d86c4c2830c8a91f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Zabielski?= <zabielski.michal@gmail.com>
Date: Wed, 26 Oct 2022 04:15:46 +0200
Subject: [PATCH 395/884] fix: repeating repeat operator (#4450)

---
 helix-term/src/ui/editor.rs | 61 +++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index b1bb02c7..72c9d15e 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -25,7 +25,7 @@ use helix_view::{
     keyboard::{KeyCode, KeyModifiers},
     Document, Editor, Theme, View,
 };
-use std::{borrow::Cow, cmp::min, path::PathBuf};
+use std::{borrow::Cow, cmp::min, num::NonZeroUsize, path::PathBuf};
 
 use tui::buffer::Buffer as Surface;
 
@@ -1009,37 +1009,40 @@ impl EditorView {
             }
             // special handling for repeat operator
             (key!('.'), _) if self.keymaps.pending().is_empty() => {
-                // first execute whatever put us into insert mode
-                self.last_insert.0.execute(cxt);
-                // then replay the inputs
-                for key in self.last_insert.1.clone() {
-                    match key {
-                        InsertEvent::Key(key) => self.insert_mode(cxt, key),
-                        InsertEvent::CompletionApply(compl) => {
-                            let (view, doc) = current!(cxt.editor);
-
-                            doc.restore(view);
-
-                            let text = doc.text().slice(..);
-                            let cursor = doc.selection(view.id).primary().cursor(text);
-
-                            let shift_position =
-                                |pos: usize| -> usize { pos + cursor - compl.trigger_offset };
-
-                            let tx = Transaction::change(
-                                doc.text(),
-                                compl.changes.iter().cloned().map(|(start, end, t)| {
-                                    (shift_position(start), shift_position(end), t)
-                                }),
-                            );
-                            apply_transaction(&tx, doc, view);
-                        }
-                        InsertEvent::TriggerCompletion => {
-                            let (_, doc) = current!(cxt.editor);
-                            doc.savepoint();
+                for _ in 0..cxt.editor.count.map_or(1, NonZeroUsize::into) {
+                    // first execute whatever put us into insert mode
+                    self.last_insert.0.execute(cxt);
+                    // then replay the inputs
+                    for key in self.last_insert.1.clone() {
+                        match key {
+                            InsertEvent::Key(key) => self.insert_mode(cxt, key),
+                            InsertEvent::CompletionApply(compl) => {
+                                let (view, doc) = current!(cxt.editor);
+
+                                doc.restore(view);
+
+                                let text = doc.text().slice(..);
+                                let cursor = doc.selection(view.id).primary().cursor(text);
+
+                                let shift_position =
+                                    |pos: usize| -> usize { pos + cursor - compl.trigger_offset };
+
+                                let tx = Transaction::change(
+                                    doc.text(),
+                                    compl.changes.iter().cloned().map(|(start, end, t)| {
+                                        (shift_position(start), shift_position(end), t)
+                                    }),
+                                );
+                                apply_transaction(&tx, doc, view);
+                            }
+                            InsertEvent::TriggerCompletion => {
+                                let (_, doc) = current!(cxt.editor);
+                                doc.savepoint();
+                            }
                         }
                     }
                 }
+                cxt.editor.count = None;
             }
             _ => {
                 // set the count

From ba9e50e93b43f102de352ead57c28d86c34a7c73 Mon Sep 17 00:00:00 2001
From: Gaurav Tyagi <grvtyagi22@gmail.com>
Date: Wed, 26 Oct 2022 08:28:49 +0530
Subject: [PATCH 396/884] Add  `:update` that will write the changes if the
 file has been modified. (#4426)

* add command update that will write the changes if file hasn been modified

* add docs

* update the docs
---
 book/src/generated/typable-cmd.md |  1 +
 helix-term/src/commands/typed.rs  | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index 05a0985b..49e7e778 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -44,6 +44,7 @@
 | `:show-directory`, `:pwd` | Show the current working directory. |
 | `:encoding` | Set encoding. Based on `https://encoding.spec.whatwg.org`. |
 | `:reload` | Discard changes and reload from the source file. |
+| `:update` | Write changes only if the file has been modified. |
 | `:lsp-restart` | Restarts the Language Server that is in use by the current doc |
 | `:tree-sitter-scopes` | Display tree sitter scopes, primarily for theming and development. |
 | `:debug-start`, `:dbg` | Start a debug session from a given template with given parameters. |
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 7ea4c801..9b79c3e6 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1029,6 +1029,24 @@ fn reload(
     })
 }
 
+/// Update the [`Document`] if it has been modified.
+fn update(
+    cx: &mut compositor::Context,
+    args: &[Cow<str>],
+    event: PromptEvent,
+) -> anyhow::Result<()> {
+    if event != PromptEvent::Validate {
+        return Ok(());
+    }
+
+    let (_view, doc) = current!(cx.editor);
+    if doc.is_modified() {
+        write(cx, args, event)
+    } else {
+        Ok(())
+    }
+}
+
 fn lsp_restart(
     cx: &mut compositor::Context,
     _args: &[Cow<str>],
@@ -1957,6 +1975,13 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
             fun: reload,
             completer: None,
         },
+        TypableCommand {
+            name: "update",
+            aliases: &[],
+            doc: "Write changes only if the file has been modified.",
+            fun: update,
+            completer: None,
+        },
         TypableCommand {
             name: "lsp-restart",
             aliases: &[],

From ac0fe29867012ba0840ee7c8893b41d976d5ab38 Mon Sep 17 00:00:00 2001
From: "James O. D. Hunt" <jamesodhunt@gmail.com>
Date: Wed, 26 Oct 2022 03:59:50 +0100
Subject: [PATCH 397/884] commands: Make no arg ':theme' show name (#3740)

Most commands that accept an argument show their current value if no
argument is specified. The `:theme` command previously displayed an
error message in the status bar if not provided with an argument:

```
Theme name not provided
```

It now shows the current theme name in the status bar if no argument is
specified.

Signed-off-by: James O. D. Hunt <jamesodhunt@gmail.com>

Signed-off-by: James O. D. Hunt <jamesodhunt@gmail.com>
---
 book/src/generated/typable-cmd.md |  2 +-
 helix-term/src/commands/typed.rs  | 25 ++++++++++++++---------
 helix-view/src/theme.rs           | 34 +++++++++++++++++++------------
 3 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index 49e7e778..f858ba72 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -28,7 +28,7 @@
 | `:quit-all!`, `:qa!` | Force close all views ignoring unsaved changes. |
 | `:cquit`, `:cq` | Quit with exit code (default 1). Accepts an optional integer exit code (:cq 2). |
 | `:cquit!`, `:cq!` | Force quit with exit code (default 1) ignoring unsaved changes. Accepts an optional integer exit code (:cq! 2). |
-| `:theme` | Change the editor theme. |
+| `:theme` | Change the editor theme (show current theme if no name specified). |
 | `:clipboard-yank` | Yank main selection into system clipboard. |
 | `:clipboard-yank-join` | Yank joined selections into system clipboard. A separator can be provided as first argument. Default value is newline. |
 | `:primary-clipboard-yank` | Yank main selection into system primary clipboard. |
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 9b79c3e6..0cf75ada 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -772,16 +772,21 @@ fn theme(
             };
         }
         PromptEvent::Validate => {
-            let theme_name = args.first().with_context(|| "Theme name not provided")?;
-            let theme = cx
-                .editor
-                .theme_loader
-                .load(theme_name)
-                .with_context(|| "Theme does not exist")?;
-            if !(true_color || theme.is_16_color()) {
-                bail!("Unsupported theme: theme requires true color support");
+            if let Some(theme_name) = args.first() {
+                let theme = cx
+                    .editor
+                    .theme_loader
+                    .load(theme_name)
+                    .with_context(|| "Theme does not exist")?;
+                if !(true_color || theme.is_16_color()) {
+                    bail!("Unsupported theme: theme requires true color support");
+                }
+                cx.editor.set_theme(theme);
+            } else {
+                let name = cx.editor.theme.name().to_string();
+
+                cx.editor.set_status(name);
             }
-            cx.editor.set_theme(theme);
         }
     };
 
@@ -1866,7 +1871,7 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
         TypableCommand {
             name: "theme",
             aliases: &[],
-            doc: "Change the editor theme.",
+            doc: "Change the editor theme (show current theme if no name specified).",
             fun: theme,
             completer: Some(completers::theme),
         },
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index 302844b7..f1219ec5 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -14,19 +14,14 @@ use toml::{map::Map, Value};
 use crate::graphics::UnderlineStyle;
 pub use crate::graphics::{Color, Modifier, Style};
 
-pub static DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| {
-    //    let raw_theme: Value = toml::from_slice(include_bytes!("../../theme.toml"))
-    //        .expect("Failed to parse default theme");
-    //    Theme::from(raw_theme)
-
-    toml::from_slice(include_bytes!("../../theme.toml")).expect("Failed to parse default theme")
+pub static DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| Theme {
+    name: "default".into(),
+    ..toml::from_slice(include_bytes!("../../theme.toml")).expect("Failed to parse default theme")
 });
-pub static BASE16_DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| {
-    //    let raw_theme: Value = toml::from_slice(include_bytes!("../../base16_theme.toml"))
-    //        .expect("Failed to parse base 16 default theme");
-    //    Theme::from(raw_theme)
 
-    toml::from_slice(include_bytes!("../../base16_theme.toml"))
+pub static BASE16_DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| Theme {
+    name: "base16_theme".into(),
+    ..toml::from_slice(include_bytes!("../../base16_theme.toml"))
         .expect("Failed to parse base 16 default theme")
 });
 
@@ -53,7 +48,12 @@ impl Loader {
             return Ok(self.base16_default());
         }
 
-        self.load_theme(name, name, false).map(Theme::from)
+        let theme = self.load_theme(name, name, false).map(Theme::from)?;
+
+        Ok(Theme {
+            name: name.into(),
+            ..theme
+        })
     }
 
     // load the theme and its parent recursively and merge them
@@ -180,8 +180,10 @@ impl Loader {
     }
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Default)]
 pub struct Theme {
+    name: String,
+
     // UI styles are stored in a HashMap
     styles: HashMap<String, Style>,
     // tree-sitter highlight styles are stored in a Vec to optimize lookups
@@ -200,6 +202,7 @@ impl From<Value> for Theme {
             styles,
             scopes,
             highlights,
+            ..Default::default()
         }
     }
 }
@@ -217,6 +220,7 @@ impl<'de> Deserialize<'de> for Theme {
             styles,
             scopes,
             highlights,
+            ..Default::default()
         })
     }
 }
@@ -266,6 +270,10 @@ impl Theme {
         self.highlights[index]
     }
 
+    pub fn name(&self) -> &str {
+        &self.name
+    }
+
     pub fn get(&self, scope: &str) -> Style {
         self.try_get(scope).unwrap_or_default()
     }

From c4d7cde6c8d7f5ca3a9cabd50bdfbda9c3f7bb15 Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Wed, 26 Oct 2022 06:00:13 +0300
Subject: [PATCH 398/884] Allow the area to be bigger than u16 (width and
 height remain u16) (#4318)

Now the editor can fill **very** large terminals.
Changed/removed tests which check the truncating behaviour.
---
 helix-tui/src/buffer.rs     | 14 +++++------
 helix-tui/tests/terminal.rs |  6 ++---
 helix-view/src/graphics.rs  | 49 ++++---------------------------------
 3 files changed, 15 insertions(+), 54 deletions(-)

diff --git a/helix-tui/src/buffer.rs b/helix-tui/src/buffer.rs
index 424e6d32..23ba43f1 100644
--- a/helix-tui/src/buffer.rs
+++ b/helix-tui/src/buffer.rs
@@ -137,7 +137,7 @@ impl Buffer {
 
     /// Returns a Buffer with all cells initialized with the attributes of the given Cell
     pub fn filled(area: Rect, cell: &Cell) -> Buffer {
-        let size = area.area() as usize;
+        let size = area.area();
         let mut content = Vec::with_capacity(size);
         for _ in 0..size {
             content.push(cell.clone());
@@ -239,7 +239,7 @@ impl Buffer {
             y,
             self.area
         );
-        ((y - self.area.y) * self.area.width + (x - self.area.x)) as usize
+        ((y - self.area.y) as usize) * (self.area.width as usize) + ((x - self.area.x) as usize)
     }
 
     /// Returns the index in the Vec<Cell> for the given global (x, y) coordinates,
@@ -278,8 +278,8 @@ impl Buffer {
             self.content.len()
         );
         (
-            self.area.x + i as u16 % self.area.width,
-            self.area.y + i as u16 / self.area.width,
+            (self.area.x as usize + (i % self.area.width as usize)) as u16,
+            (self.area.y as usize + (i / self.area.width as usize)) as u16,
         )
     }
 
@@ -480,7 +480,7 @@ impl Buffer {
     /// Resize the buffer so that the mapped area matches the given area and that the buffer
     /// length is equal to area.width * area.height
     pub fn resize(&mut self, area: Rect) {
-        let length = area.area() as usize;
+        let length = area.area();
         if self.content.len() > length {
             self.content.truncate(length);
         } else {
@@ -587,8 +587,8 @@ impl Buffer {
         let mut to_skip: usize = 0;
         for (i, (current, previous)) in next_buffer.iter().zip(previous_buffer.iter()).enumerate() {
             if (current != previous || invalidated > 0) && to_skip == 0 {
-                let x = i as u16 % width;
-                let y = i as u16 / width;
+                let x = (i % width as usize) as u16;
+                let y = (i / width as usize) as u16;
                 updates.push((x, y, &next_buffer[i]));
             }
 
diff --git a/helix-tui/tests/terminal.rs b/helix-tui/tests/terminal.rs
index 3dd3b0b0..2824c9f2 100644
--- a/helix-tui/tests/terminal.rs
+++ b/helix-tui/tests/terminal.rs
@@ -4,12 +4,12 @@ use helix_tui::{
 };
 
 #[test]
-fn terminal_buffer_size_should_be_limited() {
+fn terminal_buffer_size_should_not_be_limited() {
     let backend = TestBackend::new(400, 400);
     let terminal = Terminal::new(backend).unwrap();
     let size = terminal.backend().size().unwrap();
-    assert_eq!(size.width, 255);
-    assert_eq!(size.height, 255);
+    assert_eq!(size.width, 400);
+    assert_eq!(size.height, 400);
 }
 
 // #[test]
diff --git a/helix-view/src/graphics.rs b/helix-view/src/graphics.rs
index 4374a537..cbae873a 100644
--- a/helix-view/src/graphics.rs
+++ b/helix-view/src/graphics.rs
@@ -95,31 +95,19 @@ pub struct Rect {
 }
 
 impl Rect {
-    /// Creates a new rect, with width and height limited to keep the area under max u16.
-    /// If clipped, aspect ratio will be preserved.
+    /// Creates a new rect, with width and height
     pub fn new(x: u16, y: u16, width: u16, height: u16) -> Rect {
-        let max_area = u16::max_value();
-        let (clipped_width, clipped_height) =
-            if u32::from(width) * u32::from(height) > u32::from(max_area) {
-                let aspect_ratio = f64::from(width) / f64::from(height);
-                let max_area_f = f64::from(max_area);
-                let height_f = (max_area_f / aspect_ratio).sqrt();
-                let width_f = height_f * aspect_ratio;
-                (width_f as u16, height_f as u16)
-            } else {
-                (width, height)
-            };
         Rect {
             x,
             y,
-            width: clipped_width,
-            height: clipped_height,
+            width,
+            height,
         }
     }
 
     #[inline]
-    pub fn area(self) -> u16 {
-        self.width * self.height
+    pub fn area(self) -> usize {
+        (self.width as usize) * (self.height as usize)
     }
 
     #[inline]
@@ -630,33 +618,6 @@ impl Style {
 mod tests {
     use super::*;
 
-    #[test]
-    fn test_rect_size_truncation() {
-        for width in 256u16..300u16 {
-            for height in 256u16..300u16 {
-                let rect = Rect::new(0, 0, width, height);
-                rect.area(); // Should not panic.
-                assert!(rect.width < width || rect.height < height);
-                // The target dimensions are rounded down so the math will not be too precise
-                // but let's make sure the ratios don't diverge crazily.
-                assert!(
-                    (f64::from(rect.width) / f64::from(rect.height)
-                        - f64::from(width) / f64::from(height))
-                    .abs()
-                        < 1.0
-                )
-            }
-        }
-
-        // One dimension below 255, one above. Area above max u16.
-        let width = 900;
-        let height = 100;
-        let rect = Rect::new(0, 0, width, height);
-        assert_ne!(rect.width, 900);
-        assert_ne!(rect.height, 100);
-        assert!(rect.width < width || rect.height < height);
-    }
-
     #[test]
     fn test_rect_size_preservation() {
         for width in 0..256u16 {

From 27217bb435fa0242b5cf43a23d3d13c739866b9f Mon Sep 17 00:00:00 2001
From: Matthias Deiml <matthias@deiml.net>
Date: Thu, 27 Oct 2022 15:39:22 +0200
Subject: [PATCH 399/884] Update tree-sitter markdown grammar (#4483)

---
 languages.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/languages.toml b/languages.toml
index 6f58112a..cc8f155b 100644
--- a/languages.toml
+++ b/languages.toml
@@ -943,7 +943,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "markdown"
-source = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "d5740f0fe4b8e4603f2229df107c5c9ef5eec389", subpath = "tree-sitter-markdown" }
+source = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "a7de4be29783a6e25f3240c90afea52f2417faa3", subpath = "tree-sitter-markdown" }
 
 [[language]]
 name = "markdown.inline"
@@ -955,7 +955,7 @@ grammar = "markdown_inline"
 
 [[grammar]]
 name = "markdown_inline"
-source = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "d5740f0fe4b8e4603f2229df107c5c9ef5eec389", subpath = "tree-sitter-markdown-inline" }
+source = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "a7de4be29783a6e25f3240c90afea52f2417faa3", subpath = "tree-sitter-markdown-inline" }
 
 [[language]]
 name = "dart"

From b1ffbbd49fd54525c55252162b5897d4ad4e990d Mon Sep 17 00:00:00 2001
From: Matthias Deiml <matthias@deiml.net>
Date: Thu, 27 Oct 2022 15:40:47 +0200
Subject: [PATCH 400/884] Include unnamed children for html injected into
 inline markdown (#4478)

---
 runtime/queries/markdown.inline/injections.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/queries/markdown.inline/injections.scm b/runtime/queries/markdown.inline/injections.scm
index c137a822..2dd149d9 100644
--- a/runtime/queries/markdown.inline/injections.scm
+++ b/runtime/queries/markdown.inline/injections.scm
@@ -1,2 +1,2 @@
 
-((html_tag) @injection.content (#set! injection.language "html"))
+((html_tag) @injection.content (#set! injection.language "html") (#set! injection.include-unnamed-children))

From b4a3dd8f89d6b3c1c973be2dfb2121c4b6cb501f Mon Sep 17 00:00:00 2001
From: lazytanuki <43273245+lazytanuki@users.noreply.github.com>
Date: Thu, 27 Oct 2022 16:16:55 +0200
Subject: [PATCH 401/884] feat(lsp): LSP preselected items appear first in
 completion menu (#4480)

* feat(lsp): LSP preselected items appear first in completion menu

* fix: shorter diff
---
 helix-term/src/ui/completion.rs | 6 +++++-
 helix-term/src/ui/menu.rs       | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index a21767f9..de7c3232 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -92,11 +92,15 @@ impl Completion {
 
     pub fn new(
         editor: &Editor,
-        items: Vec<CompletionItem>,
+        mut items: Vec<CompletionItem>,
         offset_encoding: helix_lsp::OffsetEncoding,
         start_offset: usize,
         trigger_offset: usize,
     ) -> Self {
+        // Sort completion items according to their preselect status (given by the LSP server)
+        items.sort_by_key(|item| !item.preselect.unwrap_or(false));
+
+        // Then create the menu
         let menu = Menu::new(items, (), move |editor: &mut Editor, item, event| {
             fn item_to_transaction(
                 doc: &Document,
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index 75769b90..99c2473d 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -108,7 +108,8 @@ impl<T: Item> Menu<T> {
                         .map(|score| (index, score))
                 }),
         );
-        self.matches.sort_unstable_by_key(|(_, score)| -score);
+        // Order of equal elements needs to be preserved as LSP preselected items come in order of high to low priority
+        self.matches.sort_by_key(|(_, score)| -score);
 
         // reset cursor position
         self.cursor = None;

From de5b100556ce4d9a2f739bd54904246f97dc6863 Mon Sep 17 00:00:00 2001
From: Sora <dream@neoncity.dev>
Date: Fri, 28 Oct 2022 03:19:01 +0200
Subject: [PATCH 402/884] Add the debugger for Zig (#4492)

---
 languages.toml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/languages.toml b/languages.toml
index cc8f155b..0a87fad2 100644
--- a/languages.toml
+++ b/languages.toml
@@ -767,6 +767,29 @@ language-server = { command = "zls" }
 indent = { tab-width = 4, unit = "    " }
 formatter = { command = "zig" , args = ["fmt", "--stdin"] }
 
+[language.debugger]
+name = "lldb-vscode"
+transport = "stdio"
+command = "lldb-vscode"
+
+[[language.debugger.templates]]
+name = "binary"
+request = "launch"
+completion = [ { name = "binary", completion = "filename" } ]
+args = { console = "internalConsole", program = "{0}" }
+
+[[language.debugger.templates]]
+name = "attach"
+request = "attach"
+completion = [ "pid" ]
+args = { console = "internalConsole", pid = "{0}" }
+
+[[language.debugger.templates]]
+name = "gdbserver attach"
+request = "attach"
+completion = [ { name = "lldb connect url", default = "connect://localhost:3333" }, { name = "file", completion = "filename" }, "pid" ]
+args = { console = "internalConsole", attachCommands = [ "platform select remote-gdb-server", "platform connect {0}", "file {1}", "attach {2}" ] }
+
 [[grammar]]
 name = "zig"
 source = { git = "https://github.com/maxxnino/tree-sitter-zig", rev = "8d3224c3bd0890fe08358886ebf54fca2ed448a6" }

From 6752c7d3474289596c9e062f54beaf07011b6a40 Mon Sep 17 00:00:00 2001
From: Dario Oddenino <branch13@gmail.com>
Date: Fri, 28 Oct 2022 03:31:28 +0200
Subject: [PATCH 403/884] Trim quotes and braces from paths in goto_file_impl
 (#4370)

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 helix-term/src/commands.rs        | 23 ++++++++----
 helix-term/tests/test/commands.rs | 60 +++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 69870a27..48bd9e57 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1023,6 +1023,7 @@ fn goto_file_vsplit(cx: &mut Context) {
     goto_file_impl(cx, Action::VerticalSplit);
 }
 
+/// Goto files in selection.
 fn goto_file_impl(cx: &mut Context, action: Action) {
     let (view, doc) = current_ref!(cx.editor);
     let text = doc.text();
@@ -1032,15 +1033,25 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
         .map(|r| text.slice(r.from()..r.to()).to_string())
         .collect();
     let primary = selections.primary();
-    if selections.len() == 1 && primary.to() - primary.from() == 1 {
-        let current_word = movement::move_next_long_word_start(
-            text.slice(..),
-            movement::move_prev_long_word_start(text.slice(..), primary, 1),
-            1,
+    // Checks whether there is only one selection with a width of 1
+    if selections.len() == 1 && primary.len() == 1 {
+        let count = cx.count();
+        let text_slice = text.slice(..);
+        // In this case it selects the WORD under the cursor
+        let current_word = textobject::textobject_word(
+            text_slice,
+            primary,
+            textobject::TextObject::Inside,
+            count,
+            true,
         );
+        // Trims some surrounding chars so that the actual file is opened.
+        let surrounding_chars: &[_] = &['\'', '"', '(', ')'];
         paths.clear();
         paths.push(
-            text.slice(current_word.from()..current_word.to())
+            current_word
+                .fragment(text_slice)
+                .trim_matches(surrounding_chars)
                 .to_string(),
         );
     }
diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index e24ee3e0..aadf104b 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -1,6 +1,7 @@
 use std::ops::RangeInclusive;
 
 use helix_core::diagnostic::Severity;
+use helix_term::application::Application;
 
 use super::*;
 
@@ -133,3 +134,62 @@ async fn test_selection_duplication() -> anyhow::Result<()> {
     .await?;
     Ok(())
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_goto_file_impl() -> anyhow::Result<()> {
+    let file = tempfile::NamedTempFile::new()?;
+
+    fn match_paths(app: &Application, matches: Vec<&str>) -> usize {
+        app.editor
+            .documents()
+            .filter_map(|d| d.path()?.file_name())
+            .filter(|n| matches.iter().any(|m| *m == n.to_string_lossy()))
+            .count()
+    }
+
+    // Single selection
+    test_key_sequence(
+        &mut AppBuilder::new().with_file(file.path(), None).build()?,
+        Some("ione.js<esc>%gf"),
+        Some(&|app| {
+            assert_eq!(1, match_paths(app, vec!["one.js"]));
+        }),
+        false,
+    )
+    .await?;
+
+    // Multiple selection
+    test_key_sequence(
+        &mut AppBuilder::new().with_file(file.path(), None).build()?,
+        Some("ione.js<ret>two.js<esc>%<A-s>gf"),
+        Some(&|app| {
+            assert_eq!(2, match_paths(app, vec!["one.js", "two.js"]));
+        }),
+        false,
+    )
+    .await?;
+
+    // Cursor on first quote
+    test_key_sequence(
+        &mut AppBuilder::new().with_file(file.path(), None).build()?,
+        Some("iimport 'one.js'<esc>B;gf"),
+        Some(&|app| {
+            assert_eq!(1, match_paths(app, vec!["one.js"]));
+        }),
+        false,
+    )
+    .await?;
+
+    // Cursor on last quote
+    test_key_sequence(
+        &mut AppBuilder::new().with_file(file.path(), None).build()?,
+        Some("iimport 'one.js'<esc>bgf"),
+        Some(&|app| {
+            assert_eq!(1, match_paths(app, vec!["one.js"]));
+        }),
+        false,
+    )
+    .await?;
+
+    Ok(())
+}

From cefdface3ba6cc2ed60a34fc7115de245c1f58b3 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Fri, 28 Oct 2022 07:42:40 -0500
Subject: [PATCH 404/884] Include colons for typable commands in command
 palette (#4495)

Before:

    Goto next buffer. [buffer-next]

After:

    Goto next buffer. [:buffer-next]
---
 helix-term/src/commands.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 48bd9e57..fca55b68 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2443,8 +2443,8 @@ impl ui::menu::Item for MappableCommand {
 
         match self {
             MappableCommand::Typable { doc, name, .. } => match keymap.get(name as &String) {
-                Some(bindings) => format!("{} ({}) [{}]", doc, fmt_binding(bindings), name).into(),
-                None => format!("{} [{}]", doc, name).into(),
+                Some(bindings) => format!("{} ({}) [:{}]", doc, fmt_binding(bindings), name).into(),
+                None => format!("{} [:{}]", doc, name).into(),
             },
             MappableCommand::Static { doc, name, .. } => match keymap.get(*name) {
                 Some(bindings) => format!("{} ({}) [{}]", doc, fmt_binding(bindings), name).into(),

From 26f21da531179ccc77e70b73e32a1b458c4e225b Mon Sep 17 00:00:00 2001
From: rsteube <rsteube@users.noreply.github.com>
Date: Fri, 28 Oct 2022 15:22:41 +0200
Subject: [PATCH 405/884] language: added vhs (#4486)

---
 book/src/generated/lang-support.md |  1 +
 languages.toml                     | 13 +++++++++++
 runtime/queries/vhs/highlights.scm | 36 ++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 runtime/queries/vhs/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index caf5d525..c166af29 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -120,6 +120,7 @@
 | v | ✓ |  |  | `vls` |
 | vala | ✓ |  |  | `vala-language-server` |
 | verilog | ✓ | ✓ |  | `svlangserver` |
+| vhs | ✓ |  |  |  |
 | vue | ✓ |  |  | `vls` |
 | wast | ✓ |  |  |  |
 | wat | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 0a87fad2..c5c45afc 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1872,3 +1872,16 @@ formatter = { command = "dfmt" }
 [[grammar]]
 name = "d"
 source = { git = "https://github.com/gdamore/tree-sitter-d", rev="601c4a1e8310fb2f3c43fa8a923d0d27497f3c04" }
+
+[[language]]
+name = "vhs"
+scope = "source.vhs"
+file-types = ["tape"]
+roots = []
+comment-token = "#"
+indent = { tab-width = 2, unit = "  " }
+grammar = "vhs"
+
+[[grammar]]
+name = "vhs"
+source = { git = "https://github.com/charmbracelet/tree-sitter-vhs", rev = "c6d81f34c011c29ee86dd73b45a8ecc9f2e2bdaf" }
diff --git a/runtime/queries/vhs/highlights.scm b/runtime/queries/vhs/highlights.scm
new file mode 100644
index 00000000..9a2d05cf
--- /dev/null
+++ b/runtime/queries/vhs/highlights.scm
@@ -0,0 +1,36 @@
+[ 
+  "Output"
+  "Backspace"
+  "Down"
+  "Enter"
+  "Escape"
+  "Left"
+  "Right"
+  "Space"
+  "Tab"
+  "Up"
+  "Set"
+  "Type"
+  "Sleep"
+  "Hide"
+  "Show" ] @keyword
+
+[ "FontFamily"
+  "FontSize"
+  "Framerate"
+  "Height"
+  "LetterSpacing"
+  "TypingSpeed"
+  "LineHeight"
+  "Padding"
+  "Theme"
+  "Width" ] @type
+
+[ "@" ] @operator
+(control) @function.macro
+(float) @constant.numeric.float
+(integer) @constant.numeric.integer
+(comment) @comment
+(path) @string.special.path
+[(string) (json)] @string
+(time) @string.special.symbol
\ No newline at end of file

From c58e1729cef774db6619e394942465c12abd65cd Mon Sep 17 00:00:00 2001
From: Poliorcetics <poliorcetics@users.noreply.github.com>
Date: Sat, 29 Oct 2022 01:20:55 +0200
Subject: [PATCH 406/884] fix: Never create automatic doc popups outside of
 Insert mode (#4456)

---
 helix-term/src/commands/lsp.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 3c72cd2a..d7617c50 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -9,7 +9,7 @@ use tui::text::{Span, Spans};
 use super::{align_view, push_jump, Align, Context, Editor, Open};
 
 use helix_core::{path, Selection};
-use helix_view::{apply_transaction, editor::Action, theme::Style};
+use helix_view::{apply_transaction, document::Mode, editor::Action, theme::Style};
 
 use crate::{
     compositor::{self, Compositor},
@@ -957,6 +957,14 @@ pub fn signature_help_impl(cx: &mut Context, invoked: SignatureHelpInvoked) {
                 return;
             }
 
+            // If the signature help invocation is automatic, don't show it outside of Insert Mode:
+            // it very probably means the server was a little slow to respond and the user has
+            // already moved on to something else, making a signature help popup will just be an
+            // annoyance, see https://github.com/helix-editor/helix/issues/3112
+            if !was_manually_invoked && editor.mode != Mode::Insert {
+                return;
+            }
+
             let response = match response {
                 // According to the spec the response should be None if there
                 // are no signatures, but some servers don't follow this.

From 5e256e4a98561c2085b1ecae1e39e27bf3744724 Mon Sep 17 00:00:00 2001
From: Matthias Deiml <matthias@deiml.net>
Date: Sat, 29 Oct 2022 17:24:33 +0200
Subject: [PATCH 407/884] Make shell_impl concurrent (#3180)

---
 helix-term/src/commands.rs | 41 +++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index fca55b68..172a7b2e 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -8,7 +8,7 @@ use tui::text::Spans;
 pub use typed::*;
 
 use helix_core::{
-    comment, coords_at_pos, find_first_non_whitespace_char, find_root, graphemes,
+    comment, coords_at_pos, encoding, find_first_non_whitespace_char, find_root, graphemes,
     history::UndoKind,
     increment::date_time::DateTimeIncrementor,
     increment::{number::NumberIncrementor, Increment},
@@ -4630,7 +4630,7 @@ fn shell_keep_pipe(cx: &mut Context) {
 
             for (i, range) in selection.ranges().iter().enumerate() {
                 let fragment = range.slice(text);
-                let (_output, success) = match shell_impl(shell, input, Some(fragment)) {
+                let (_output, success) = match shell_impl(shell, input, Some(fragment.into())) {
                     Ok(result) => result,
                     Err(err) => {
                         cx.editor.set_error(err.to_string());
@@ -4658,13 +4658,17 @@ fn shell_keep_pipe(cx: &mut Context) {
     );
 }
 
-fn shell_impl(
+fn shell_impl(shell: &[String], cmd: &str, input: Option<Rope>) -> anyhow::Result<(Tendril, bool)> {
+    tokio::task::block_in_place(|| helix_lsp::block_on(shell_impl_async(shell, cmd, input)))
+}
+
+async fn shell_impl_async(
     shell: &[String],
     cmd: &str,
-    input: Option<RopeSlice>,
+    input: Option<Rope>,
 ) -> anyhow::Result<(Tendril, bool)> {
-    use std::io::Write;
-    use std::process::{Command, Stdio};
+    use std::process::Stdio;
+    use tokio::process::Command;
     ensure!(!shell.is_empty(), "No shell set");
 
     let mut process = Command::new(&shell[0]);
@@ -4687,13 +4691,22 @@ fn shell_impl(
             return Err(e.into());
         }
     };
-    if let Some(input) = input {
-        let mut stdin = process.stdin.take().unwrap();
-        for chunk in input.chunks() {
-            stdin.write_all(chunk.as_bytes())?;
-        }
-    }
-    let output = process.wait_with_output()?;
+    let output = if let Some(mut stdin) = process.stdin.take() {
+        let input_task = tokio::spawn(async move {
+            if let Some(input) = input {
+                helix_view::document::to_writer(&mut stdin, encoding::UTF_8, &input).await?;
+            }
+            Ok::<_, anyhow::Error>(())
+        });
+        let (output, _) = tokio::join! {
+            process.wait_with_output(),
+            input_task,
+        };
+        output?
+    } else {
+        // Process has no stdin, so we just take the output
+        process.wait_with_output().await?
+    };
 
     if !output.status.success() {
         if !output.stderr.is_empty() {
@@ -4731,7 +4744,7 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
 
     for range in selection.ranges() {
         let fragment = range.slice(text);
-        let (output, success) = match shell_impl(shell, cmd, pipe.then(|| fragment)) {
+        let (output, success) = match shell_impl(shell, cmd, pipe.then(|| fragment.into())) {
             Ok(result) => result,
             Err(err) => {
                 cx.editor.set_error(err.to_string());

From b5e7501935472f4e68bf42ac9759d54688ccb5e6 Mon Sep 17 00:00:00 2001
From: Jaden <thejadenjack@gmail.com>
Date: Sat, 29 Oct 2022 08:33:23 -0700
Subject: [PATCH 408/884] feat(lang): add kdl grammar (#4481)

---
 book/src/generated/lang-support.md |  1 +
 languages.toml                     | 12 ++++++++++++
 runtime/queries/kdl/highlights.scm | 22 ++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 runtime/queries/kdl/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index c166af29..ee54114a 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -60,6 +60,7 @@
 | jsonnet | ✓ |  |  | `jsonnet-language-server` |
 | jsx | ✓ | ✓ | ✓ | `typescript-language-server` |
 | julia | ✓ |  |  | `julia` |
+| kdl | ✓ |  |  |  |
 | kotlin | ✓ |  |  | `kotlin-language-server` |
 | latex | ✓ | ✓ |  | `texlab` |
 | lean | ✓ |  |  | `lean` |
diff --git a/languages.toml b/languages.toml
index c5c45afc..31a454b0 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1885,3 +1885,15 @@ grammar = "vhs"
 [[grammar]]
 name = "vhs"
 source = { git = "https://github.com/charmbracelet/tree-sitter-vhs", rev = "c6d81f34c011c29ee86dd73b45a8ecc9f2e2bdaf" }
+
+[[language]]
+name = "kdl"
+scope = "source.kdl"
+file-types = ["kdl"]
+roots = []
+comment-token = "//"
+injection-regex = "kdl"
+
+[[grammar]]
+name = "kdl"
+source = { git = "https://github.com/Unoqwy/tree-sitter-kdl", rev = "e1cd292c6d15df6610484e1d4b5c987ecad52373" }
diff --git a/runtime/queries/kdl/highlights.scm b/runtime/queries/kdl/highlights.scm
new file mode 100644
index 00000000..d83bde19
--- /dev/null
+++ b/runtime/queries/kdl/highlights.scm
@@ -0,0 +1,22 @@
+(comment) @comment
+(single_line_comment) @comment
+
+(node
+    name: (identifier) @function)
+(prop (identifier) @attribute)
+(type) @type
+
+(bare_identifier) @variable.other.member
+
+(keyword) @keyword
+
+(string) @string
+(number) @constant.numeric
+(boolean) @constant.builtin.boolean
+
+"." @punctuation.delimiter
+
+"=" @operator
+
+"{" @punctuation.bracket
+"}" @punctuation.bracket

From e3eaad14790fb72995ce233a7cd6cd8c249997c0 Mon Sep 17 00:00:00 2001
From: Kristoffer Flottorp <2630397+krfl@users.noreply.github.com>
Date: Sat, 29 Oct 2022 17:35:35 +0200
Subject: [PATCH 409/884] Fleetish: Adjustments to resemble official theme and
 reworked diagnostics to reduce subconjunctival hemorrhage (#4487)

---
 runtime/themes/fleetish.toml | 53 +++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/runtime/themes/fleetish.toml b/runtime/themes/fleetish.toml
index a5b09fe4..74340cae 100644
--- a/runtime/themes/fleetish.toml
+++ b/runtime/themes/fleetish.toml
@@ -1,11 +1,11 @@
 # Author: Kristoffer Flottorp <kr.fl@outlook.com>
-# Based on a few screenshots of Jetbrains Fleet
+# A take on the JetBrains Fleet theme sprinkled with some creative freedom
 
-"type" = { fg = "orange" } # .builtin
-"constructor" = { fg = "orange" }
-"constant" = { fg = "green" }
+"type" = { fg = "yellow" } # .builtin
+"constructor" = { fg = "yellow" }
+"constant" = { fg = "cyan" }
 # "constant.builtin" = {} # .boolean
-"constant.builtin.boolean" = { fg = "green" } # .boolean
+"constant.builtin.boolean" = { fg = "cyan" } # .boolean
 # "constant.character" = {} #.escape
 "constant.numeric" = { fg = "yellow" } # .integer / .float
 "string" = { fg = "pink" } # .regexp
@@ -16,31 +16,31 @@
 "variable" = { fg = "light" } # .builtin / .parameter
 # "variable.other" = {} # .member
 "variable.other.member" = { fg = "purple" }
-"label" = { fg = "orange" }
+"label" = { fg = "yellow" }
 # "punctuation" = {} # .delimiter / .bracket
-"keyword" = { fg = "green" } # .operator / .directive / .function
+"keyword" = { fg = "cyan" } # .operator / .directive / .function
 # "keyword.control" = { fg = "orange" } # .conditional / .repeat / .import / .return / .exception
 "operator" = { fg = "light" }
 "function" = { fg = "blue" } # .builtin / .method / .macro / .special
-"function.macro" = { fg = "yellow" }
-"function.special" = { fg = "yellow" }
-"tag" = { fg = "yellow" }
-"special" = { fg = "yellow" }
+"function.macro" = { fg = "green" }
+"function.special" = { fg = "green" }
+"tag" = { fg = "green"}
+"special" = { fg = "green" }
 "namespace" = { fg = "light" }
 "markup" = { fg = "purple" } # .bold / .italic / .quote
 "markup.heading" = { fg = "light" } # .marker / .1 / .2 / .3 / .4 / .5 / .6
-"markup.heading.1" = { fg = "orange" }
-"markup.heading.2" = { fg = "yellow" }
+"markup.heading.1" = { fg = "yellow" }
+"markup.heading.2" = { fg = "green" }
 "markup.heading.3" = { fg = "pink" }
 "markup.heading.4" = { fg = "purple" }
-"markup.heading.5" = { fg = "green" }
+"markup.heading.5" = { fg = "cyan" }
 "markup.heading.6" = { fg = "blue" }
-"markup.list" = { fg = "green" } # .unnumbered / .numbered
-"markup.link" = { fg = "yellow" } # .url / .label / .text
+"markup.list" = { fg = "cyan" } # .unnumbered / .numbered
+"markup.link" = { fg = "green" } # .url / .label / .text
 "markup.raw" = { fg = "pink" } # .inline / .block
 # "diff" = {} # .plus / .minus
-"diff.plus" = { fg = "green" }
-"diff.minus" = { fg = "orange" }
+"diff.plus" = { fg = "cyan" }
+"diff.minus" = { fg = "yellow" }
 "diff.delta" = { fg = "purple" } # .moved
 
 # used in theming
@@ -74,11 +74,7 @@
 "info" = { fg = "yellow_accent" }
 "warning" = { fg = "orange_accent" }
 "error" = { fg = "diff_red_accent" }
-"diagnostic" = { fg = "orange", bg = "darkest" } # .hint / .info / .warning / .error
-"diagnostic.hint" = { fg = "lightest", bg = "blue_accent" }
-"diagnostic.info" = { fg = "lightest", bg = "purple_accent" }
-"diagnostic.warning" = { fg = "lightest", bg = "yellow_accent" }
-"diagnostic.error" = { fg = "lightest", bg = "orange_accent" }
+"diagnostic". underline = { style = "curl"  } 
 
 [palette]
 darkest = "#0F0F0F"
@@ -91,12 +87,13 @@ lightest = "#FFFFFF"
 
 dark_gray = "#5B5B5B"
 light_gray = "#757575"
-purple = "#A096F9"
-blue = "#52A7F6"
-pink = "#E878DE"
-green = "#78D0BD"
+purple = "#AC9CF9"
+blue = "#52A7F6" #"#94C1FA"
+pink = "#D898D8"
+green = "#AFCB85"
+cyan = "#78D0BD"
 orange = "#ECA775"
-yellow = "#F9CA6A"
+yellow = "#E5C995"
 
 purple_accent = "#6363EE"
 blue_accent = "#2197F3"

From 2935e9da197442620578e07d87cd0607ae4145f1 Mon Sep 17 00:00:00 2001
From: Poliorcetics <poliorcetics@users.noreply.github.com>
Date: Sat, 29 Oct 2022 17:36:26 +0200
Subject: [PATCH 410/884] feat: Categorize Rust's keywords using more specific
 scopes (#4510)

---
 runtime/queries/rust/highlights.scm | 36 +++++++++++++++++++----------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm
index 81f05f7a..0afb8388 100644
--- a/runtime/queries/rust/highlights.scm
+++ b/runtime/queries/rust/highlights.scm
@@ -111,23 +111,31 @@
 ; -------
 
 (for_expression
-  "for" @keyword.control)
+  "for" @keyword.control.repeat)
 ((identifier) @keyword.control
   (#match? @keyword.control "^yield$"))
+
+"in" @keyword.control
+
+[
+  "match"
+  "if"
+  "else"
+] @keyword.control.conditional
+
 [
   "while"
   "loop"
-  "in"
+] @keyword.control.repeat
+
+[
   "break"
   "continue"
 
-  "match"
-  "if"
-  "else"
   "return"
 
   "await"
-] @keyword.control
+] @keyword.control.return
 
 "use" @keyword.control.import
 (mod_item "mod" @keyword.control.import !body)
@@ -143,24 +151,28 @@
   "mod"
   "extern"
 
-  "struct"
-  "enum"
   "impl"
   "where"
   "trait"
   "for"
 
-  "type"
-  "union"
   "unsafe"
   "default"
   "macro_rules!"
 
-  "let"
-
   "async"
 ] @keyword
 
+[
+  "struct"
+  "enum"
+  "union"
+
+  "type"
+] @keyword.storage.type
+
+"let" @keyword.storage
+
 "fn" @keyword.function
 
 (mutable_specifier) @keyword.storage.modifier.mut

From f054a3f3ed445cdfa8c0dc63698659ef30af57b7 Mon Sep 17 00:00:00 2001
From: Matthew Toohey <contact@mtoohey.com>
Date: Sat, 29 Oct 2022 16:41:28 -0400
Subject: [PATCH 411/884] feat(lang): add xml (#4518)

---
 book/src/generated/lang-support.md |  1 +
 languages.toml                     | 20 ++++++++++++++
 runtime/queries/xml/highlights.scm | 42 ++++++++++++++++++++++++++++++
 runtime/queries/xml/indents.scm    |  1 +
 runtime/queries/xml/injections.scm |  2 ++
 5 files changed, 66 insertions(+)
 create mode 100644 runtime/queries/xml/highlights.scm
 create mode 100644 runtime/queries/xml/indents.scm
 create mode 100644 runtime/queries/xml/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index ee54114a..545ec635 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -127,5 +127,6 @@
 | wat | ✓ |  |  |  |
 | wgsl | ✓ |  |  | `wgsl_analyzer` |
 | xit | ✓ |  |  |  |
+| xml | ✓ |  | ✓ |  |
 | yaml | ✓ |  | ✓ | `yaml-language-server` |
 | zig | ✓ | ✓ | ✓ | `zls` |
diff --git a/languages.toml b/languages.toml
index 31a454b0..00e6459d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1897,3 +1897,23 @@ injection-regex = "kdl"
 [[grammar]]
 name = "kdl"
 source = { git = "https://github.com/Unoqwy/tree-sitter-kdl", rev = "e1cd292c6d15df6610484e1d4b5c987ecad52373" }
+
+[[language]]
+name = "xml"
+scope = "source.xml"
+injection-regex = "xml"
+file-types = ["xml"]
+indent = { tab-width = 2, unit = "  " }
+roots = []
+
+[language.auto-pairs]
+'(' = ')'
+'{' = '}'
+'[' = ']'
+'"' = '"'
+"'" = "'"
+"<" = ">"
+
+[[grammar]]
+name = "xml"
+source = { git = "https://github.com/RenjiSann/tree-sitter-xml", rev = "422528a43630db6dcc1e222d1c5ee3babd559473" }
diff --git a/runtime/queries/xml/highlights.scm b/runtime/queries/xml/highlights.scm
new file mode 100644
index 00000000..d5940c8a
--- /dev/null
+++ b/runtime/queries/xml/highlights.scm
@@ -0,0 +1,42 @@
+(comment) @comment
+
+[
+    "DOCTYPE"
+    "ELEMENT"
+    "ATTLIST"
+] @keyword
+
+[
+    "#REQUIRED"
+    "#IMPLIED"
+    "#FIXED"
+    "#PCDATA"
+] @keyword.directive
+
+[
+    "EMPTY"
+    "ANY"
+    "SYSTEM"
+    "PUBLIC"
+] @constant
+
+(doctype) @variable
+(element_name) @variable
+
+"xml" @tag
+(tag_name) @tag
+
+[
+    "encoding"
+    "version"
+    "standalone"
+] @attribute
+(attribute_name) @attribute
+
+(system_literal) @string
+(pubid_literal) @string
+(attribute_value) @string
+
+[
+    "<" ">" "</" "/>" "<?" "?>" "<!"
+] @punctuation.bracket
diff --git a/runtime/queries/xml/indents.scm b/runtime/queries/xml/indents.scm
new file mode 100644
index 00000000..d756debb
--- /dev/null
+++ b/runtime/queries/xml/indents.scm
@@ -0,0 +1 @@
+(element) @indent
diff --git a/runtime/queries/xml/injections.scm b/runtime/queries/xml/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/xml/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))

From 00cf12f571b72451bcdd5c2b0079ce2331a0869f Mon Sep 17 00:00:00 2001
From: Matthew Toohey <contact@mtoohey.com>
Date: Sat, 29 Oct 2022 17:23:18 -0400
Subject: [PATCH 412/884] fix: make `scroll` aware of tabs and wide characters
 (#4519)

---
 helix-term/src/commands.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 172a7b2e..adb4802d 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1360,7 +1360,7 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction) {
     let range = doc.selection(view.id).primary();
     let text = doc.text().slice(..);
 
-    let cursor = coords_at_pos(text, range.cursor(text));
+    let cursor = visual_coords_at_pos(text, range.cursor(text), doc.tab_width());
     let doc_last_line = doc.text().len_lines().saturating_sub(1);
 
     let last_line = view.last_line(doc);
@@ -1392,7 +1392,7 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction) {
 
     // If cursor needs moving, replace primary selection
     if line != cursor.row {
-        let head = pos_at_coords(text, Position::new(line, cursor.col), true); // this func will properly truncate to line end
+        let head = pos_at_visual_coords(text, Position::new(line, cursor.col), doc.tab_width()); // this func will properly truncate to line end
 
         let anchor = if cx.editor.mode == Mode::Select {
             range.anchor

From 908529ccac153c12fd3b8e051a8f8ef68120d94d Mon Sep 17 00:00:00 2001
From: Triton171 <daniel.ebert@protonmail.com>
Date: Sun, 30 Oct 2022 17:45:58 +0100
Subject: [PATCH 413/884] Update LaTex grammar (#4528)

Fix comment injection & add highlighting for math delimiters.
---
 languages.toml                       | 2 +-
 runtime/queries/latex/highlights.scm | 6 ++++++
 runtime/queries/latex/injections.scm | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/languages.toml b/languages.toml
index 00e6459d..73915fc2 100644
--- a/languages.toml
+++ b/languages.toml
@@ -570,7 +570,7 @@ indent = { tab-width = 4, unit = "\t" }
 
 [[grammar]]
 name = "latex"
-source = { git = "https://github.com/latex-lsp/tree-sitter-latex", rev = "b3b2cf27f33e71438ebe46934900b1153901c6f2" }
+source = { git = "https://github.com/latex-lsp/tree-sitter-latex", rev = "8c75e93cd08ccb7ce1ccab22c1fbd6360e3bcea6" }
 
 [[language]]
 name = "lean"
diff --git a/runtime/queries/latex/highlights.scm b/runtime/queries/latex/highlights.scm
index e39226a2..3174d80b 100644
--- a/runtime/queries/latex/highlights.scm
+++ b/runtime/queries/latex/highlights.scm
@@ -29,6 +29,12 @@
   (#eq? @punctuation.delimiter "&"))
 
 ["[" "]" "{" "}"] @punctuation.bracket ; "(" ")" has no syntactical meaning in LaTeX
+(math_delimiter
+  left_command: _ @punctuation.delimiter
+  left_delimiter: _ @punctuation.delimiter
+  right_command: _ @punctuation.delimiter
+  right_delimiter: _ @punctuation.delimiter
+)
 
 ;; General environments
 (begin
diff --git a/runtime/queries/latex/injections.scm b/runtime/queries/latex/injections.scm
index 321c90ad..d3fdb0ca 100644
--- a/runtime/queries/latex/injections.scm
+++ b/runtime/queries/latex/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content
+((line_comment) @injection.content
  (#set! injection.language "comment"))

From f6710879d1a1e587d17800682ba0e1045f35e7a9 Mon Sep 17 00:00:00 2001
From: seshotake <116971836+seshotake@users.noreply.github.com>
Date: Sun, 30 Oct 2022 16:54:37 +0000
Subject: [PATCH 414/884] Update SQL grammar (#4529)

---
 languages.toml                     |  2 +-
 runtime/queries/sql/highlights.scm | 52 ++++++++++++++++++++++++++----
 2 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/languages.toml b/languages.toml
index 73915fc2..9c0293f0 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1371,7 +1371,7 @@ injection-regex = "sql"
 
 [[grammar]]
 name = "sql"
-source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "0caa7fa2ee00e0b770493a79d4efacc1fc376cc5" }
+source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "2743c7b5e710e6854d4e8c14c302548b436e2a1f" }
 
 [[language]]
 name = "gdscript"
diff --git a/runtime/queries/sql/highlights.scm b/runtime/queries/sql/highlights.scm
index 5025352e..ece8be33 100644
--- a/runtime/queries/sql/highlights.scm
+++ b/runtime/queries/sql/highlights.scm
@@ -1,3 +1,34 @@
+(keyword_gist) @function.builtin
+(keyword_btree) @function.builtin
+(keyword_btree) @function.builtin
+(keyword_hash) @function.builtin
+(keyword_spgist) @function.builtin
+(keyword_gin) @function.builtin
+(keyword_brin) @function.builtin
+(keyword_float) @function.builtin
+
+(invocation
+  name: (identifier) @function.builtin
+  parameter: [(field)]? @variable.other.member)
+  
+(count
+  name: (identifier) @function.builtin
+  parameter: [(field)]? @variable.other.member)
+  
+(table_reference
+  name: (identifier) @namespace)
+
+(relation
+  table_alias: (identifier) @variable.parameter)
+  
+(field
+  name: (identifier) @variable.other.member)
+  
+(field
+  table_alias: (identifier) @variable.parameter
+  name: (identifier) @variable.other.member)
+
+
 (comment) @comment
 
 [
@@ -5,6 +36,12 @@
   ")"
 ] @punctuation.bracket
 
+[
+  ";"
+  ","
+  "."
+] @punctuation.delimiter
+
 [
   "*"
   "+"
@@ -29,11 +66,8 @@
 
 (literal) @string
 
-(set_schema schema: (identifier) @namespace)
-(table_reference schema: (identifier) @namespace)
-(table_expression schema: (identifier) @namespace)
-(all_fields schema: (identifier) @namespace)
-(field schema: (identifier) @namespace)
+((literal) @constant.numeric
+  (#match? @constant.numeric "^(-?\d*\.?\d*)$"))
 
 [
   (keyword_select)
@@ -54,8 +88,10 @@
   (keyword_lateral)
   (keyword_on)
   (keyword_not)
-  (keyword_order_by)
-  (keyword_group_by)
+  (keyword_order)
+  (keyword_group)
+  (keyword_partition)
+  (keyword_by)
   (keyword_having)
   (keyword_desc)
   (keyword_asc)
@@ -89,6 +125,8 @@
   (keyword_auto_increment)
   (keyword_default)
   (keyword_cascade)
+  (keyword_between)
+  (keyword_window)
   (keyword_with)
   (keyword_no)
   (keyword_data)

From f41f28b6627bd2ae0152f468cde80df167889a2d Mon Sep 17 00:00:00 2001
From: Konstantin Podsvirov <konstantin@podsvirov.pro>
Date: Sun, 30 Oct 2022 19:55:31 +0300
Subject: [PATCH 415/884] Update windows install instructions (#4530)

---
 book/src/install.md | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/book/src/install.md b/book/src/install.md
index 6e2a1f3d..a041d651 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -52,7 +52,8 @@ sudo xbps-install helix
 
 ## Windows
 
-Helix can be installed using [Scoop](https://scoop.sh/) or [Chocolatey](https://chocolatey.org/).
+Helix can be installed using [Scoop](https://scoop.sh/), [Chocolatey](https://chocolatey.org/)
+or [MSYS2](https://msys2.org/).
 
 **Scoop:**
 
@@ -66,6 +67,23 @@ scoop install helix
 choco install helix
 ```
 
+**MSYS2:**
+
+```
+pacman -S mingw-w64-i686-helix
+```
+
+or
+
+```
+pacman -S mingw-w64-x86_64-helix
+```
+
+or
+
+```
+pacman -S mingw-w64-ucrt-x86_64-helix
+```
 
 ## Build from source
 

From df3c6412acc2c0948450653a67a4993092abf5fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Oct 2022 18:21:51 -0500
Subject: [PATCH 416/884] build(deps): bump cachix/cachix-action from 11 to 12
 (#4547)

Bumps [cachix/cachix-action](https://github.com/cachix/cachix-action) from 11 to 12.
- [Release notes](https://github.com/cachix/cachix-action/releases)
- [Commits](https://github.com/cachix/cachix-action/compare/v11...v12)

---
updated-dependencies:
- dependency-name: cachix/cachix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cachix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index bc72bb78..20035678 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -17,7 +17,7 @@ jobs:
       uses: cachix/install-nix-action@v18
 
     - name: Authenticate with Cachix
-      uses: cachix/cachix-action@v11
+      uses: cachix/cachix-action@v12
       with:
         name: helix
         authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}

From 9df43584924a72be88f537ac432e5976430fa3f1 Mon Sep 17 00:00:00 2001
From: hh9527 <hh9527@gmail.com>
Date: Tue, 1 Nov 2022 07:48:01 +0800
Subject: [PATCH 417/884] Support WIT grammar (#4525)

---
 book/src/generated/lang-support.md |  1 +
 languages.toml                     | 22 ++++++++++
 runtime/queries/wit/highlights.scm | 67 ++++++++++++++++++++++++++++++
 runtime/queries/wit/indents.scm    | 13 ++++++
 4 files changed, 103 insertions(+)
 create mode 100644 runtime/queries/wit/highlights.scm
 create mode 100644 runtime/queries/wit/indents.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 545ec635..38d121b5 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -126,6 +126,7 @@
 | wast | ✓ |  |  |  |
 | wat | ✓ |  |  |  |
 | wgsl | ✓ |  |  | `wgsl_analyzer` |
+| wit | ✓ |  | ✓ |  |
 | xit | ✓ |  |  |  |
 | xml | ✓ |  | ✓ |  |
 | yaml | ✓ |  | ✓ | `yaml-language-server` |
diff --git a/languages.toml b/languages.toml
index 9c0293f0..ee31f372 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1917,3 +1917,25 @@ roots = []
 [[grammar]]
 name = "xml"
 source = { git = "https://github.com/RenjiSann/tree-sitter-xml", rev = "422528a43630db6dcc1e222d1c5ee3babd559473" }
+
+[[language]]
+name = "wit"
+scope = "source.wit"
+injection-regex = "wit"
+file-types = ["wit"]
+roots = []
+comment-token = "//"
+indent = { tab-width = 2, unit = "  " }
+
+[language.auto-pairs]
+'(' = ')'
+'{' = '}'
+'[' = ']'
+'"' = '"'
+"'" = "'"
+"<" = ">"
+
+[[grammar]]
+name = "wit"
+source = { git = "https://github.com/hh9527/tree-sitter-wit", rev = "c917790ab9aec50c5fd664cbfad8dd45110cfff3" }
+ 
diff --git a/runtime/queries/wit/highlights.scm b/runtime/queries/wit/highlights.scm
new file mode 100644
index 00000000..45754a5a
--- /dev/null
+++ b/runtime/queries/wit/highlights.scm
@@ -0,0 +1,67 @@
+(line_comment) @comment.line
+(block_comment) @comment.block
+(ty (ident) @type)
+
+(item_type name: (ident) @type)
+(item_record name: (ident) @type)
+(item_variant name: (ident) @type)
+(item_flags name: (ident) @type)
+(item_enum name: (ident) @type)
+(item_union name: (ident) @type)
+(item_resource name: (ident) @type)
+
+(item_use from: (ident) @namespace)
+(use_item name: (ident) @type)
+(item_func name: (ident) @function)
+(method name: (ident) @function.method)
+(fields (named_ty name: (ident) @variable.other.member))
+(input (args (named_ty name: (ident) @variable.parameter)))
+(output (args (named_ty name: (ident) @variable.other.member)))
+(flags (ident) @constant)
+(enum_items (ident) @constant)
+(variant_item tag: (ident) @type.enum.variant)
+
+[
+  (unit)
+
+  "u8" "u16" "u32" "u64"
+  "s8" "s16" "s32" "s64"
+  "float32" "float64"
+  "char" "bool" "string"
+] @type.builtin
+
+[
+  "list"
+  "option"
+  "result"
+  "tuple"
+  "future"
+  "stream"
+] @function.macro
+
+[ "," ":" ] @punctuation.delimiter
+[ "(" ")" "{" "}" "<" ">" ] @punctuation.bracket
+[ "=" "->" ] @operator
+
+[
+  "record"
+  "flags"
+  "variant"
+  "enum"
+  "union"
+  "type"
+  "resource"
+] @keyword.storage.type
+
+"func" @keyword
+
+[
+  "static"
+] @keyword.storage.modifier
+
+[
+  (star)
+  "use"
+  "as"
+  "from"
+] @keyword.control.import
diff --git a/runtime/queries/wit/indents.scm b/runtime/queries/wit/indents.scm
new file mode 100644
index 00000000..db6c148b
--- /dev/null
+++ b/runtime/queries/wit/indents.scm
@@ -0,0 +1,13 @@
+[
+  (use_items)
+  (fields)
+  (variant_items)
+  (variant_payload)
+  (flags)
+  (enum_items)
+  (union_items)
+  (args)
+  (resource_items)
+] @indent
+
+[ "}" ")" ] @outdent

From ed7ea8c9ba639daebdbc81630bd789aeb344e2d4 Mon Sep 17 00:00:00 2001
From: seshotake <116971836+seshotake@users.noreply.github.com>
Date: Tue, 1 Nov 2022 02:23:09 +0200
Subject: [PATCH 418/884] add highlights for env and ini file formats (#4536)

---
 book/src/generated/lang-support.md |  2 ++
 languages.toml                     | 27 ++++++++++++++++++++++++++-
 runtime/queries/env/highlights.scm | 19 +++++++++++++++++++
 runtime/queries/ini/highlights.scm |  6 ++++++
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/env/highlights.scm
 create mode 100644 runtime/queries/ini/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 38d121b5..411e67b8 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -27,6 +27,7 @@
 | elixir | ✓ | ✓ |  | `elixir-ls` |
 | elm | ✓ |  |  | `elm-language-server` |
 | elvish | ✓ |  |  | `elvish` |
+| env | ✓ |  |  |  |
 | erb | ✓ |  |  |  |
 | erlang | ✓ | ✓ |  | `erlang_ls` |
 | esdl | ✓ |  |  |  |
@@ -53,6 +54,7 @@
 | html | ✓ |  |  | `vscode-html-language-server` |
 | idris |  |  |  | `idris2-lsp` |
 | iex | ✓ |  |  |  |
+| ini | ✓ |  |  |  |
 | java | ✓ |  |  | `jdtls` |
 | javascript | ✓ | ✓ | ✓ | `typescript-language-server` |
 | jsdoc | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index ee31f372..95c37945 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1938,4 +1938,29 @@ indent = { tab-width = 2, unit = "  " }
 [[grammar]]
 name = "wit"
 source = { git = "https://github.com/hh9527/tree-sitter-wit", rev = "c917790ab9aec50c5fd664cbfad8dd45110cfff3" }
- 
+
+[[language]]
+name = "env"
+scope = "source.env"
+file-types = [".env", ".env.local", ".env.development", ".env.production"]
+injection-regex = "env"
+comment-token = "#"
+indent = { tab-width = 4, unit = "\t" }
+roots = []
+
+[[grammar]]
+name = "env"
+source = { git = "https://github.com/seshotake/tree-sitter-env", rev = "e6c6bb1e7b51d481cba463fe949f083cf22d81f7" }
+
+[[language]]
+name = "ini"
+scope = "source.ini"
+file-types = ["ini"]
+injection-regex = "ini"
+comment-token = "#"
+indent = { tab-width = 4, unit = "\t" }
+roots = []
+
+[[grammar]]
+name = "ini"
+source = { git = "https://github.com/justinmk/tree-sitter-ini", rev = "4d247fb876b4ae6b347687de4a179511bf67fcbc" }
diff --git a/runtime/queries/env/highlights.scm b/runtime/queries/env/highlights.scm
new file mode 100644
index 00000000..6a27e8e5
--- /dev/null
+++ b/runtime/queries/env/highlights.scm
@@ -0,0 +1,19 @@
+(env_variable (quoted_string)) @string
+(env_variable (unquoted_string)) @string
+
+(env_key) @keyword
+
+((variable) @keyword
+  (#match? @keyword "^([A-Z][A-Z_0-9]*)$"))
+  
+[
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  "$"
+  "=" 
+] @operator
+
+(comment) @comment
\ No newline at end of file
diff --git a/runtime/queries/ini/highlights.scm b/runtime/queries/ini/highlights.scm
new file mode 100644
index 00000000..6277a067
--- /dev/null
+++ b/runtime/queries/ini/highlights.scm
@@ -0,0 +1,6 @@
+(section_name) @namespace
+
+(setting_name) @keyword
+(setting_value) @string
+
+(comment) @comment

From 9b247b1104ab34d55ca383daafab2a26dae31253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Ho=C3=9F?= <seb@xn--ho-hia.de>
Date: Tue, 1 Nov 2022 01:27:53 +0100
Subject: [PATCH 419/884] Update SSH client config grammar & highlight queries
 (#4538)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sebastian Hoß <seb@hoß.de>
---
 languages.toml                                |   2 +-
 .../queries/sshclientconfig/highlights.scm    | 170 +++++++++---------
 2 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/languages.toml b/languages.toml
index 95c37945..adce81c5 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1518,7 +1518,7 @@ roots = []
 
 [[grammar]]
 name = "sshclientconfig"
-source = { git = "https://github.com/metio/tree-sitter-ssh-client-config", rev = "769d7a01a2e5493b4bb5a51096c6bf4be130b024" }
+source = { git = "https://github.com/metio/tree-sitter-ssh-client-config", rev = "e45c6d5c71657344d4ecaf87dafae7736f776c57" }
 
 [[language]]
 name = "scheme"
diff --git a/runtime/queries/sshclientconfig/highlights.scm b/runtime/queries/sshclientconfig/highlights.scm
index 83a212a2..b54da587 100644
--- a/runtime/queries/sshclientconfig/highlights.scm
+++ b/runtime/queries/sshclientconfig/highlights.scm
@@ -1,17 +1,17 @@
-(host) @keyword
-(host_value) @identifier
+(host) @namespace
+(host_value) @string
 
-(match) @keyword
-(match_value) @identifier
+(match) @namespace
+(match_value) @string
 
 (add_keys_to_agent) @keyword
-(add_keys_to_agent_value) @boolean
+(add_keys_to_agent_value) @constant.builtin.boolean
 
 (address_family) @keyword
-(address_family_value) @type
+(address_family_value) @constant.builtin
 
 (batch_mode) @keyword
-(batch_mode_value) @boolean
+(batch_mode_value) @constant.builtin.boolean
 
 (bind_address) @keyword
 (bind_address_value) @string
@@ -20,165 +20,165 @@
 (bind_interface_value) @string
 
 (canonical_domains) @keyword
-(canonical_domains_value) @identifier
+(canonical_domains_value) @string
 
 (canonicalize_fallback_local) @keyword
-(canonicalize_fallback_local_value) @boolean
+(canonicalize_fallback_local_value) @constant.builtin.boolean
 
 (canonicalize_hostname) @keyword
-(canonicalize_hostname_value) @boolean
+(canonicalize_hostname_value) @constant.builtin
 
 (canonicalize_max_dots) @keyword
-(canonicalize_max_dots_value) @number
+(canonicalize_max_dots_value) @constant.numeric.integer
 
 (canonicalize_permitted_cnames) @keyword
-(canonicalize_permitted_cnames_value) @identifier
+(canonicalize_permitted_cnames_value) @string
 
 (ca_signature_algorithms) @keyword
-(ca_signature_algorithms_value) @identifier
+(ca_signature_algorithms_value) @string
 
 (certificate_file) @keyword
-(certificate_file_value) @file
+(certificate_file_value) @string.special.path
 
 (challenge_response_authentication) @keyword
-(challenge_response_authentication_value) @boolean
+(challenge_response_authentication_value) @constant.builtin.boolean
 
 (check_host_ip) @keyword
-(check_host_ip_value) @boolean
+(check_host_ip_value) @constant.builtin.boolean
 
 (cipher) @keyword
-(cipher_value) @identifier
+(cipher_value) @string
 
 (ciphers) @keyword
-(ciphers_value) @identifier
+(ciphers_value) @string
 
 (clear_all_forwardings) @keyword
-(clear_all_forwardings_value) @boolean
+(clear_all_forwardings_value) @constant.builtin.boolean
 
 (comment) @comment
 
 (compression) @keyword
-(compression_value) @boolean
+(compression_value) @constant.builtin.boolean
 
 (connect_timeout) @keyword
-(connect_timeout_value) @number
+(connect_timeout_value) @constant.numeric.integer
 
 (connection_attempts) @keyword
-(connection_attempts_value) @number
+(connection_attempts_value) @constant.numeric.integer
 
 (control_master) @keyword
-(control_master_value) @type
+(control_master_value) @constant.builtin
 
 (control_path) @keyword
-(control_path_value) @file
+(control_path_value) @string.special.path
 
 (control_persist) @keyword
-(control_persist_value) @type
+(control_persist_value) @constant.builtin
 
 (dynamic_forward) @keyword
 (dynamic_forward_value) @string
 
 (enable_ssh_keysign) @keyword
-(enable_ssh_keysign_value) @boolean
+(enable_ssh_keysign_value) @constant.builtin.boolean
 
 (escape_char) @keyword
-(escape_char_value) @string
+(escape_char_value) @constant.character.escape
 
 (exit_on_forward_failure) @keyword
-(exit_on_forward_failure_value) @boolean
+(exit_on_forward_failure_value) @constant.builtin.boolean
 
 (fingerprint_hash) @keyword
-(fingerprint_hash_value) @identifier
+(fingerprint_hash_value) @constant.builtin
 
 (fork_after_authentication) @keyword
-(fork_after_authentication_value) @boolean
+(fork_after_authentication_value) @constant.builtin.boolean
 
 (forward_agent) @keyword
-(forward_agent_value) @boolean
+(forward_agent_value) @string
 
 (forward_x11) @keyword
-(forward_x11_value) @boolean
+(forward_x11_value) @constant.builtin.boolean
 
 (forward_x11_timeout) @keyword
-(forward_x11_timeout_value) @time
+(forward_x11_timeout_value) @constant.numeric.integer
 
 (forward_x11_trusted) @keyword
-(forward_x11_trusted_value) @boolean
+(forward_x11_trusted_value) @constant.builtin.boolean
 
 (gateway_ports) @keyword
-(gateway_ports_value) @boolean
+(gateway_ports_value) @constant.builtin.boolean
 
 (global_known_hosts_file) @keyword
-(global_known_hosts_file_value) @file
+(global_known_hosts_file_value) @string.special.path
 
 (gssapi_authentication) @keyword
-(gssapi_authentication_value) @boolean
+(gssapi_authentication_value) @constant.builtin.boolean
 
 (gssapi_client_identity) @keyword
 (gssapi_client_identity_value) @string
 
 (gssapi_delegate_credentials) @keyword
-(gssapi_delegate_credentials_value) @boolean
+(gssapi_delegate_credentials_value) @constant.builtin.boolean
 
 (gssapi_kex_algorithms) @keyword
-(gssapi_kex_algorithms_value) @identifier
+(gssapi_kex_algorithms_value) @string
 
 (gssapi_key_exchange) @keyword
-(gssapi_key_exchange_value) @boolean
+(gssapi_key_exchange_value) @constant.builtin.boolean
 
 (gssapi_renewal_forces_rekey) @keyword
-(gssapi_renewal_forces_rekey_value) @boolean
+(gssapi_renewal_forces_rekey_value) @constant.builtin.boolean
 
 (gssapi_server_identity) @keyword
 (gssapi_server_identity_value) @string
 
 (gssapi_trust_dns) @keyword
-(gssapi_trust_dns_value) @boolean
+(gssapi_trust_dns_value) @constant.builtin.boolean
 
 (hash_known_hosts) @keyword
-(hash_known_hosts_value) @boolean
+(hash_known_hosts_value) @constant.builtin.boolean
 
 (host_key_algorithms) @keyword
-(host_key_algorithms_value) @identifier
+(host_key_algorithms_value) @string
 
 (host_key_alias) @keyword
 (host_key_alias_value) @string
 
 (hostbased_accepted_algorithms) @keyword
-(hostbased_accepted_algorithms_value) @identifier
+(hostbased_accepted_algorithms_value) @string
 
 (hostbased_authentication) @keyword
-(hostbased_authentication_value) @boolean
+(hostbased_authentication_value) @constant.builtin.boolean
 
 (hostname) @keyword
 (hostname_value) @string
 
 (identities_only) @keyword
-(identities_only_value) @boolean
+(identities_only_value) @constant.builtin.boolean
 
 (identity_agent) @keyword
 (identity_agent_value) @string
 
 (identity_file) @keyword
-(identity_file_value) @file
+(identity_file_value) @string.special.path
 
 (ignore_unknown) @keyword
 (ignore_unknown_value) @string
 
-(include) @keyword
-(include_value) @file
+(include) @function.macro
+(include_value) @string.special.path
 
 (ip_qos) @keyword
-(ip_qos_value) @type
+(ip_qos_value) @constant.builtin
 
 (kbd_interactive_authentication) @keyword
-(kbd_interactive_authentication_value) @boolean
+(kbd_interactive_authentication_value) @constant.builtin.boolean
 
 (kbd_interactive_devices) @keyword
-(kbd_interactive_devices_value) @type
+(kbd_interactive_devices_value) @string
 
 (kex_algorithms) @keyword
-(kex_algorithms_value) @identifier
+(kex_algorithms_value) @string
 
 (known_hosts_command) @keyword
 (known_hosts_command_value) @string
@@ -190,25 +190,25 @@
 (local_forward_value) @string
 
 (log_level) @keyword
-(log_level_value) @type
+(log_level_value) @constant.builtin
 
 (log_verbose) @keyword
 (log_verbose_value) @string
 
 (macs) @keyword
-(macs_value) @identifier
+(macs_value) @string
 
 (no_host_authentication_for_localhost) @keyword
-(no_host_authentication_for_localhost_value) @boolean
+(no_host_authentication_for_localhost_value) @constant.builtin.boolean
 
 (number_of_password_prompts) @keyword
-(number_of_password_prompts_value) @number
+(number_of_password_prompts_value) @constant.numeric.integer
 
 (password_authentication) @keyword
-(password_authentication_value) @boolean
+(password_authentication_value) @constant.builtin.boolean
 
 (permit_local_command) @keyword
-(permit_local_command_value) @boolean
+(permit_local_command_value) @constant.builtin.boolean
 
 (permit_remote_open) @keyword
 (permit_remote_open_value) @string
@@ -217,13 +217,13 @@
 (pkcs11_provider_value) @string
 
 (port) @keyword
-(port_value) @number
+(port_value) @constant.numeric.integer
 
 (preferred_authentications) @keyword
-(preferred_authentications_value) @type
+(preferred_authentications_value) @string
 
 (protocol) @keyword
-(protocol_value) @number
+(protocol_value) @constant.numeric.integer
 
 (proxy_command) @keyword
 (proxy_command_value) @string
@@ -232,16 +232,16 @@
 (proxy_jump_value) @string
 
 (proxy_use_fdpass) @keyword
-(proxy_use_fdpass_value) @boolean
+(proxy_use_fdpass_value) @constant.builtin.boolean
 
 (pubkey_accepted_algorithms) @keyword
-(pubkey_accepted_algorithms_value) @identifier
+(pubkey_accepted_algorithms_value) @string
 
 (pubkey_accepted_key_types) @keyword
-(pubkey_accepted_key_types_value) @identifier
+(pubkey_accepted_key_types_value) @string
 
 (pubkey_authentication) @keyword
-(pubkey_authentication_value) @boolean
+(pubkey_authentication_value) @constant.builtin
 
 (rekey_limit) @keyword
 (rekey_limit_value) @string
@@ -253,10 +253,10 @@
 (remote_forward_value) @string
 
 (request_tty) @keyword
-(request_tty_value) @type
+(request_tty_value) @constant.builtin
 
 (revoked_host_keys) @keyword
-(revoked_host_keys_value) @file
+(revoked_host_keys_value) @string.special.path
 
 (security_key_provider) @keyword
 (security_key_provider_value) @string
@@ -265,60 +265,60 @@
 (send_env_value) @string
 
 (server_alive_count_max) @keyword
-(server_alive_count_max_value) @number
+(server_alive_count_max_value) @constant.numeric.integer
 
 (server_alive_interval) @keyword
-(server_alive_interval_value) @number
+(server_alive_interval_value) @constant.numeric.integer
 
 (session_type) @keyword
-(session_type_value) @type
+(session_type_value) @constant.builtin
 
 (set_env) @keyword
 (set_env_value) @string
 
 (stdin_null) @keyword
-(stdin_null_value) @boolean
+(stdin_null_value) @constant.builtin.boolean
 
 (stream_local_bind_mask) @keyword
 (stream_local_bind_mask_value) @string
 
 (stream_local_bind_unlink) @keyword
-(stream_local_bind_unlink_value) @boolean
+(stream_local_bind_unlink_value) @constant.builtin.boolean
 
 (strict_host_key_checking) @keyword
-(strict_host_key_checking_value) @type
+(strict_host_key_checking_value) @constant.builtin
 
 (syslog_facility) @keyword
-(syslog_facility_value) @type
+(syslog_facility_value) @constant.builtin
 
 (tcp_keep_alive) @keyword
-(tcp_keep_alive_value) @boolean
+(tcp_keep_alive_value) @constant.builtin.boolean
 (keep_alive) @keyword
-(keep_alive_value) @boolean
+(keep_alive_value) @constant.builtin.boolean
 
 (tunnel) @keyword
-(tunnel_value) @type
+(tunnel_value) @constant.builtin
 
 (tunnel_device) @keyword
 (tunnel_device_value) @string
 
 (update_host_keys) @keyword
-(update_host_keys_value) @type
+(update_host_keys_value) @constant.builtin
 
 (use_keychain) @keyword
-(use_keychain_value) @boolean
+(use_keychain_value) @constant.builtin.boolean
 
 (user) @keyword
 (user_value) @string
 
 (user_known_hosts_file) @keyword
-(user_known_hosts_file_value) @file
+(user_known_hosts_file_value) @string.special.path
 
 (verify_host_key_dns) @keyword
-(verify_host_key_dns_value) @type
+(verify_host_key_dns_value) @constant.builtin
 
 (visual_host_key) @keyword
-(visual_host_key_value) @boolean
+(visual_host_key_value) @constant.builtin.boolean
 
 (xauth_location) @keyword
-(xauth_location_value) @file
+(xauth_location_value) @string.special.path

From 92b13f9e71c7d8adae4a6c1fa5f0135137c3c290 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Oct 2022 19:29:01 -0500
Subject: [PATCH 420/884] build(deps): bump cc from 1.0.73 to 1.0.74 (#4549)

Bumps [cc](https://github.com/rust-lang/cc-rs) from 1.0.73 to 1.0.74.
- [Release notes](https://github.com/rust-lang/cc-rs/releases)
- [Commits](https://github.com/rust-lang/cc-rs/compare/1.0.73...1.0.74)

---
updated-dependencies:
- dependency-name: cc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 163b3ad4..e4d4568a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -92,9 +92,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
 
 [[package]]
 name = "cc"
-version = "1.0.73"
+version = "1.0.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574"
 
 [[package]]
 name = "cfg-if"

From 3792d9ebb7ffc3294987d3fae0c14511cbdbb615 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Oct 2022 19:29:32 -0500
Subject: [PATCH 421/884] build(deps): bump lsp-types from 0.93.1 to 0.93.2
 (#4550)

Bumps [lsp-types](https://github.com/gluon-lang/lsp-types) from 0.93.1 to 0.93.2.
- [Release notes](https://github.com/gluon-lang/lsp-types/releases)
- [Changelog](https://github.com/gluon-lang/lsp-types/blob/master/CHANGELOG.md)
- [Commits](https://github.com/gluon-lang/lsp-types/compare/v0.93.1...v0.93.2)

---
updated-dependencies:
- dependency-name: lsp-types
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e4d4568a..ecbc0a14 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -684,9 +684,9 @@ dependencies = [
 
 [[package]]
 name = "lsp-types"
-version = "0.93.1"
+version = "0.93.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3bcfee315dde785ba887edb540b08765fd7df75a7d948844be6bf5712246734"
+checksum = "9be6e9c7e2d18f651974370d7aff703f9513e0df6e464fd795660edc77e6ca51"
 dependencies = [
  "bitflags",
  "serde",

From 79c7203a388e1ac7aa6aebfc2e4c9a91b6efc97a Mon Sep 17 00:00:00 2001
From: Jonas Everaert <62475953+Jomy10@users.noreply.github.com>
Date: Tue, 1 Nov 2022 01:30:08 +0100
Subject: [PATCH 422/884] Added missing keywords to wat (wasm) hightlights
 (#4542)

added "if", "then", "else", "block", "loop", "end" and "mut" to the wat highlights.
---
 runtime/queries/wat/highlights.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/runtime/queries/wat/highlights.scm b/runtime/queries/wat/highlights.scm
index 007e3bbf..93f03aac 100644
--- a/runtime/queries/wat/highlights.scm
+++ b/runtime/queries/wat/highlights.scm
@@ -1,4 +1,7 @@
-["module" "func" "param" "result" "type" "memory" "elem" "data" "table" "global"] @keyword
+[
+  "module" "func" "param" "result" "type" "memory" "elem" "data" "table" "global"
+  "if" "then" "else" "block" "loop" "end" "mut"
+] @keyword
 
 ["import" "export"] @keyword.control.import
 

From e5319ea8c52d6c97ce901426c2714a26f535be0b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Oct 2022 19:31:08 -0500
Subject: [PATCH 423/884] build(deps): bump once_cell from 1.15.0 to 1.16.0
 (#4548)

Bumps [once_cell](https://github.com/matklad/once_cell) from 1.15.0 to 1.16.0.
- [Release notes](https://github.com/matklad/once_cell/releases)
- [Changelog](https://github.com/matklad/once_cell/blob/master/CHANGELOG.md)
- [Commits](https://github.com/matklad/once_cell/compare/v1.15.0...v1.16.0)

---
updated-dependencies:
- dependency-name: once_cell
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock              | 4 ++--
 helix-core/Cargo.toml   | 2 +-
 helix-loader/Cargo.toml | 2 +-
 helix-term/Cargo.toml   | 2 +-
 helix-view/Cargo.toml   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ecbc0a14..93459aa0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -753,9 +753,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
+checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
 
 [[package]]
 name = "parking_lot"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 7585c347..45272f98 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -26,7 +26,7 @@ unicode-general-category = "0.6"
 # slab = "0.4.2"
 slotmap = "1.0"
 tree-sitter = "0.20"
-once_cell = "1.15"
+once_cell = "1.16"
 arc-swap = "1"
 regex = "1"
 bitflags = "1.3"
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index b4541de5..760205e1 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -19,7 +19,7 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.5"
 etcetera = "0.4"
 tree-sitter = "0.20"
-once_cell = "1.15"
+once_cell = "1.16"
 log = "0.4"
 
 # TODO: these two should be on !wasm32 only
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 30de5589..485cabe9 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -32,7 +32,7 @@ helix-dap = { version = "0.6", path = "../helix-dap" }
 helix-loader = { version = "0.6", path = "../helix-loader" }
 
 anyhow = "1"
-once_cell = "1.15"
+once_cell = "1.16"
 
 which = "4.2"
 
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index b96a537d..a2a88001 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -23,7 +23,7 @@ helix-dap = { version = "0.6", path = "../helix-dap" }
 crossterm = { version = "0.25", optional = true }
 
 # Conversion traits
-once_cell = "1.15"
+once_cell = "1.16"
 url = "2"
 
 arc-swap = { version = "1.5.1" }

From 3881fef39d01c94a09b8f5da67decc2c3ccb3660 Mon Sep 17 00:00:00 2001
From: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
Date: Tue, 1 Nov 2022 03:52:03 +0300
Subject: [PATCH 424/884] build(nix): update nci, fixup flake (#4537)

---
 flake.lock |  71 ++++++++++++-----
 flake.nix  | 225 ++++++++++++++++++++++++++---------------------------
 2 files changed, 165 insertions(+), 131 deletions(-)

diff --git a/flake.lock b/flake.lock
index f28ec884..cfa227e3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,22 @@
 {
   "nodes": {
+    "all-cabal-json": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1665552503,
+        "narHash": "sha256-r14RmRSwzv5c+bWKUDaze6pXM7nOsiz1H8nvFHJvufc=",
+        "owner": "nix-community",
+        "repo": "all-cabal-json",
+        "rev": "d7c0434eebffb305071404edcf9d5cd99703878e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "hackage",
+        "repo": "all-cabal-json",
+        "type": "github"
+      }
+    },
     "crane": {
       "flake": false,
       "locked": {
@@ -19,11 +36,11 @@
     "devshell": {
       "flake": false,
       "locked": {
-        "lastModified": 1660811669,
-        "narHash": "sha256-V6lmsaLNFz41myppL0yxglta92ijkSvpZ+XVygAh+bU=",
+        "lastModified": 1666548262,
+        "narHash": "sha256-4DyN4KXqQQsCw0vCXkMThw4b5Q4/q87ZZgRb4st8COc=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "c2feacb46ee69949124c835419861143c4016fb5",
+        "rev": "c8ce8ed81726079c398f5f29c4b68a7d6a3c2fa2",
         "type": "github"
       },
       "original": {
@@ -38,6 +55,7 @@
           "nci",
           "nixpkgs"
         ],
+        "all-cabal-json": "all-cabal-json",
         "crane": "crane",
         "devshell": [
           "nci",
@@ -47,6 +65,7 @@
           "nci",
           "nixpkgs"
         ],
+        "ghc-utils": "ghc-utils",
         "gomod2nix": [
           "nci",
           "nixpkgs"
@@ -69,11 +88,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1662176993,
-        "narHash": "sha256-Sy7DsGAveDUFBb6YDsUSYZd/AcXfP/MOMIwMt/NgY84=",
+        "lastModified": 1666993587,
+        "narHash": "sha256-4cLrs+CwWnceYXnCpL5gO3bybS9CjLxUoTEKjB2QFtg=",
         "owner": "nix-community",
         "repo": "dream2nix",
-        "rev": "809bc5940214744eb29778a9a0b03f161979c1b2",
+        "rev": "2b7456e3d2f0053bc2474fb0c461dd468545277f",
         "type": "github"
       },
       "original": {
@@ -84,11 +103,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1656928814,
-        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
@@ -97,6 +116,22 @@
         "type": "github"
       }
     },
+    "ghc-utils": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1662774800,
+        "narHash": "sha256-1Rd2eohGUw/s1tfvkepeYpg8kCEXiIot0RijapUjAkE=",
+        "ref": "refs/heads/master",
+        "rev": "bb3a2d3dc52ff0253fb9c2812bd7aa2da03e0fea",
+        "revCount": 1072,
+        "type": "git",
+        "url": "https://gitlab.haskell.org/bgamari/ghc-utils"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://gitlab.haskell.org/bgamari/ghc-utils"
+      }
+    },
     "nci": {
       "inputs": {
         "devshell": "devshell",
@@ -109,11 +144,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1662177071,
-        "narHash": "sha256-x6XF//RdZlw81tFAYM1TkjY+iQIpyMCWZ46r9o4wVQY=",
+        "lastModified": 1667232647,
+        "narHash": "sha256-cFo7G8BqYShgL9m7yD6p+SHAZ+aIt2guuF69LV235n8=",
         "owner": "yusdacra",
         "repo": "nix-cargo-integration",
-        "rev": "65270dea87bb82fc02102a15221677eea237680e",
+        "rev": "16082f7b4e42ce140a562fa630bcf8e96eadeb59",
         "type": "github"
       },
       "original": {
@@ -124,11 +159,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1662019588,
-        "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=",
+        "lastModified": 1667142599,
+        "narHash": "sha256-OLJxsg9VqfKjFkerOxWtNIkibsCvxsv5A8wNWO1MeWk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2da64a81275b68fdad38af669afeda43d401e94b",
+        "rev": "412b9917cea092f3d39f9cd5dead4effd5bc4053",
         "type": "github"
       },
       "original": {
@@ -153,11 +188,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1662087605,
-        "narHash": "sha256-Gpf2gp2JenKGf+TylX/YJpttY2bzsnvAMLdLaxoZRyU=",
+        "lastModified": 1667184938,
+        "narHash": "sha256-/kuCiXuAxiD0c0zrfDvJ1Yba3FuVdRk/ROfb393AeX4=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "60c2cfaa8b90ed8cebd18b214fac8682dcf222dd",
+        "rev": "8f81faec35508647ced65c44fd3e8648a5518afb",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 8cb4b663..b1d3f01e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,57 +21,124 @@
     ...
   }: let
     lib = nixpkgs.lib;
+    ncl = nci.lib.nci-lib;
     mkRootPath = rel:
       builtins.path {
         path = "${toString ./.}/${rel}";
         name = rel;
       };
+    filteredSource = let
+      pathsToIgnore = [
+        ".envrc"
+        ".ignore"
+        ".github"
+        "runtime"
+        "screenshot.png"
+        "book"
+        "contrib"
+        "docs"
+        "README.md"
+        "CHANGELOG.md"
+        "shell.nix"
+        "default.nix"
+        "grammars.nix"
+        "flake.nix"
+        "flake.lock"
+      ];
+      ignorePaths = path: type: let
+        # split the nix store path into its components
+        components = lib.splitString "/" path;
+        # drop off the `/nix/hash-source` section from the path
+        relPathComponents = lib.drop 4 components;
+        # reassemble the path components
+        relPath = lib.concatStringsSep "/" relPathComponents;
+      in
+        lib.all (p: ! (lib.hasPrefix p relPath)) pathsToIgnore;
+    in
+      builtins.path {
+        name = "helix-source";
+        path = toString ./.;
+        # filter out unnecessary paths
+        filter = ignorePaths;
+      };
     outputs = nci.lib.makeOutputs {
       root = ./.;
-      renameOutputs = {"helix-term" = "helix";};
-      # Set default app to hx (binary is from helix-term release build)
-      # Set default package to helix-term release build
-      defaultOutputs = {
-        app = "hx";
-        package = "helix";
+      config = common: {
+        outputs = {
+          # rename helix-term to helix since it's our main package
+          rename = {"helix-term" = "helix";};
+          # Set default app to hx (binary is from helix-term release build)
+          # Set default package to helix-term release build
+          defaults = {
+            app = "hx";
+            package = "helix";
+          };
+        };
+        cCompiler.package = with common.pkgs;
+          if stdenv.isLinux
+          then gcc
+          else clang;
+        shell = {
+          packages = with common.pkgs;
+            [lld_13 cargo-flamegraph rust-analyzer]
+            ++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) cargo-tarpaulin)
+            ++ (lib.optional stdenv.isLinux lldb);
+          env = [
+            {
+              name = "HELIX_RUNTIME";
+              eval = "$PWD/runtime";
+            }
+            {
+              name = "RUST_BACKTRACE";
+              value = "1";
+            }
+            {
+              name = "RUSTFLAGS";
+              value =
+                if common.pkgs.stdenv.isLinux
+                then "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment"
+                else "";
+            }
+          ];
+        };
       };
-      overrides = {
-        cCompiler = common:
-          with common.pkgs;
-            if stdenv.isLinux
-            then gcc
-            else clang;
-        crateOverrides = common: _: {
-          helix-term = prev: {
-            src = builtins.path {
-              name = "helix-source";
-              path = toString ./.;
-              # filter out unneeded stuff that cause rebuilds
-              filter = path: type:
-                lib.all
-                (n: builtins.baseNameOf path != n)
-                [
-                  ".envrc"
-                  ".ignore"
-                  ".github"
-                  "runtime"
-                  "screenshot.png"
-                  "book"
-                  "contrib"
-                  "docs"
-                  "README.md"
-                  "shell.nix"
-                  "default.nix"
-                  "grammars.nix"
-                  "flake.nix"
-                  "flake.lock"
-                ];
-            };
+      pkgConfig = common: {
+        helix-term = {
+          # Wrap helix with runtime
+          wrapper = _: old: let
+            inherit (common) pkgs;
+            makeOverridableHelix = old: config: let
+              grammars = pkgs.callPackage ./grammars.nix config;
+              runtimeDir = pkgs.runCommand "helix-runtime" {} ''
+                mkdir -p $out
+                ln -s ${mkRootPath "runtime"}/* $out
+                rm -r $out/grammars
+                ln -s ${grammars} $out/grammars
+              '';
+              helix-wrapped =
+                common.internal.pkgsSet.utils.wrapDerivation old
+                {
+                  nativeBuildInputs = [pkgs.makeWrapper];
+                  makeWrapperArgs = config.makeWrapperArgs or [];
+                }
+                ''
+                  rm -rf $out/bin
+                  mkdir -p $out/bin
+                  ln -sf ${old}/bin/* $out/bin/
+                  wrapProgram "$out/bin/hx" ''${makeWrapperArgs[@]} --set HELIX_RUNTIME "${runtimeDir}"
+                '';
+            in
+              helix-wrapped
+              // {override = makeOverridableHelix old;};
+          in
+            makeOverridableHelix old {};
+          overrides.fix-build.overrideAttrs = prev: {
+            src = filteredSource;
 
             # disable fetching and building of tree-sitter grammars in the helix-term build.rs
             HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
 
-            buildInputs = (prev.buildInputs or []) ++ [common.cCompiler.cc.lib];
+            buildInputs = ncl.addBuildInputs prev [common.config.cCompiler.package.cc.lib];
 
             # link languages and theme toml files since helix-term expects them (for tests)
             preConfigure = ''
@@ -87,88 +154,20 @@
             meta.mainProgram = "hx";
           };
         };
-        shell = common: prev: {
-          packages =
-            prev.packages
-            ++ (
-              with common.pkgs;
-                [lld_13 cargo-flamegraph rust-analyzer]
-                ++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) cargo-tarpaulin)
-                ++ (lib.optional stdenv.isLinux lldb)
-            );
-          env =
-            prev.env
-            ++ [
-              {
-                name = "HELIX_RUNTIME";
-                eval = "$PWD/runtime";
-              }
-              {
-                name = "RUST_BACKTRACE";
-                value = "1";
-              }
-              {
-                name = "RUSTFLAGS";
-                value =
-                  if common.pkgs.stdenv.isLinux
-                  then "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment"
-                  else "";
-              }
-            ];
-        };
       };
     };
-    makeOverridableHelix = system: old: config: let
-      pkgs = nixpkgs.legacyPackages.${system};
-      grammars = pkgs.callPackage ./grammars.nix config;
-      runtimeDir = pkgs.runCommand "helix-runtime" {} ''
-        mkdir -p $out
-        ln -s ${mkRootPath "runtime"}/* $out
-        rm -r $out/grammars
-        ln -s ${grammars} $out/grammars
-      '';
-      helix-wrapped =
-        pkgs.runCommand "${old.name}-wrapped"
-        {
-          inherit (old) pname version meta;
-
-          nativeBuildInputs = [pkgs.makeWrapper];
-          makeWrapperArgs = config.makeWrapperArgs or [];
-        }
-        ''
-          mkdir -p $out
-          cp -r --no-preserve=mode,ownership ${old}/* $out/
-          chmod +x $out/bin/*
-          wrapProgram "$out/bin/hx" ''${makeWrapperArgs[@]} --set HELIX_RUNTIME "${runtimeDir}"
-        '';
-    in
-      helix-wrapped
-      // {override = makeOverridableHelix system old;};
   in
     outputs
     // {
-      apps =
-        lib.mapAttrs
-        (
-          system: apps: rec {
-            default = hx;
-            hx = {
-              type = "app";
-              program = lib.getExe self.${system}.packages.helix;
-            };
-          }
-        )
-        outputs.apps;
       packages =
         lib.mapAttrs
         (
-          system: packages: rec {
-            default = helix;
-            helix = makeOverridableHelix system helix-unwrapped {};
-            helix-debug = makeOverridableHelix system helix-unwrapped-debug {};
-            helix-unwrapped = packages.helix;
-            helix-unwrapped-debug = packages.helix-debug;
-          }
+          system: packages:
+            packages
+            // {
+              helix-unwrapped = packages.helix.passthru.unwrapped;
+              helix-unwrapped-debug = packages.helix-debug.passthru.unwrapped;
+            }
         )
         outputs.packages;
     };

From 8584b38cfbe6ffe3e5d539ad953c413e44e90bfa Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Tue, 1 Nov 2022 12:48:37 +0100
Subject: [PATCH 425/884] Correctly handle escaping in completion (#4316)

* Correctly handle escaping in completion

* Added escaping tests
---
 helix-core/src/shellwords.rs     | 31 +++++++++++++++++++++++++++++++
 helix-term/src/commands/typed.rs |  9 ++++-----
 helix-term/src/ui/prompt.rs      |  6 +++++-
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/helix-core/src/shellwords.rs b/helix-core/src/shellwords.rs
index afc83496..6edf3cc7 100644
--- a/helix-core/src/shellwords.rs
+++ b/helix-core/src/shellwords.rs
@@ -1,5 +1,22 @@
 use std::borrow::Cow;
 
+/// Auto escape for shellwords usage.
+pub fn escape(input: &str) -> Cow<'_, str> {
+    if !input.chars().any(|x| x.is_ascii_whitespace()) {
+        Cow::Borrowed(input)
+    } else if cfg!(unix) {
+        Cow::Owned(input.chars().fold(String::new(), |mut buf, c| {
+            if c.is_ascii_whitespace() {
+                buf.push('\\');
+            }
+            buf.push(c);
+            buf
+        }))
+    } else {
+        Cow::Owned(format!("\"{}\"", input))
+    }
+}
+
 /// Get the vec of escaped / quoted / doublequoted filenames from the input str
 pub fn shellwords(input: &str) -> Vec<Cow<'_, str>> {
     enum State {
@@ -226,4 +243,18 @@ mod test {
         ];
         assert_eq!(expected, result);
     }
+
+    #[cfg(unix)]
+    fn test_escaping_unix() {
+        assert_eq!(escape("foobar"), Cow::Borrowed("foobar"));
+        assert_eq!(escape("foo bar"), Cow::Borrowed("foo\\ bar"));
+        assert_eq!(escape("foo\tbar"), Cow::Borrowed("foo\\\tbar"));
+    }
+
+    #[test]
+    #[cfg(windows)]
+    fn test_escaping_windows() {
+        assert_eq!(escape("foobar"), Cow::Borrowed("foobar"));
+        assert_eq!(escape("foo bar"), Cow::Borrowed("\"foo bar\""));
+    }
 }
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 0cf75ada..f4dfce7a 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -2183,12 +2183,10 @@ pub(super) fn command_mode(cx: &mut Context) {
             static FUZZY_MATCHER: Lazy<fuzzy_matcher::skim::SkimMatcherV2> =
                 Lazy::new(fuzzy_matcher::skim::SkimMatcherV2::default);
 
-            // we use .this over split_whitespace() because we care about empty segments
-            let parts = input.split(' ').collect::<Vec<&str>>();
-
             // simple heuristic: if there's no just one part, complete command name.
             // if there's a space, per command completion kicks in.
-            if parts.len() <= 1 {
+            // we use .this over split_whitespace() because we care about empty segments
+            if input.split(' ').count() <= 1 {
                 let mut matches: Vec<_> = typed::TYPABLE_COMMAND_LIST
                     .iter()
                     .filter_map(|command| {
@@ -2204,12 +2202,13 @@ pub(super) fn command_mode(cx: &mut Context) {
                     .map(|(name, _)| (0.., name.into()))
                     .collect()
             } else {
+                let parts = shellwords::shellwords(input);
                 let part = parts.last().unwrap();
 
                 if let Some(typed::TypableCommand {
                     completer: Some(completer),
                     ..
-                }) = typed::TYPABLE_COMMAND_MAP.get(parts[0])
+                }) = typed::TYPABLE_COMMAND_MAP.get(&parts[0] as &str)
                 {
                     completer(editor, part)
                         .into_iter()
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index db3bd62d..d0991d3c 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -1,5 +1,6 @@
 use crate::compositor::{Component, Compositor, Context, Event, EventResult};
 use crate::{alt, ctrl, key, shift, ui};
+use helix_core::shellwords;
 use helix_view::input::KeyEvent;
 use helix_view::keyboard::KeyCode;
 use std::{borrow::Cow, ops::RangeFrom};
@@ -335,7 +336,10 @@ impl Prompt {
 
         let (range, item) = &self.completion[index];
 
-        self.line.replace_range(range.clone(), item);
+        // since we are using shellwords to parse arguments, make sure
+        // that whitespace in files is properly escaped.
+        let item = shellwords::escape(item);
+        self.line.replace_range(range.clone(), &item);
 
         self.move_end();
     }

From 8ff92c749287fb3ac4a68661d0ee99cb56cc6295 Mon Sep 17 00:00:00 2001
From: Poliorcetics <poliorcetics@users.noreply.github.com>
Date: Tue, 1 Nov 2022 13:37:19 +0100
Subject: [PATCH 426/884] Add missed test attribute in #4316 (#4557)

---
 helix-core/src/shellwords.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/helix-core/src/shellwords.rs b/helix-core/src/shellwords.rs
index 6edf3cc7..e8c5945b 100644
--- a/helix-core/src/shellwords.rs
+++ b/helix-core/src/shellwords.rs
@@ -244,6 +244,7 @@ mod test {
         assert_eq!(expected, result);
     }
 
+    #[test]
     #[cfg(unix)]
     fn test_escaping_unix() {
         assert_eq!(escape("foobar"), Cow::Borrowed("foobar"));

From c803ef8753bc828c9c68f40878d9467ead50dc0d Mon Sep 17 00:00:00 2001
From: Yuriy Gabuev <yugabuev@gmail.com>
Date: Tue, 1 Nov 2022 15:48:43 +0100
Subject: [PATCH 427/884] Fix `delete_char_backward` for paired characters
 (#4558)

When backward-deleting a character, if this character and the following
character form a Pair, we want to delete both. However, there is a bug
that deletes both characters also if both characters are closers of some
Pair.

This commit fixes that by adding an additional check that the deleted
character should be an opener in a Pair.

Closes https://github.com/helix-editor/helix/issues/4544.
---
 helix-term/src/commands.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index adb4802d..35439431 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3198,6 +3198,7 @@ pub mod insert {
                         (Some(_x), Some(_y), Some(ap))
                             if range.is_single_grapheme(text)
                                 && ap.get(_x).is_some()
+                                && ap.get(_x).unwrap().open == _x
                                 && ap.get(_x).unwrap().close == _y =>
                         // delete both autopaired characters
                         {

From 185236c3a40ef89f9978358d02b83f47ca4da0eb Mon Sep 17 00:00:00 2001
From: Garrett D'Amore <garrett@damore.org>
Date: Tue, 1 Nov 2022 17:44:56 -0700
Subject: [PATCH 428/884] Fix D unittest injection query. (#4562)

---
 runtime/queries/d/textobjects.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/queries/d/textobjects.scm b/runtime/queries/d/textobjects.scm
index 9ca07160..6e9e623a 100644
--- a/runtime/queries/d/textobjects.scm
+++ b/runtime/queries/d/textobjects.scm
@@ -4,6 +4,6 @@
 (class_declaration (aggregate_body) @class.inside) @class.around
 (interface_declaration (aggregate_body) @class.inside) @class.around
 (struct_declaration (aggregate_body) @class.inside) @class.around
-(unittest_declaration (block_statement) @test.insid) @test.around
+(unittest_declaration (block_statement) @test.inside) @test.around
 (parameter) @parameter.inside
-(template_parameter) @parameter.inside
\ No newline at end of file
+(template_parameter) @parameter.inside

From db3383c76e93a696a7dedb8b644ba12b379da9b4 Mon Sep 17 00:00:00 2001
From: Jonathan LEI <me@xjonathan.dev>
Date: Wed, 2 Nov 2022 09:08:25 +0800
Subject: [PATCH 429/884] Exit select mode on replace commands (#4554)

---
 helix-term/src/commands.rs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 35439431..ee9bad98 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1304,6 +1304,7 @@ fn replace(cx: &mut Context) {
             });
 
             apply_transaction(&transaction, doc, view);
+            exit_select_mode(cx);
         }
     })
 }
@@ -3581,18 +3582,19 @@ fn replace_with_yanked(cx: &mut Context) {
             });
 
             apply_transaction(&transaction, doc, view);
+            exit_select_mode(cx);
         }
     }
 }
 
 fn replace_selections_with_clipboard_impl(
-    editor: &mut Editor,
+    cx: &mut Context,
     clipboard_type: ClipboardType,
-    count: usize,
 ) -> anyhow::Result<()> {
-    let (view, doc) = current!(editor);
+    let count = cx.count();
+    let (view, doc) = current!(cx.editor);
 
-    match editor.clipboard_provider.get_contents(clipboard_type) {
+    match cx.editor.clipboard_provider.get_contents(clipboard_type) {
         Ok(contents) => {
             let selection = doc.selection(view.id);
             let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
@@ -3605,18 +3607,20 @@ fn replace_selections_with_clipboard_impl(
 
             apply_transaction(&transaction, doc, view);
             doc.append_changes_to_history(view.id);
-            Ok(())
         }
-        Err(e) => Err(e.context("Couldn't get system clipboard contents")),
+        Err(e) => return Err(e.context("Couldn't get system clipboard contents")),
     }
+
+    exit_select_mode(cx);
+    Ok(())
 }
 
 fn replace_selections_with_clipboard(cx: &mut Context) {
-    let _ = replace_selections_with_clipboard_impl(cx.editor, ClipboardType::Clipboard, cx.count());
+    let _ = replace_selections_with_clipboard_impl(cx, ClipboardType::Clipboard);
 }
 
 fn replace_selections_with_primary_clipboard(cx: &mut Context) {
-    let _ = replace_selections_with_clipboard_impl(cx.editor, ClipboardType::Selection, cx.count());
+    let _ = replace_selections_with_clipboard_impl(cx, ClipboardType::Selection);
 }
 
 fn paste(cx: &mut Context, pos: Paste) {

From e0b034dcd1a99683efa429e55657dd68ebd9a301 Mon Sep 17 00:00:00 2001
From: Yuriy <yugabuev@gmail.com>
Date: Tue, 1 Nov 2022 18:01:01 +0100
Subject: [PATCH 430/884] Add syntax highlighting for Python pattern matching

Add syntax highlighting for `match` and `case` keywords in Python
(https://peps.python.org/pep-0636/).
---
 runtime/queries/python/highlights.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/runtime/queries/python/highlights.scm b/runtime/queries/python/highlights.scm
index a94d7caf..70b91efb 100644
--- a/runtime/queries/python/highlights.scm
+++ b/runtime/queries/python/highlights.scm
@@ -2,7 +2,7 @@
 
 (dotted_name
   (identifier)* @namespace)
-  
+
 (aliased_import
   alias: (identifier) @namespace)
 
@@ -67,7 +67,7 @@
 (parameters
   (dictionary_splat_pattern ; **kwargs
     (identifier) @variable.parameter))
-    
+
 (lambda_parameters
   (identifier) @variable.parameter)
 
@@ -97,7 +97,7 @@
  (#match? @constant "^[A-Z_]{2,}$"))
 
 ((identifier) @type
- (#match? @type "^[A-Z]")) 
+ (#match? @type "^[A-Z]"))
 
 (attribute attribute: (identifier) @variable.other.member)
 (identifier) @variable
@@ -168,6 +168,8 @@
   "if"
   "elif"
   "else"
+  "match"
+  "case"
 ] @keyword.control.conditional
 
 [

From b156f5761804a7e9a95268f80ff5e34dea783200 Mon Sep 17 00:00:00 2001
From: Yuriy <yugabuev@gmail.com>
Date: Tue, 1 Nov 2022 18:49:33 +0100
Subject: [PATCH 431/884] Add indentation for Python pattern matching

Add indentation for `match` and `case`.
---
 runtime/queries/python/indents.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/runtime/queries/python/indents.scm b/runtime/queries/python/indents.scm
index b7b499c0..743971ad 100644
--- a/runtime/queries/python/indents.scm
+++ b/runtime/queries/python/indents.scm
@@ -9,6 +9,8 @@
   (while_statement)
   (with_statement)
   (try_statement)
+  (match_statement)
+  (case_clause)
   (import_from_statement)
 
   (parenthesized_expression)
@@ -33,6 +35,8 @@
   (while_statement)
   (with_statement)
   (try_statement)
+  (match_statement)
+  (case_clause)
 
   (function_definition)
   (class_definition)

From 1bed2f30435cfa45502ad2c481a1f4ffe4a1119a Mon Sep 17 00:00:00 2001
From: Charlie Groves <c@sevorg.org>
Date: Tue, 1 Nov 2022 21:12:40 -0400
Subject: [PATCH 432/884] Use OSC 52 as a fallback for setting the system
 clipboard (#3220)

This adds a simple base64 implementation to keep us from adding a crate for one function. It's
mostly based on
https://github.com/marshallpierce/rust-base64/blob/a675443d327e175f735a37f574de803d6a332591/src/engine/naive.rs#L42
---
 helix-view/src/base64.rs    | 163 ++++++++++++++++++++++++++++++++++
 helix-view/src/clipboard.rs | 172 +++++++++++++++++++++++-------------
 helix-view/src/editor.rs    |  10 +--
 helix-view/src/env.rs       |   8 ++
 helix-view/src/lib.rs       |   2 +
 5 files changed, 288 insertions(+), 67 deletions(-)
 create mode 100644 helix-view/src/base64.rs
 create mode 100644 helix-view/src/env.rs

diff --git a/helix-view/src/base64.rs b/helix-view/src/base64.rs
new file mode 100644
index 00000000..a0dc167f
--- /dev/null
+++ b/helix-view/src/base64.rs
@@ -0,0 +1,163 @@
+// A minimal base64 implementation to keep from pulling in a crate for just that. It's based on
+// https://github.com/marshallpierce/rust-base64 but without all the customization options.
+// The biggest portion comes from
+// https://github.com/marshallpierce/rust-base64/blob/a675443d327e175f735a37f574de803d6a332591/src/engine/naive.rs#L42
+// Thanks, rust-base64!
+
+// The MIT License (MIT)
+
+// Copyright (c) 2015 Alice Maz
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+use std::ops::{BitAnd, BitOr, Shl, Shr};
+
+const PAD_BYTE: u8 = b'=';
+const ENCODE_TABLE: &[u8] =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".as_bytes();
+const LOW_SIX_BITS: u32 = 0x3F;
+
+pub fn encode(input: &[u8]) -> String {
+    let rem = input.len() % 3;
+    let complete_chunks = input.len() / 3;
+    let remainder_chunk = if rem == 0 { 0 } else { 1 };
+    let encoded_size = (complete_chunks + remainder_chunk) * 4;
+
+    let mut output = vec![0; encoded_size];
+
+    // complete chunks first
+    let complete_chunk_len = input.len() - rem;
+
+    let mut input_index = 0_usize;
+    let mut output_index = 0_usize;
+    while input_index < complete_chunk_len {
+        let chunk = &input[input_index..input_index + 3];
+
+        // populate low 24 bits from 3 bytes
+        let chunk_int: u32 =
+            (chunk[0] as u32).shl(16) | (chunk[1] as u32).shl(8) | (chunk[2] as u32);
+        // encode 4x 6-bit output bytes
+        output[output_index] = ENCODE_TABLE[chunk_int.shr(18) as usize];
+        output[output_index + 1] = ENCODE_TABLE[chunk_int.shr(12_u8).bitand(LOW_SIX_BITS) as usize];
+        output[output_index + 2] = ENCODE_TABLE[chunk_int.shr(6_u8).bitand(LOW_SIX_BITS) as usize];
+        output[output_index + 3] = ENCODE_TABLE[chunk_int.bitand(LOW_SIX_BITS) as usize];
+
+        input_index += 3;
+        output_index += 4;
+    }
+
+    // then leftovers
+    if rem == 2 {
+        let chunk = &input[input_index..input_index + 2];
+
+        // high six bits of chunk[0]
+        output[output_index] = ENCODE_TABLE[chunk[0].shr(2) as usize];
+        // bottom 2 bits of [0], high 4 bits of [1]
+        output[output_index + 1] = ENCODE_TABLE
+            [(chunk[0].shl(4_u8).bitor(chunk[1].shr(4_u8)) as u32).bitand(LOW_SIX_BITS) as usize];
+        // bottom 4 bits of [1], with the 2 bottom bits as zero
+        output[output_index + 2] =
+            ENCODE_TABLE[(chunk[1].shl(2_u8) as u32).bitand(LOW_SIX_BITS) as usize];
+        output[output_index + 3] = PAD_BYTE;
+    } else if rem == 1 {
+        let byte = input[input_index];
+        output[output_index] = ENCODE_TABLE[byte.shr(2) as usize];
+        output[output_index + 1] =
+            ENCODE_TABLE[(byte.shl(4_u8) as u32).bitand(LOW_SIX_BITS) as usize];
+        output[output_index + 2] = PAD_BYTE;
+        output[output_index + 3] = PAD_BYTE;
+    }
+    String::from_utf8(output).expect("Invalid UTF8")
+}
+
+#[cfg(test)]
+mod tests {
+    fn compare_encode(expected: &str, target: &[u8]) {
+        assert_eq!(expected, super::encode(target));
+    }
+
+    #[test]
+    fn encode_rfc4648_0() {
+        compare_encode("", b"");
+    }
+
+    #[test]
+    fn encode_rfc4648_1() {
+        compare_encode("Zg==", b"f");
+    }
+
+    #[test]
+    fn encode_rfc4648_2() {
+        compare_encode("Zm8=", b"fo");
+    }
+
+    #[test]
+    fn encode_rfc4648_3() {
+        compare_encode("Zm9v", b"foo");
+    }
+
+    #[test]
+    fn encode_rfc4648_4() {
+        compare_encode("Zm9vYg==", b"foob");
+    }
+
+    #[test]
+    fn encode_rfc4648_5() {
+        compare_encode("Zm9vYmE=", b"fooba");
+    }
+
+    #[test]
+    fn encode_rfc4648_6() {
+        compare_encode("Zm9vYmFy", b"foobar");
+    }
+
+    #[test]
+    fn encode_all_ascii() {
+        let mut ascii = Vec::<u8>::with_capacity(128);
+
+        for i in 0..128 {
+            ascii.push(i);
+        }
+
+        compare_encode(
+            "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7P\
+         D0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn8\
+         =",
+            &ascii,
+        );
+    }
+
+    #[test]
+    fn encode_all_bytes() {
+        let mut bytes = Vec::<u8>::with_capacity(256);
+
+        for i in 0..255 {
+            bytes.push(i);
+        }
+        bytes.push(255); //bug with "overflowing" ranges?
+
+        compare_encode(
+            "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7P\
+         D0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn\
+         +AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6\
+         /wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w==",
+            &bytes,
+        );
+    }
+}
diff --git a/helix-view/src/clipboard.rs b/helix-view/src/clipboard.rs
index ad6f621a..19fade69 100644
--- a/helix-view/src/clipboard.rs
+++ b/helix-view/src/clipboard.rs
@@ -3,6 +3,7 @@
 use anyhow::Result;
 use std::borrow::Cow;
 
+#[derive(Clone, Copy, Debug)]
 pub enum ClipboardType {
     Clipboard,
     Selection,
@@ -72,45 +73,48 @@ pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> {
 
 #[cfg(target_os = "macos")]
 pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> {
-    use provider::command::exists;
+    use crate::env::binary_exists;
 
-    if exists("pbcopy") && exists("pbpaste") {
+    if binary_exists("pbcopy") && binary_exists("pbpaste") {
         command_provider! {
             paste => "pbpaste";
             copy => "pbcopy";
         }
     } else {
-        Box::new(provider::NopProvider::new())
+        Box::new(provider::FallbackProvider::new())
     }
 }
 
 #[cfg(target_os = "wasm32")]
 pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> {
     // TODO:
-    Box::new(provider::NopProvider::new())
+    Box::new(provider::FallbackProvider::new())
 }
 
 #[cfg(not(any(windows, target_os = "wasm32", target_os = "macos")))]
 pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> {
-    use provider::command::{env_var_is_set, exists, is_exit_success};
+    use crate::env::{binary_exists, env_var_is_set};
+    use provider::command::is_exit_success;
     // TODO: support for user-defined provider, probably when we have plugin support by setting a
     // variable?
 
-    if env_var_is_set("WAYLAND_DISPLAY") && exists("wl-copy") && exists("wl-paste") {
+    if env_var_is_set("WAYLAND_DISPLAY") && binary_exists("wl-copy") && binary_exists("wl-paste") {
         command_provider! {
             paste => "wl-paste", "--no-newline";
             copy => "wl-copy", "--type", "text/plain";
             primary_paste => "wl-paste", "-p", "--no-newline";
             primary_copy => "wl-copy", "-p", "--type", "text/plain";
         }
-    } else if env_var_is_set("DISPLAY") && exists("xclip") {
+    } else if env_var_is_set("DISPLAY") && binary_exists("xclip") {
         command_provider! {
             paste => "xclip", "-o", "-selection", "clipboard";
             copy => "xclip", "-i", "-selection", "clipboard";
             primary_paste => "xclip", "-o";
             primary_copy => "xclip", "-i";
         }
-    } else if env_var_is_set("DISPLAY") && exists("xsel") && is_exit_success("xsel", &["-o", "-b"])
+    } else if env_var_is_set("DISPLAY")
+        && binary_exists("xsel")
+        && is_exit_success("xsel", &["-o", "-b"])
     {
         // FIXME: check performance of is_exit_success
         command_provider! {
@@ -119,43 +123,78 @@ pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> {
             primary_paste => "xsel", "-o";
             primary_copy => "xsel", "-i";
         }
-    } else if exists("win32yank.exe") {
+    } else if binary_exists("win32yank.exe") {
         command_provider! {
             paste => "win32yank.exe", "-o", "--lf";
             copy => "win32yank.exe", "-i", "--crlf";
         }
-    } else if exists("termux-clipboard-set") && exists("termux-clipboard-get") {
+    } else if binary_exists("termux-clipboard-set") && binary_exists("termux-clipboard-get") {
         command_provider! {
             paste => "termux-clipboard-get";
             copy => "termux-clipboard-set";
         }
-    } else if env_var_is_set("TMUX") && exists("tmux") {
+    } else if env_var_is_set("TMUX") && binary_exists("tmux") {
         command_provider! {
             paste => "tmux", "save-buffer", "-";
             copy => "tmux", "load-buffer", "-";
         }
     } else {
-        Box::new(provider::NopProvider::new())
+        Box::new(provider::FallbackProvider::new())
     }
 }
 
+#[cfg(not(target_os = "windows"))]
 pub mod provider {
     use super::{ClipboardProvider, ClipboardType};
     use anyhow::Result;
     use std::borrow::Cow;
 
-    #[cfg(not(target_os = "windows"))]
+    #[cfg(feature = "term")]
+    mod osc52 {
+        use {super::ClipboardType, crate::base64, crossterm};
+
+        #[derive(Debug)]
+        pub struct SetClipboardCommand {
+            encoded_content: String,
+            clipboard_type: ClipboardType,
+        }
+
+        impl SetClipboardCommand {
+            pub fn new(content: &str, clipboard_type: ClipboardType) -> Self {
+                Self {
+                    encoded_content: base64::encode(content.as_bytes()),
+                    clipboard_type,
+                }
+            }
+        }
+
+        impl crossterm::Command for SetClipboardCommand {
+            fn write_ansi(&self, f: &mut impl std::fmt::Write) -> std::fmt::Result {
+                let kind = match &self.clipboard_type {
+                    ClipboardType::Clipboard => "c",
+                    ClipboardType::Selection => "p",
+                };
+                // Send an OSC 52 set command: https://terminalguide.namepad.de/seq/osc-52/
+                write!(f, "\x1b]52;{};{}\x1b\\", kind, &self.encoded_content)
+            }
+        }
+    }
+
     #[derive(Debug)]
-    pub struct NopProvider {
+    pub struct FallbackProvider {
         buf: String,
         primary_buf: String,
     }
 
-    #[cfg(not(target_os = "windows"))]
-    impl NopProvider {
+    impl FallbackProvider {
         pub fn new() -> Self {
+            #[cfg(feature = "term")]
+            log::debug!(
+                "No native clipboard provider found. Yanking by OSC 52 and pasting will be internal to Helix"
+            );
+            #[cfg(not(feature = "term"))]
             log::warn!(
-                "No clipboard provider found! Yanking and pasting will be internal to Helix"
+                "No native clipboard provider found! Yanking and pasting will be internal to Helix"
             );
             Self {
                 buf: String::new(),
@@ -164,20 +203,27 @@ pub mod provider {
         }
     }
 
-    #[cfg(not(target_os = "windows"))]
-    impl Default for NopProvider {
+    impl Default for FallbackProvider {
         fn default() -> Self {
             Self::new()
         }
     }
 
-    #[cfg(not(target_os = "windows"))]
-    impl ClipboardProvider for NopProvider {
+    impl ClipboardProvider for FallbackProvider {
+        #[cfg(feature = "term")]
+        fn name(&self) -> Cow<str> {
+            Cow::Borrowed("termcode")
+        }
+
+        #[cfg(not(feature = "term"))]
         fn name(&self) -> Cow<str> {
             Cow::Borrowed("none")
         }
 
         fn get_contents(&self, clipboard_type: ClipboardType) -> Result<String> {
+            // This is the same noop if term is enabled or not.
+            // We don't use the get side of OSC 52 as it isn't often enabled, it's a security hole,
+            // and it would require this to be async to listen for the response
             let value = match clipboard_type {
                 ClipboardType::Clipboard => self.buf.clone(),
                 ClipboardType::Selection => self.primary_buf.clone(),
@@ -187,6 +233,12 @@ pub mod provider {
         }
 
         fn set_contents(&mut self, content: String, clipboard_type: ClipboardType) -> Result<()> {
+            #[cfg(feature = "term")]
+            crossterm::execute!(
+                std::io::stdout(),
+                osc52::SetClipboardCommand::new(&content, clipboard_type)
+            )?;
+            // Set our internal variables to use in get_content regardless of using OSC 52
             match clipboard_type {
                 ClipboardType::Clipboard => self.buf = content,
                 ClipboardType::Selection => self.primary_buf = content,
@@ -195,52 +247,11 @@ pub mod provider {
         }
     }
 
-    #[cfg(target_os = "windows")]
-    #[derive(Default, Debug)]
-    pub struct WindowsProvider;
-
-    #[cfg(target_os = "windows")]
-    impl ClipboardProvider for WindowsProvider {
-        fn name(&self) -> Cow<str> {
-            log::info!("Using clipboard-win to interact with the system clipboard");
-            Cow::Borrowed("clipboard-win")
-        }
-
-        fn get_contents(&self, clipboard_type: ClipboardType) -> Result<String> {
-            match clipboard_type {
-                ClipboardType::Clipboard => {
-                    let contents = clipboard_win::get_clipboard(clipboard_win::formats::Unicode)?;
-                    Ok(contents)
-                }
-                ClipboardType::Selection => Ok(String::new()),
-            }
-        }
-
-        fn set_contents(&mut self, contents: String, clipboard_type: ClipboardType) -> Result<()> {
-            match clipboard_type {
-                ClipboardType::Clipboard => {
-                    clipboard_win::set_clipboard(clipboard_win::formats::Unicode, contents)?;
-                }
-                ClipboardType::Selection => {}
-            };
-            Ok(())
-        }
-    }
-
     #[cfg(not(target_arch = "wasm32"))]
     pub mod command {
         use super::*;
         use anyhow::{bail, Context as _, Result};
 
-        pub fn exists(executable_name: &str) -> bool {
-            which::which(executable_name).is_ok()
-        }
-
-        #[cfg(not(windows))]
-        pub fn env_var_is_set(env_var_name: &str) -> bool {
-            std::env::var_os(env_var_name).is_some()
-        }
-
         #[cfg(not(any(windows, target_os = "macos")))]
         pub fn is_exit_success(program: &str, args: &[&str]) -> bool {
             std::process::Command::new(program)
@@ -343,3 +354,40 @@ pub mod provider {
         }
     }
 }
+
+#[cfg(target_os = "windows")]
+mod provider {
+    use super::{ClipboardProvider, ClipboardType};
+    use anyhow::Result;
+    use std::borrow::Cow;
+
+    #[derive(Default, Debug)]
+    pub struct WindowsProvider;
+
+    impl ClipboardProvider for WindowsProvider {
+        fn name(&self) -> Cow<str> {
+            log::info!("Using clipboard-win to interact with the system clipboard");
+            Cow::Borrowed("clipboard-win")
+        }
+
+        fn get_contents(&self, clipboard_type: ClipboardType) -> Result<String> {
+            match clipboard_type {
+                ClipboardType::Clipboard => {
+                    let contents = clipboard_win::get_clipboard(clipboard_win::formats::Unicode)?;
+                    Ok(contents)
+                }
+                ClipboardType::Selection => Ok(String::new()),
+            }
+        }
+
+        fn set_contents(&mut self, contents: String, clipboard_type: ClipboardType) -> Result<()> {
+            match clipboard_type {
+                ClipboardType::Clipboard => {
+                    clipboard_win::set_clipboard(clipboard_win::formats::Unicode, contents)?;
+                }
+                ClipboardType::Selection => {}
+            };
+            Ok(())
+        }
+    }
+}
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index af69ceea..47edf303 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -187,9 +187,9 @@ pub struct TerminalConfig {
 
 #[cfg(windows)]
 pub fn get_terminal_provider() -> Option<TerminalConfig> {
-    use crate::clipboard::provider::command::exists;
+    use crate::env::binary_exists;
 
-    if exists("wt") {
+    if binary_exists("wt") {
         return Some(TerminalConfig {
             command: "wt".to_string(),
             args: vec![
@@ -210,16 +210,16 @@ pub fn get_terminal_provider() -> Option<TerminalConfig> {
 
 #[cfg(not(any(windows, target_os = "wasm32")))]
 pub fn get_terminal_provider() -> Option<TerminalConfig> {
-    use crate::clipboard::provider::command::{env_var_is_set, exists};
+    use crate::env::{binary_exists, env_var_is_set};
 
-    if env_var_is_set("TMUX") && exists("tmux") {
+    if env_var_is_set("TMUX") && binary_exists("tmux") {
         return Some(TerminalConfig {
             command: "tmux".to_string(),
             args: vec!["split-window".to_string()],
         });
     }
 
-    if env_var_is_set("WEZTERM_UNIX_SOCKET") && exists("wezterm") {
+    if env_var_is_set("WEZTERM_UNIX_SOCKET") && binary_exists("wezterm") {
         return Some(TerminalConfig {
             command: "wezterm".to_string(),
             args: vec!["cli".to_string(), "split-pane".to_string()],
diff --git a/helix-view/src/env.rs b/helix-view/src/env.rs
new file mode 100644
index 00000000..c68cc609
--- /dev/null
+++ b/helix-view/src/env.rs
@@ -0,0 +1,8 @@
+pub fn binary_exists(binary_name: &str) -> bool {
+    which::which(binary_name).is_ok()
+}
+
+#[cfg(not(windows))]
+pub fn env_var_is_set(env_var_name: &str) -> bool {
+    std::env::var_os(env_var_name).is_some()
+}
diff --git a/helix-view/src/lib.rs b/helix-view/src/lib.rs
index 276be441..52044ac7 100644
--- a/helix-view/src/lib.rs
+++ b/helix-view/src/lib.rs
@@ -4,12 +4,14 @@ pub mod macros;
 pub mod clipboard;
 pub mod document;
 pub mod editor;
+pub mod env;
 pub mod graphics;
 pub mod gutter;
 pub mod handlers {
     pub mod dap;
     pub mod lsp;
 }
+pub mod base64;
 pub mod info;
 pub mod input;
 pub mod keyboard;

From ba394dca6d3a5b52622c4d7b0d3aba7c30af9701 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 3 Nov 2022 01:09:21 -0500
Subject: [PATCH 433/884] Fix panic from two windows editing the same document
 (#4570)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Clamp highlighting range to be within document

This fixes a panic possible when two vsplits of the same document
exist and enough lines are deleted from the document so that one of
the windows focuses past the end of the document.

* Ensure cursor is in view on window change

If two windows are editing the same document, one may delete enough of
the document so that the other window is pointing at a blank page (past
the document end). In this change we ensure that the cursor is within
view whenever we switch to a new window (for example with `<C-w>w`).

* Update helix-term/src/ui/editor.rs

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
---
 helix-term/src/ui/editor.rs | 16 ++++++++--------
 helix-view/src/editor.rs    |  8 ++++++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 72c9d15e..2cd2ad05 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -227,16 +227,16 @@ impl EditorView {
         _theme: &Theme,
     ) -> Box<dyn Iterator<Item = HighlightEvent> + 'doc> {
         let text = doc.text().slice(..);
-        let last_line = std::cmp::min(
-            // Saturating subs to make it inclusive zero indexing.
-            (offset.row + height as usize).saturating_sub(1),
-            doc.text().len_lines().saturating_sub(1),
-        );
 
         let range = {
-            // calculate viewport byte ranges
-            let start = text.line_to_byte(offset.row);
-            let end = text.line_to_byte(last_line + 1);
+            // Calculate viewport byte ranges:
+            // Saturating subs to make it inclusive zero indexing.
+            let last_line = doc.text().len_lines().saturating_sub(1);
+            let last_visible_line = (offset.row + height as usize)
+                .saturating_sub(1)
+                .min(last_line);
+            let start = text.line_to_byte(offset.row.min(last_line));
+            let end = text.line_to_byte(last_visible_line + 1);
 
             start..end
         };
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 47edf303..bb9616e8 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1223,9 +1223,11 @@ impl Editor {
     pub fn focus(&mut self, view_id: ViewId) {
         let prev_id = std::mem::replace(&mut self.tree.focus, view_id);
 
-        // if leaving the view: mode should reset
+        // if leaving the view: mode should reset and the cursor should be
+        // within view
         if prev_id != view_id {
             self.mode = Mode::Normal;
+            self.ensure_cursor_in_view(view_id);
         }
     }
 
@@ -1234,9 +1236,11 @@ impl Editor {
         self.tree.focus_next();
         let id = self.tree.focus;
 
-        // if leaving the view: mode should reset
+        // if leaving the view: mode should reset and the cursor should be
+        // within view
         if prev_id != id {
             self.mode = Mode::Normal;
+            self.ensure_cursor_in_view(id);
         }
     }
 

From c667ff8da3fa664c6fe37d2da8d9d22a4dd823e1 Mon Sep 17 00:00:00 2001
From: ChrHorn <christoph-horn@hotmail.de>
Date: Fri, 4 Nov 2022 03:17:06 +0100
Subject: [PATCH 434/884] Increase default language server timeout for Julia
 (#4575)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index adce81c5..94b3e75f 100644
--- a/languages.toml
+++ b/languages.toml
@@ -593,7 +593,7 @@ injection-regex = "julia"
 file-types = ["jl"]
 roots = ["Manifest.toml", "Project.toml"]
 comment-token = "#"
-language-server = { command = "julia", args = [
+language-server = { command = "julia", timeout = 60, args = [
     "--startup-file=no",
     "--history-file=no",
     "--quiet",

From d357f1673fecfadd96983c025057b63a3d3b45e0 Mon Sep 17 00:00:00 2001
From: throwaway-helix-zsh
 <117384672+throwaway-helix-zsh@users.noreply.github.com>
Date: Fri, 4 Nov 2022 02:18:24 +0000
Subject: [PATCH 435/884] Use language=bash when shebang line uses zsh (#4582)

This PR makes the editor use language=bash when the shebang line uses
zsh. This is in the same line as using language=bash for zsh related
file (~/.zshrc, ~/.zshenv etc.) as we already do.
---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 94b3e75f..071c2e40 100644
--- a/languages.toml
+++ b/languages.toml
@@ -522,7 +522,7 @@ name = "bash"
 scope = "source.bash"
 injection-regex = "(shell|bash|zsh|sh)"
 file-types = ["sh", "bash", "zsh", ".bash_login", ".bash_logout", ".bash_profile", ".bashrc", ".profile", ".zshenv", ".zlogin", ".zlogout", ".zprofile", ".zshrc", "APKBUILD", "PKGBUILD", "eclass", "ebuild", "bazelrc"]
-shebangs = ["sh", "bash", "dash"]
+shebangs = ["sh", "bash", "dash", "zsh"]
 roots = []
 comment-token = "#"
 language-server = { command = "bash-language-server", args = ["start"] }

From 921d3510132b0bd89d4ac0a542371c3ae90e2e02 Mon Sep 17 00:00:00 2001
From: Antoine Stevan <44101798+amtoine@users.noreply.github.com>
Date: Fri, 4 Nov 2022 03:20:14 +0100
Subject: [PATCH 436/884] bump up LhKipp/tree-sitter-nu's version to latest
 (#4583)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 071c2e40..061d1414 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1414,7 +1414,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "nu"
-source = { git = "https://github.com/LhKipp/tree-sitter-nu", rev = "db4e990b78824c8abef3618e0f93b7fe1e8f4c0d" }
+source = { git = "https://github.com/LhKipp/tree-sitter-nu", rev = "eb95bdac3abd73ef47e53f19c63e74a31405ebd2" }
 
 [[language]]
 name = "vala"

From c2c1280f02b83a468da67d88350c199915427535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Fri, 4 Nov 2022 21:01:17 +0900
Subject: [PATCH 437/884] Resolve a bunch of upcoming clippy lints

---
 helix-core/src/history.rs          |   2 +-
 helix-core/src/increment/number.rs |   4 +-
 helix-core/src/line_ending.rs      |   2 +-
 helix-core/src/surround.rs         |   2 +-
 helix-core/src/syntax.rs           |  14 ++--
 helix-dap/src/transport.rs         |   2 +-
 helix-dap/src/types.rs             | 100 ++++++++++++++---------------
 helix-loader/src/grammar.rs        |   4 +-
 helix-lsp/src/jsonrpc.rs           |  26 ++++----
 helix-term/build.rs                |   2 +-
 helix-term/src/application.rs      |   4 +-
 helix-term/src/commands.rs         |  15 ++---
 helix-term/src/commands/lsp.rs     |   6 +-
 helix-term/src/ui/menu.rs          |   2 +-
 helix-term/src/ui/prompt.rs        |   4 +-
 helix-tui/src/buffer.rs            |   4 +-
 helix-tui/src/layout.rs            |   2 +-
 helix-tui/src/text.rs              |   8 +--
 helix-tui/src/widgets/block.rs     |  16 ++---
 helix-tui/src/widgets/table.rs     |   6 +-
 helix-view/src/editor.rs           |   4 +-
 helix-view/src/graphics.rs         |   8 +--
 22 files changed, 113 insertions(+), 124 deletions(-)

diff --git a/helix-core/src/history.rs b/helix-core/src/history.rs
index b608097c..5cd72b07 100644
--- a/helix-core/src/history.rs
+++ b/helix-core/src/history.rs
@@ -282,7 +282,7 @@ impl History {
 }
 
 /// Whether to undo by a number of edits or a duration of time.
-#[derive(Debug, PartialEq, Clone, Copy)]
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub enum UndoKind {
     Steps(usize),
     TimePeriod(std::time::Duration),
diff --git a/helix-core/src/increment/number.rs b/helix-core/src/increment/number.rs
index 62b4a19d..91268729 100644
--- a/helix-core/src/increment/number.rs
+++ b/helix-core/src/increment/number.rs
@@ -110,8 +110,8 @@ impl<'a> Increment for NumberIncrementor<'a> {
                 let (lower_count, upper_count): (usize, usize) =
                     old_text.chars().skip(2).fold((0, 0), |(lower, upper), c| {
                         (
-                            lower + c.is_ascii_lowercase().then(|| 1).unwrap_or(0),
-                            upper + c.is_ascii_uppercase().then(|| 1).unwrap_or(0),
+                            lower + usize::from(c.is_ascii_lowercase()),
+                            upper + usize::from(c.is_ascii_uppercase()),
                         )
                     });
                 if upper_count > lower_count {
diff --git a/helix-core/src/line_ending.rs b/helix-core/src/line_ending.rs
index 3e8a6cae..09e92523 100644
--- a/helix-core/src/line_ending.rs
+++ b/helix-core/src/line_ending.rs
@@ -6,7 +6,7 @@ pub const DEFAULT_LINE_ENDING: LineEnding = LineEnding::Crlf;
 pub const DEFAULT_LINE_ENDING: LineEnding = LineEnding::LF;
 
 /// Represents one of the valid Unicode line endings.
-#[derive(PartialEq, Copy, Clone, Debug)]
+#[derive(PartialEq, Eq, Copy, Clone, Debug)]
 pub enum LineEnding {
     Crlf, // CarriageReturn followed by LineFeed
     LF,   // U+000A -- LineFeed
diff --git a/helix-core/src/surround.rs b/helix-core/src/surround.rs
index 6244b380..a3de3cd1 100644
--- a/helix-core/src/surround.rs
+++ b/helix-core/src/surround.rs
@@ -13,7 +13,7 @@ pub const PAIRS: &[(char, char)] = &[
     ('（', '）'),
 ];
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum Error {
     PairNotFound,
     CursorOverlap,
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index c17655a9..0f62577f 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -218,7 +218,7 @@ pub struct FormatterConfiguration {
     pub args: Vec<String>,
 }
 
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct AdvancedCompletion {
     pub name: Option<String>,
@@ -226,14 +226,14 @@ pub struct AdvancedCompletion {
     pub default: Option<String>,
 }
 
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case", untagged)]
 pub enum DebugConfigCompletion {
     Named(String),
     Advanced(AdvancedCompletion),
 }
 
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(untagged)]
 pub enum DebugArgumentValue {
     String(String),
@@ -241,7 +241,7 @@ pub enum DebugArgumentValue {
     Boolean(bool),
 }
 
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct DebugTemplate {
     pub name: String,
@@ -250,7 +250,7 @@ pub struct DebugTemplate {
     pub args: HashMap<String, DebugArgumentValue>,
 }
 
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct DebugAdapterConfig {
     pub name: String,
@@ -266,7 +266,7 @@ pub struct DebugAdapterConfig {
 }
 
 // Different workarounds for adapters' differences
-#[derive(Debug, Default, PartialEq, Clone, Serialize, Deserialize)]
+#[derive(Debug, Default, PartialEq, Eq, Clone, Serialize, Deserialize)]
 pub struct DebuggerQuirks {
     #[serde(default)]
     pub absolute_paths: bool,
@@ -280,7 +280,7 @@ pub struct IndentationConfiguration {
 }
 
 /// Configuration for auto pairs
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case", deny_unknown_fields, untagged)]
 pub enum AutoPairConfig {
     /// Enables or disables auto pairing. False means disabled. True means to use the default pairs.
diff --git a/helix-dap/src/transport.rs b/helix-dap/src/transport.rs
index 783a6f5d..dd03e568 100644
--- a/helix-dap/src/transport.rs
+++ b/helix-dap/src/transport.rs
@@ -22,7 +22,7 @@ pub struct Request {
     pub arguments: Option<Value>,
 }
 
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 pub struct Response {
     // seq is omitted as unused and is not sent by some implementations
     pub request_seq: u64,
diff --git a/helix-dap/src/types.rs b/helix-dap/src/types.rs
index 51ecfe1b..0a9ebe5e 100644
--- a/helix-dap/src/types.rs
+++ b/helix-dap/src/types.rs
@@ -22,7 +22,7 @@ pub trait Request {
     const COMMAND: &'static str;
 }
 
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ColumnDescriptor {
     pub attribute_name: String,
@@ -35,7 +35,7 @@ pub struct ColumnDescriptor {
     pub width: Option<usize>,
 }
 
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ExceptionBreakpointsFilter {
     pub filter: String,
@@ -50,7 +50,7 @@ pub struct ExceptionBreakpointsFilter {
     pub condition_description: Option<String>,
 }
 
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct DebuggerCapabilities {
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -131,14 +131,14 @@ pub struct DebuggerCapabilities {
     pub supported_checksum_algorithms: Option<Vec<String>>,
 }
 
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Checksum {
     pub algorithm: String,
     pub checksum: String,
 }
 
-#[derive(Debug, Default, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, Default, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Source {
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -159,7 +159,7 @@ pub struct Source {
     pub checksums: Option<Vec<Checksum>>,
 }
 
-#[derive(Debug, Default, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, Default, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct SourceBreakpoint {
     pub line: usize,
@@ -173,7 +173,7 @@ pub struct SourceBreakpoint {
     pub log_message: Option<String>,
 }
 
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Breakpoint {
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -197,7 +197,7 @@ pub struct Breakpoint {
     pub offset: Option<usize>,
 }
 
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct StackFrameFormat {
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -216,7 +216,7 @@ pub struct StackFrameFormat {
     pub include_all: Option<bool>,
 }
 
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct StackFrame {
     pub id: usize,
@@ -239,14 +239,14 @@ pub struct StackFrame {
     pub presentation_hint: Option<String>,
 }
 
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Thread {
     pub id: ThreadId,
     pub name: String,
 }
 
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Scope {
     pub name: String,
@@ -270,14 +270,14 @@ pub struct Scope {
     pub end_column: Option<usize>,
 }
 
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ValueFormat {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub hex: Option<bool>,
 }
 
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct VariablePresentationHint {
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -288,7 +288,7 @@ pub struct VariablePresentationHint {
     pub visibility: Option<String>,
 }
 
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Variable {
     pub name: String,
@@ -308,7 +308,7 @@ pub struct Variable {
     pub memory_reference: Option<String>,
 }
 
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Module {
     pub id: String, // TODO: || number
@@ -333,7 +333,7 @@ pub struct Module {
 
 pub mod requests {
     use super::*;
-    #[derive(Debug, Default, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, Default, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct InitializeArguments {
         #[serde(rename = "clientID", skip_serializing_if = "Option::is_none")]
@@ -409,7 +409,7 @@ pub mod requests {
         const COMMAND: &'static str = "configurationDone";
     }
 
-    #[derive(Debug, Default, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, Default, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct SetBreakpointsArguments {
         pub source: Source,
@@ -420,7 +420,7 @@ pub mod requests {
         pub source_modified: Option<bool>,
     }
 
-    #[derive(Debug, Default, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, Default, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct SetBreakpointsResponse {
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -436,13 +436,13 @@ pub mod requests {
         const COMMAND: &'static str = "setBreakpoints";
     }
 
-    #[derive(Debug, Default, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, Default, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct ContinueArguments {
         pub thread_id: ThreadId,
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct ContinueResponse {
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -458,7 +458,7 @@ pub mod requests {
         const COMMAND: &'static str = "continue";
     }
 
-    #[derive(Debug, Default, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, Default, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct StackTraceArguments {
         pub thread_id: ThreadId,
@@ -470,7 +470,7 @@ pub mod requests {
         pub format: Option<StackFrameFormat>,
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct StackTraceResponse {
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -487,7 +487,7 @@ pub mod requests {
         const COMMAND: &'static str = "stackTrace";
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct ThreadsResponse {
         pub threads: Vec<Thread>,
@@ -502,13 +502,13 @@ pub mod requests {
         const COMMAND: &'static str = "threads";
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct ScopesArguments {
         pub frame_id: usize,
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct ScopesResponse {
         pub scopes: Vec<Scope>,
@@ -523,7 +523,7 @@ pub mod requests {
         const COMMAND: &'static str = "scopes";
     }
 
-    #[derive(Debug, Default, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, Default, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct VariablesArguments {
         pub variables_reference: usize,
@@ -537,7 +537,7 @@ pub mod requests {
         pub format: Option<ValueFormat>,
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct VariablesResponse {
         pub variables: Vec<Variable>,
@@ -552,7 +552,7 @@ pub mod requests {
         const COMMAND: &'static str = "variables";
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct StepInArguments {
         pub thread_id: ThreadId,
@@ -571,7 +571,7 @@ pub mod requests {
         const COMMAND: &'static str = "stepIn";
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct StepOutArguments {
         pub thread_id: ThreadId,
@@ -588,7 +588,7 @@ pub mod requests {
         const COMMAND: &'static str = "stepOut";
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct NextArguments {
         pub thread_id: ThreadId,
@@ -605,7 +605,7 @@ pub mod requests {
         const COMMAND: &'static str = "next";
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct PauseArguments {
         pub thread_id: ThreadId,
@@ -620,7 +620,7 @@ pub mod requests {
         const COMMAND: &'static str = "pause";
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct EvaluateArguments {
         pub expression: String,
@@ -632,7 +632,7 @@ pub mod requests {
         pub format: Option<ValueFormat>,
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct EvaluateResponse {
         pub result: String,
@@ -658,7 +658,7 @@ pub mod requests {
         const COMMAND: &'static str = "evaluate";
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct SetExceptionBreakpointsArguments {
         pub filters: Vec<String>,
@@ -666,7 +666,7 @@ pub mod requests {
         // pub exceptionOptions: Option<Vec<ExceptionOptions>>, // needs capability
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct SetExceptionBreakpointsResponse {
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -684,7 +684,7 @@ pub mod requests {
 
     // Reverse Requests
 
-    #[derive(Debug, Default, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, Default, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct RunInTerminalResponse {
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -693,7 +693,7 @@ pub mod requests {
         pub shell_process_id: Option<u32>,
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct RunInTerminalArguments {
         #[serde(skip_serializing_if = "Option::is_none")]
@@ -745,7 +745,7 @@ pub mod events {
         Memory(Memory),
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct Stopped {
         pub reason: String,
@@ -763,7 +763,7 @@ pub mod events {
         pub hit_breakpoint_ids: Option<Vec<usize>>,
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct Continued {
         pub thread_id: ThreadId,
@@ -771,27 +771,27 @@ pub mod events {
         pub all_threads_continued: Option<bool>,
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct Exited {
         pub exit_code: usize,
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct Terminated {
         #[serde(skip_serializing_if = "Option::is_none")]
         pub restart: Option<Value>,
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct Thread {
         pub reason: String,
         pub thread_id: ThreadId,
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct Output {
         pub output: String,
@@ -811,28 +811,28 @@ pub mod events {
         pub data: Option<Value>,
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct Breakpoint {
         pub reason: String,
         pub breakpoint: super::Breakpoint,
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct Module {
         pub reason: String,
         pub module: super::Module,
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct LoadedSource {
         pub reason: String,
         pub source: super::Source,
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct Process {
         pub name: String,
@@ -846,13 +846,13 @@ pub mod events {
         pub pointer_size: Option<usize>,
     }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct Capabilities {
         pub capabilities: super::DebuggerCapabilities,
     }
 
-    // #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    // #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     // #[serde(rename_all = "camelCase")]
     // pub struct Invalidated {
     // pub areas: Vec<InvalidatedArea>,
@@ -860,7 +860,7 @@ pub mod events {
     // pub stack_frame_id: Option<usize>,
     // }
 
-    #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct Memory {
         pub memory_reference: String,
diff --git a/helix-loader/src/grammar.rs b/helix-loader/src/grammar.rs
index a92cadb6..833616e0 100644
--- a/helix-loader/src/grammar.rs
+++ b/helix-loader/src/grammar.rs
@@ -67,7 +67,7 @@ pub fn get_language(name: &str) -> Result<Language> {
 #[cfg(not(target_arch = "wasm32"))]
 pub fn get_language(name: &str) -> Result<Language> {
     use libloading::{Library, Symbol};
-    let mut library_path = crate::runtime_dir().join("grammars").join(&name);
+    let mut library_path = crate::runtime_dir().join("grammars").join(name);
     library_path.set_extension(DYLIB_EXTENSION);
 
     let library = unsafe { Library::new(&library_path) }
@@ -429,7 +429,7 @@ fn build_tree_sitter_library(
 
     if cfg!(all(windows, target_env = "msvc")) {
         command
-            .args(&["/nologo", "/LD", "/I"])
+            .args(["/nologo", "/LD", "/I"])
             .arg(header_path)
             .arg("/Od")
             .arg("/utf-8");
diff --git a/helix-lsp/src/jsonrpc.rs b/helix-lsp/src/jsonrpc.rs
index b9b3fd2c..75ac9309 100644
--- a/helix-lsp/src/jsonrpc.rs
+++ b/helix-lsp/src/jsonrpc.rs
@@ -13,7 +13,7 @@ use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
 // https://www.jsonrpc.org/specification#error_object
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub enum ErrorCode {
     ParseError,
     InvalidRequest,
@@ -68,7 +68,7 @@ impl Serialize for ErrorCode {
     }
 }
 
-#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
 pub struct Error {
     pub code: ErrorCode,
     pub message: String,
@@ -100,7 +100,7 @@ impl std::error::Error for Error {}
 // https://www.jsonrpc.org/specification#request_object
 
 /// Request ID
-#[derive(Debug, PartialEq, Clone, Hash, Eq, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Hash, Deserialize, Serialize)]
 #[serde(untagged)]
 pub enum Id {
     Null,
@@ -109,7 +109,7 @@ pub enum Id {
 }
 
 /// Protocol Version
-#[derive(Debug, PartialEq, Clone, Copy, Hash, Eq)]
+#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
 pub enum Version {
     V2,
 }
@@ -153,7 +153,7 @@ impl<'de> Deserialize<'de> for Version {
     }
 }
 
-#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum Params {
     None,
@@ -182,7 +182,7 @@ impl From<Params> for Value {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct MethodCall {
     pub jsonrpc: Option<Version>,
@@ -192,7 +192,7 @@ pub struct MethodCall {
     pub id: Id,
 }
 
-#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct Notification {
     pub jsonrpc: Option<Version>,
@@ -201,7 +201,7 @@ pub struct Notification {
     pub params: Params,
 }
 
-#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(deny_unknown_fields)]
 #[serde(untagged)]
 pub enum Call {
@@ -235,7 +235,7 @@ impl From<Notification> for Call {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(deny_unknown_fields)]
 #[serde(untagged)]
 pub enum Request {
@@ -245,7 +245,7 @@ pub enum Request {
 
 // https://www.jsonrpc.org/specification#response_object
 
-#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
 pub struct Success {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub jsonrpc: Option<Version>,
@@ -253,7 +253,7 @@ pub struct Success {
     pub id: Id,
 }
 
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 pub struct Failure {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub jsonrpc: Option<Version>,
@@ -264,7 +264,7 @@ pub struct Failure {
 // Note that failure comes first because we're not using
 // #[serde(deny_unknown_field)]: we want a request that contains
 // both `result` and `error` to be a `Failure`.
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[serde(untagged)]
 pub enum Output {
     Failure(Failure),
@@ -280,7 +280,7 @@ impl From<Output> for Result<Value, Error> {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(untagged)]
 pub enum Response {
     Single(Output),
diff --git a/helix-term/build.rs b/helix-term/build.rs
index 74c35a3a..719113ff 100644
--- a/helix-term/build.rs
+++ b/helix-term/build.rs
@@ -6,7 +6,7 @@ const VERSION: &str = include_str!("../VERSION");
 
 fn main() {
     let git_hash = Command::new("git")
-        .args(&["rev-parse", "HEAD"])
+        .args(["rev-parse", "HEAD"])
         .output()
         .ok()
         .filter(|output| output.status.success())
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 173c5d49..e356c1f9 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -168,7 +168,7 @@ impl Application {
         } else if !args.files.is_empty() {
             let first = &args.files[0].0; // we know it's not empty
             if first.is_dir() {
-                std::env::set_current_dir(&first).context("set current dir")?;
+                std::env::set_current_dir(first).context("set current dir")?;
                 editor.new_file(Action::VerticalSplit);
                 let picker = ui::file_picker(".".into(), &config.load().editor);
                 compositor.push(Box::new(overlayed(picker)));
@@ -228,7 +228,7 @@ impl Application {
         #[cfg(windows)]
         let signals = futures_util::stream::empty();
         #[cfg(not(windows))]
-        let signals = Signals::new(&[signal::SIGTSTP, signal::SIGCONT, signal::SIGUSR1])
+        let signals = Signals::new([signal::SIGTSTP, signal::SIGCONT, signal::SIGUSR1])
             .context("build signal handler")?;
 
         let app = Self {
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index ee9bad98..aae9979d 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3933,15 +3933,12 @@ pub fn completion(cx: &mut Context) {
             };
 
             if !prefix.is_empty() {
-                items = items
-                    .into_iter()
-                    .filter(|item| {
-                        item.filter_text
-                            .as_ref()
-                            .unwrap_or(&item.label)
-                            .starts_with(&prefix)
-                    })
-                    .collect();
+                items.retain(|item| {
+                    item.filter_text
+                        .as_ref()
+                        .unwrap_or(&item.label)
+                        .starts_with(&prefix)
+                });
             }
 
             if items.is_empty() {
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index d7617c50..5498fc83 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -57,7 +57,7 @@ impl ui::menu::Item for lsp::Location {
             // allocation, for `to_file_path`, else there will be two (2), with `to_string_lossy`.
             let mut write_path_to_res = || -> Option<()> {
                 let path = self.uri.to_file_path().ok()?;
-                res.push_str(&path.strip_prefix(&cwdir).unwrap_or(&path).to_string_lossy());
+                res.push_str(&path.strip_prefix(cwdir).unwrap_or(&path).to_string_lossy());
                 Some(())
             };
             write_path_to_res();
@@ -634,7 +634,7 @@ pub fn apply_document_resource_op(op: &lsp::ResourceOp) -> std::io::Result<()> {
                 // Create directory if it does not exist
                 if let Some(dir) = path.parent() {
                     if !dir.is_dir() {
-                        fs::create_dir_all(&dir)?;
+                        fs::create_dir_all(dir)?;
                     }
                 }
 
@@ -910,7 +910,7 @@ pub fn goto_reference(cx: &mut Context) {
     );
 }
 
-#[derive(PartialEq)]
+#[derive(PartialEq, Eq)]
 pub enum SignatureHelpInvoked {
     Manual,
     Automatic,
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index 99c2473d..1baaf40a 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -40,7 +40,7 @@ impl Item for PathBuf {
     type Data = PathBuf;
 
     fn label(&self, root_path: &Self::Data) -> Spans {
-        self.strip_prefix(&root_path)
+        self.strip_prefix(root_path)
             .unwrap_or(self)
             .to_string_lossy()
             .into()
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index d0991d3c..ca2872a7 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -32,7 +32,7 @@ pub struct Prompt {
     next_char_handler: Option<PromptCharHandler>,
 }
 
-#[derive(Clone, Copy, PartialEq)]
+#[derive(Clone, Copy, PartialEq, Eq)]
 pub enum PromptEvent {
     /// The prompt input has been updated.
     Update,
@@ -408,7 +408,7 @@ impl Prompt {
                 surface.set_stringn(
                     area.x + col * (1 + col_width),
                     area.y + row,
-                    &completion,
+                    completion,
                     col_width.saturating_sub(1) as usize,
                     color,
                 );
diff --git a/helix-tui/src/buffer.rs b/helix-tui/src/buffer.rs
index 23ba43f1..5169196a 100644
--- a/helix-tui/src/buffer.rs
+++ b/helix-tui/src/buffer.rs
@@ -6,7 +6,7 @@ use unicode_segmentation::UnicodeSegmentation;
 use helix_view::graphics::{Color, Modifier, Rect, Style, UnderlineStyle};
 
 /// A buffer cell
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Cell {
     pub symbol: String,
     pub fg: Color,
@@ -119,7 +119,7 @@ impl Default for Cell {
 /// buf[(5, 0)].set_char('x');
 /// assert_eq!(buf[(5, 0)].symbol, "x");
 /// ```
-#[derive(Debug, Default, Clone, PartialEq)]
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
 pub struct Buffer {
     /// The area represented by this buffer
     pub area: Rect,
diff --git a/helix-tui/src/layout.rs b/helix-tui/src/layout.rs
index 7c72a778..1f3ddc6e 100644
--- a/helix-tui/src/layout.rs
+++ b/helix-tui/src/layout.rs
@@ -46,7 +46,7 @@ impl Constraint {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Alignment {
     Left,
     Center,
diff --git a/helix-tui/src/text.rs b/helix-tui/src/text.rs
index 1bfe5ee1..ccdafad5 100644
--- a/helix-tui/src/text.rs
+++ b/helix-tui/src/text.rs
@@ -53,14 +53,14 @@ use std::borrow::Cow;
 use unicode_segmentation::UnicodeSegmentation;
 
 /// A grapheme associated to a style.
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct StyledGrapheme<'a> {
     pub symbol: &'a str,
     pub style: Style,
 }
 
 /// A string where all graphemes have the same style.
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Span<'a> {
     pub content: Cow<'a, str>,
     pub style: Style,
@@ -209,7 +209,7 @@ impl<'a> From<Cow<'a, str>> for Span<'a> {
 }
 
 /// A string composed of clusters of graphemes, each with their own style.
-#[derive(Debug, Default, Clone, PartialEq)]
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
 pub struct Spans<'a>(pub Vec<Span<'a>>);
 
 impl<'a> Spans<'a> {
@@ -297,7 +297,7 @@ impl<'a> From<&Spans<'a>> for String {
 /// text.extend(Text::styled("Some more lines\nnow with more style!", style));
 /// assert_eq!(6, text.height());
 /// ```
-#[derive(Debug, Default, Clone, PartialEq)]
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
 pub struct Text<'a> {
     pub lines: Vec<Spans<'a>>,
 }
diff --git a/helix-tui/src/widgets/block.rs b/helix-tui/src/widgets/block.rs
index bd025a31..98f84abe 100644
--- a/helix-tui/src/widgets/block.rs
+++ b/helix-tui/src/widgets/block.rs
@@ -7,7 +7,7 @@ use crate::{
 use helix_view::graphics::{Rect, Style};
 
 /// Border render type. Defaults to [`BorderType::Plain`].
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum BorderType {
     Plain,
     Rounded,
@@ -47,7 +47,7 @@ impl Default for BorderType {
 ///     .border_type(BorderType::Rounded)
 ///     .style(Style::default().bg(Color::Black));
 /// ```
-#[derive(Debug, Default, Clone, PartialEq)]
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
 pub struct Block<'a> {
     /// Optional title place on the upper left of the block
     title: Option<Spans<'a>>,
@@ -187,16 +187,8 @@ impl<'a> Widget for Block<'a> {
         }
 
         if let Some(title) = self.title {
-            let lx = if self.borders.intersects(Borders::LEFT) {
-                1
-            } else {
-                0
-            };
-            let rx = if self.borders.intersects(Borders::RIGHT) {
-                1
-            } else {
-                0
-            };
+            let lx = u16::from(self.borders.intersects(Borders::LEFT));
+            let rx = u16::from(self.borders.intersects(Borders::RIGHT));
             let width = area.width.saturating_sub(lx).saturating_sub(rx);
             buf.set_spans(area.left() + lx, area.top(), &title, width);
         }
diff --git a/helix-tui/src/widgets/table.rs b/helix-tui/src/widgets/table.rs
index eb03704e..a8f428a7 100644
--- a/helix-tui/src/widgets/table.rs
+++ b/helix-tui/src/widgets/table.rs
@@ -34,7 +34,7 @@ use std::collections::HashMap;
 ///
 /// You can apply a [`Style`] on the entire [`Cell`] using [`Cell::style`] or rely on the styling
 /// capabilities of [`Text`].
-#[derive(Debug, Clone, PartialEq, Default)]
+#[derive(Debug, Clone, PartialEq, Eq, Default)]
 pub struct Cell<'a> {
     pub content: Text<'a>,
     style: Style,
@@ -79,7 +79,7 @@ where
 /// ```
 ///
 /// By default, a row has a height of 1 but you can change this using [`Row::height`].
-#[derive(Debug, Clone, PartialEq, Default)]
+#[derive(Debug, Clone, PartialEq, Eq, Default)]
 pub struct Row<'a> {
     pub cells: Vec<Cell<'a>>,
     height: u16,
@@ -179,7 +179,7 @@ impl<'a> Row<'a> {
 /// // ...and potentially show a symbol in front of the selection.
 /// .highlight_symbol(">>");
 /// ```
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Table<'a> {
     /// A block to wrap the widget in
     block: Option<Block<'a>>,
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index bb9616e8..bcd8dedb 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -111,7 +111,7 @@ impl Default for FilePickerConfig {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case", default, deny_unknown_fields)]
 pub struct Config {
     /// Padding to keep between the edge of the screen and the cursor when scrolling. Defaults to 5.
@@ -346,7 +346,7 @@ pub enum StatusLineElement {
 
 // Cursor shape is read and used on every rendered frame and so needs
 // to be fast. Therefore we avoid a hashmap and use an enum indexed array.
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct CursorShapeConfig([CursorKind; 3]);
 
 impl CursorShapeConfig {
diff --git a/helix-view/src/graphics.rs b/helix-view/src/graphics.rs
index cbae873a..9264c50f 100644
--- a/helix-view/src/graphics.rs
+++ b/helix-view/src/graphics.rs
@@ -5,7 +5,7 @@ use std::{
     str::FromStr,
 };
 
-#[derive(Debug, Clone, Copy, PartialEq, Deserialize, Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(rename_all = "lowercase")]
 /// UNSTABLE
 pub enum CursorKind {
@@ -250,7 +250,7 @@ impl Rect {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum Color {
     Reset,
@@ -303,7 +303,7 @@ impl From<Color> for crossterm::style::Color {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum UnderlineStyle {
     Reset,
     Line,
@@ -449,7 +449,7 @@ impl FromStr for Modifier {
 ///     buffer[(0, 0)].style(),
 /// );
 /// ```
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct Style {
     pub fg: Option<Color>,

From 9a898be95934bec46c5a77c61d77314ecb4d71fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Fri, 4 Nov 2022 21:01:34 +0900
Subject: [PATCH 438/884] nix: Bump flake dependencies

---
 flake.lock | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index cfa227e3..74206d2b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -36,11 +36,11 @@
     "devshell": {
       "flake": false,
       "locked": {
-        "lastModified": 1666548262,
-        "narHash": "sha256-4DyN4KXqQQsCw0vCXkMThw4b5Q4/q87ZZgRb4st8COc=",
+        "lastModified": 1667210711,
+        "narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "c8ce8ed81726079c398f5f29c4b68a7d6a3c2fa2",
+        "rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7",
         "type": "github"
       },
       "original": {
@@ -88,11 +88,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1666993587,
-        "narHash": "sha256-4cLrs+CwWnceYXnCpL5gO3bybS9CjLxUoTEKjB2QFtg=",
+        "lastModified": 1667429039,
+        "narHash": "sha256-Lu6da25JioHzerkLHAHSO9suCQFzJ/XBjkcGCIbasLM=",
         "owner": "nix-community",
         "repo": "dream2nix",
-        "rev": "2b7456e3d2f0053bc2474fb0c461dd468545277f",
+        "rev": "5252794e58eedb02d607fa3187ffead7becc81b0",
         "type": "github"
       },
       "original": {
@@ -144,11 +144,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1667232647,
-        "narHash": "sha256-cFo7G8BqYShgL9m7yD6p+SHAZ+aIt2guuF69LV235n8=",
+        "lastModified": 1667542401,
+        "narHash": "sha256-mdWjP5tjSf8n6FAtpSgL23kX4+eWBwLrSYo9iY3mA8Q=",
         "owner": "yusdacra",
         "repo": "nix-cargo-integration",
-        "rev": "16082f7b4e42ce140a562fa630bcf8e96eadeb59",
+        "rev": "cd5e5cbd81c80dc219455dd3b1e0ddb55fae51ec",
         "type": "github"
       },
       "original": {
@@ -159,11 +159,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1667142599,
-        "narHash": "sha256-OLJxsg9VqfKjFkerOxWtNIkibsCvxsv5A8wNWO1MeWk=",
+        "lastModified": 1667482890,
+        "narHash": "sha256-pua0jp87iwN7NBY5/ypx0s9L9CG49Ju/NI4wGwurHc4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "412b9917cea092f3d39f9cd5dead4effd5bc4053",
+        "rev": "a2a777538d971c6b01c6e54af89ddd6567c055e8",
         "type": "github"
       },
       "original": {
@@ -188,11 +188,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1667184938,
-        "narHash": "sha256-/kuCiXuAxiD0c0zrfDvJ1Yba3FuVdRk/ROfb393AeX4=",
+        "lastModified": 1667487142,
+        "narHash": "sha256-bVuzLs1ZVggJAbJmEDVO9G6p8BH3HRaolK70KXvnWnU=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "8f81faec35508647ced65c44fd3e8648a5518afb",
+        "rev": "cf668f737ac986c0a89e83b6b2e3c5ddbd8cf33b",
         "type": "github"
       },
       "original": {

From d6323b7cbc21a9d3ba29738c76581dad93f9f415 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Fri, 4 Nov 2022 11:02:19 -0500
Subject: [PATCH 439/884] Select text inserted by shell or paste (#4458)

This follows changes in Kakoune to the same effects:

* p/<space>p: https://github.com/mawww/kakoune/commit/266d1c37d0d970a7eff747f5e6a5773a3cea39d8
* !/<A-!>: https://github.com/mawww/kakoune/commit/85b78dda2e29d70b620836b04224b104426bdbae

Selecting the new data inserted by shell or pasting is often more
useful than retaining a selection of the pre-paste/insert content.
---
 helix-term/src/commands.rs | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index aae9979d..a6ee6263 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3471,6 +3471,8 @@ fn paste_impl(values: &[String], doc: &mut Document, view: &mut View, action: Pa
     let text = doc.text();
     let selection = doc.selection(view.id);
 
+    let mut ranges = SmallVec::with_capacity(selection.len());
+
     let transaction = Transaction::change_by_selection(text, selection, |range| {
         let pos = match (action, linewise) {
             // paste linewise before
@@ -3487,8 +3489,21 @@ fn paste_impl(values: &[String], doc: &mut Document, view: &mut View, action: Pa
             // paste at cursor
             (Paste::Cursor, _) => range.cursor(text.slice(..)),
         };
-        (pos, pos, values.next())
+
+        let value = values.next();
+
+        let value_len = value
+            .as_ref()
+            .map(|content| content.chars().count())
+            .unwrap_or_default();
+
+        ranges.push(Range::new(pos, pos + value_len));
+
+        (pos, pos, value)
     });
+
+    let transaction = transaction.with_selection(Selection::new(ranges, selection.primary_index()));
+
     apply_transaction(&transaction, doc, view);
 }
 
@@ -4742,6 +4757,7 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
     let selection = doc.selection(view.id);
 
     let mut changes = Vec::with_capacity(selection.len());
+    let mut ranges = SmallVec::with_capacity(selection.len());
     let text = doc.text().slice(..);
 
     for range in selection.ranges() {
@@ -4765,11 +4781,13 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
             ShellBehavior::Append => (range.to(), range.to()),
             _ => (range.from(), range.from()),
         };
+        ranges.push(Range::new(to, to + output.chars().count()));
         changes.push((from, to, Some(output)));
     }
 
     if behavior != &ShellBehavior::Ignore {
-        let transaction = Transaction::change(doc.text(), changes.into_iter());
+        let transaction = Transaction::change(doc.text(), changes.into_iter())
+            .with_selection(Selection::new(ranges, selection.primary_index()));
         apply_transaction(&transaction, doc, view);
         doc.append_changes_to_history(view.id);
     }

From 38149872989477f62222ce68dc32d2d6018ae165 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Fri, 4 Nov 2022 11:04:16 -0500
Subject: [PATCH 440/884] Fix panic on paste from blackhole register (#4497)

The sequence "_y"_p panics because the blackhole register contains an
empty values vec. This causes a panic when pasting since it unwraps
a `slice::last`.
---
 helix-term/src/commands.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index a6ee6263..ef963477 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3447,7 +3447,12 @@ enum Paste {
 }
 
 fn paste_impl(values: &[String], doc: &mut Document, view: &mut View, action: Paste, count: usize) {
+    if values.is_empty() {
+        return;
+    }
+
     let repeat = std::iter::repeat(
+        // `values` is asserted to have at least one entry above.
         values
             .last()
             .map(|value| Tendril::from(value.repeat(count)))

From 4ec2a21c6e21ab4e515f1bd7ee1049094af2a6b2 Mon Sep 17 00:00:00 2001
From: ChrHorn <christoph-horn@hotmail.de>
Date: Sat, 5 Nov 2022 19:30:40 +0100
Subject: [PATCH 441/884] Update Julia grammar, queries (#4588)

---
 languages.toml                       |  2 +-
 runtime/queries/julia/highlights.scm | 42 ++++++++++++++++++++++++----
 runtime/queries/julia/locals.scm     |  3 +-
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/languages.toml b/languages.toml
index 061d1414..41558e10 100644
--- a/languages.toml
+++ b/languages.toml
@@ -604,7 +604,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[grammar]]
 name = "julia"
-source = { git = "https://github.com/tree-sitter/tree-sitter-julia", rev = "fc60b7cce87da7a1b7f8cb0f9371c3dc8b684500" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-julia", rev = "8fb38abff74652c4faddbf04d2d5bbbc6b4bae25" }
 
 [[language]]
 name = "java"
diff --git a/runtime/queries/julia/highlights.scm b/runtime/queries/julia/highlights.scm
index 9271615f..90baee21 100644
--- a/runtime/queries/julia/highlights.scm
+++ b/runtime/queries/julia/highlights.scm
@@ -7,13 +7,22 @@
   (block_comment)
 ] @comment
 
-(((identifier) @constant.builtin) (match? @constant.builtin "^(nothing|missing|Inf|NaN)$"))
-(((identifier) @constant.builtin.boolean) (#eq? @constant.builtin.boolean "true"))
-(((identifier) @constant.builtin.boolean) (#eq? @constant.builtin.boolean "false"))
+(
+  ((identifier) @constant.builtin)
+  (#match? @constant.builtin "^(nothing|missing|undef)$"))
+
+[
+  (true)
+  (false)
+] @constant.builtin.boolean
 
 (integer_literal) @constant.numeric.integer
 (float_literal) @constant.numeric.float
 
+(
+  ((identifier) @constant.numeric.float)
+  (#match? @constant.numeric.float "^((Inf|NaN)(16|32|64)?)$"))
+
 (character_literal) @constant.character
 (escape_sequence) @constant.character.escape
 
@@ -66,7 +75,7 @@
 (type_parameter_list
   (identifier) @type)
 
-(constrained_parameter
+(constrained_type_parameter
   (identifier) @type)
   
 (subtype_clause
@@ -81,13 +90,32 @@
 (type_argument_list
   (identifier) @type)
 
+(where_clause
+  (identifier) @type)
+
 ; -------------------
 ; Function definition
 ; -------------------
 
 (
   (function_definition
-    name: (identifier) @function)
+    name: [
+      (identifier) @function
+      (scoped_identifier
+        (identifier) @namespace
+        (identifier) @function)
+    ])
+  ; prevent constructors (PascalCase) to be highlighted as functions
+  (#match? @function "^[^A-Z]"))
+
+(
+  (short_function_definition
+    name: [
+      (identifier) @function
+      (scoped_identifier
+        (identifier) @namespace
+        (identifier) @function)
+    ])
   ; prevent constructors (PascalCase) to be highlighted as functions
   (#match? @function "^[^A-Z]"))
 
@@ -101,7 +129,7 @@
 (optional_parameter
   . (identifier) @variable.parameter)
 
-(spread_parameter
+(slurp_parameter
   (identifier) @variable.parameter)
 
 (function_expression
@@ -185,6 +213,7 @@
 
 [
   "abstract"
+  "baremodule"
   "begin"
   "const"
   "do"
@@ -198,6 +227,7 @@
   "return"
   "struct"
   "type"
+  "where"
 ] @keyword
 
 ; TODO: fix this
diff --git a/runtime/queries/julia/locals.scm b/runtime/queries/julia/locals.scm
index 07b96f2c..70b31e50 100644
--- a/runtime/queries/julia/locals.scm
+++ b/runtime/queries/julia/locals.scm
@@ -21,7 +21,7 @@
 (optional_parameter .
   (identifier) @local.definition)
 
-(spread_parameter
+(slurp_parameter
   (identifier) @local.definition)
 
 (function_expression
@@ -33,6 +33,7 @@
 
 [
   (function_definition)
+  (short_function_definition)
   (macro_definition)
 ] @local.scope
 

From 48a3965ab43718ce2a49724cbcc294b04c328b81 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 6 Nov 2022 08:56:45 -0600
Subject: [PATCH 442/884] Fix range offsets in multi-selection paste (#4608)

* Fix range offsets in multi-selection paste

d6323b7cbc21a9d3ba29738c76581dad93f9f415 introduced a regression with
multi-selection paste where pasting would not adjust the ranges
correctly. To fix it, we need to track the total number of characters
inserted in each changed selection and use that offset to slide each
new range forwards.

* Inherit selection directions on paste

* Add an integration-test for multi-selection pasting
---
 helix-term/src/commands.rs        |  6 +++++-
 helix-term/tests/test/commands.rs | 22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index ef963477..ae9e35f1 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3476,6 +3476,7 @@ fn paste_impl(values: &[String], doc: &mut Document, view: &mut View, action: Pa
     let text = doc.text();
     let selection = doc.selection(view.id);
 
+    let mut offset = 0;
     let mut ranges = SmallVec::with_capacity(selection.len());
 
     let transaction = Transaction::change_by_selection(text, selection, |range| {
@@ -3501,8 +3502,11 @@ fn paste_impl(values: &[String], doc: &mut Document, view: &mut View, action: Pa
             .as_ref()
             .map(|content| content.chars().count())
             .unwrap_or_default();
+        let anchor = offset + pos;
 
-        ranges.push(Range::new(pos, pos + value_len));
+        let new_range = Range::new(anchor, anchor + value_len).with_direction(range.direction());
+        ranges.push(new_range);
+        offset += value_len;
 
         (pos, pos, value)
     });
diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index aadf104b..e78e6c9f 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -193,3 +193,25 @@ async fn test_goto_file_impl() -> anyhow::Result<()> {
 
     Ok(())
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_multi_selection_paste() -> anyhow::Result<()> {
+    test((
+        platform_line(indoc! {"\
+            #[|lorem]#
+            #(|ipsum)#
+            #(|dolor)#
+            "})
+        .as_str(),
+        "yp",
+        platform_line(indoc! {"\
+            lorem#[|lorem]#
+            ipsum#(|ipsum)#
+            dolor#(|dolor)#
+            "})
+        .as_str(),
+    ))
+    .await?;
+
+    Ok(())
+}

From 1536a6528968f38adfac2e991b29006f5ded5968 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 3 Nov 2022 20:55:13 -0500
Subject: [PATCH 443/884] Fix whitespace handling in command-mode completion

8584b38cfbe6ffe3e5d539ad953c413e44e90bfa switched to shellwords for
completion in command-mode. This changes the conditions for choosing
whether to complete the command or use the command's completer.

This change processes the input as shellwords up-front and uses
shellword logic about whitespace to determine whether the command
or argument should be completed.
---
 helix-core/src/shellwords.rs     | 84 ++++++++++++++++++++++++++++----
 helix-term/src/commands/typed.rs | 18 ++++---
 2 files changed, 86 insertions(+), 16 deletions(-)

diff --git a/helix-core/src/shellwords.rs b/helix-core/src/shellwords.rs
index e8c5945b..3375bef1 100644
--- a/helix-core/src/shellwords.rs
+++ b/helix-core/src/shellwords.rs
@@ -17,18 +17,18 @@ pub fn escape(input: &str) -> Cow<'_, str> {
     }
 }
 
+enum State {
+    OnWhitespace,
+    Unquoted,
+    UnquotedEscaped,
+    Quoted,
+    QuoteEscaped,
+    Dquoted,
+    DquoteEscaped,
+}
+
 /// Get the vec of escaped / quoted / doublequoted filenames from the input str
 pub fn shellwords(input: &str) -> Vec<Cow<'_, str>> {
-    enum State {
-        OnWhitespace,
-        Unquoted,
-        UnquotedEscaped,
-        Quoted,
-        QuoteEscaped,
-        Dquoted,
-        DquoteEscaped,
-    }
-
     use State::*;
 
     let mut state = Unquoted;
@@ -140,6 +140,70 @@ pub fn shellwords(input: &str) -> Vec<Cow<'_, str>> {
     args
 }
 
+/// Checks that the input ends with an ascii whitespace character which is
+/// not escaped.
+///
+/// # Examples
+///
+/// ```rust
+/// use helix_core::shellwords::ends_with_whitespace;
+/// assert_eq!(ends_with_whitespace(" "), true);
+/// assert_eq!(ends_with_whitespace(":open "), true);
+/// assert_eq!(ends_with_whitespace(":open foo.txt "), true);
+/// assert_eq!(ends_with_whitespace(":open"), false);
+/// #[cfg(unix)]
+/// assert_eq!(ends_with_whitespace(":open a\\ "), false);
+/// #[cfg(unix)]
+/// assert_eq!(ends_with_whitespace(":open a\\ b.txt"), false);
+/// ```
+pub fn ends_with_whitespace(input: &str) -> bool {
+    use State::*;
+
+    // Fast-lane: the input must end with a whitespace character
+    // regardless of quoting.
+    if !input.ends_with(|c: char| c.is_ascii_whitespace()) {
+        return false;
+    }
+
+    let mut state = Unquoted;
+
+    for c in input.chars() {
+        state = match state {
+            OnWhitespace => match c {
+                '"' => Dquoted,
+                '\'' => Quoted,
+                '\\' if cfg!(unix) => UnquotedEscaped,
+                '\\' => OnWhitespace,
+                c if c.is_ascii_whitespace() => OnWhitespace,
+                _ => Unquoted,
+            },
+            Unquoted => match c {
+                '\\' if cfg!(unix) => UnquotedEscaped,
+                '\\' => Unquoted,
+                c if c.is_ascii_whitespace() => OnWhitespace,
+                _ => Unquoted,
+            },
+            UnquotedEscaped => Unquoted,
+            Quoted => match c {
+                '\\' if cfg!(unix) => QuoteEscaped,
+                '\\' => Quoted,
+                '\'' => OnWhitespace,
+                _ => Quoted,
+            },
+            QuoteEscaped => Quoted,
+            Dquoted => match c {
+                '\\' if cfg!(unix) => DquoteEscaped,
+                '\\' => Dquoted,
+                '"' => OnWhitespace,
+                _ => Dquoted,
+            },
+            DquoteEscaped => Dquoted,
+        }
+    }
+
+    matches!(state, OnWhitespace)
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index f4dfce7a..304b30f9 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -2183,10 +2183,11 @@ pub(super) fn command_mode(cx: &mut Context) {
             static FUZZY_MATCHER: Lazy<fuzzy_matcher::skim::SkimMatcherV2> =
                 Lazy::new(fuzzy_matcher::skim::SkimMatcherV2::default);
 
-            // simple heuristic: if there's no just one part, complete command name.
-            // if there's a space, per command completion kicks in.
-            // we use .this over split_whitespace() because we care about empty segments
-            if input.split(' ').count() <= 1 {
+            let parts = shellwords::shellwords(input);
+            let ends_with_whitespace = shellwords::ends_with_whitespace(input);
+
+            if parts.is_empty() || (parts.len() == 1 && !ends_with_whitespace) {
+                // If the command has not been finished yet, complete commands.
                 let mut matches: Vec<_> = typed::TYPABLE_COMMAND_LIST
                     .iter()
                     .filter_map(|command| {
@@ -2202,8 +2203,13 @@ pub(super) fn command_mode(cx: &mut Context) {
                     .map(|(name, _)| (0.., name.into()))
                     .collect()
             } else {
-                let parts = shellwords::shellwords(input);
-                let part = parts.last().unwrap();
+                // Otherwise, use the command's completer and the last shellword
+                // as completion input.
+                let part = if parts.len() == 1 {
+                    &Cow::Borrowed("")
+                } else {
+                    parts.last().unwrap()
+                };
 
                 if let Some(typed::TypableCommand {
                     completer: Some(completer),

From 3d283b2ca43bb077f52c48fec5e4870cd314b4e3 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 3 Nov 2022 20:58:54 -0500
Subject: [PATCH 444/884] Escape filenames in command completion

This changes the completion items to be rendered with shellword
escaping, so a file `a b.txt` is rendered as `a\ b.txt` which matches
how it should be inputted.
---
 helix-core/src/shellwords.rs     | 14 +++++++-------
 helix-term/src/commands/typed.rs |  1 +
 helix-term/src/ui/prompt.rs      |  6 +-----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/helix-core/src/shellwords.rs b/helix-core/src/shellwords.rs
index 3375bef1..7742896c 100644
--- a/helix-core/src/shellwords.rs
+++ b/helix-core/src/shellwords.rs
@@ -1,9 +1,9 @@
 use std::borrow::Cow;
 
 /// Auto escape for shellwords usage.
-pub fn escape(input: &str) -> Cow<'_, str> {
+pub fn escape(input: Cow<str>) -> Cow<str> {
     if !input.chars().any(|x| x.is_ascii_whitespace()) {
-        Cow::Borrowed(input)
+        input
     } else if cfg!(unix) {
         Cow::Owned(input.chars().fold(String::new(), |mut buf, c| {
             if c.is_ascii_whitespace() {
@@ -311,15 +311,15 @@ mod test {
     #[test]
     #[cfg(unix)]
     fn test_escaping_unix() {
-        assert_eq!(escape("foobar"), Cow::Borrowed("foobar"));
-        assert_eq!(escape("foo bar"), Cow::Borrowed("foo\\ bar"));
-        assert_eq!(escape("foo\tbar"), Cow::Borrowed("foo\\\tbar"));
+        assert_eq!(escape("foobar".into()), Cow::Borrowed("foobar"));
+        assert_eq!(escape("foo bar".into()), Cow::Borrowed("foo\\ bar"));
+        assert_eq!(escape("foo\tbar".into()), Cow::Borrowed("foo\\\tbar"));
     }
 
     #[test]
     #[cfg(windows)]
     fn test_escaping_windows() {
-        assert_eq!(escape("foobar"), Cow::Borrowed("foobar"));
-        assert_eq!(escape("foo bar"), Cow::Borrowed("\"foo bar\""));
+        assert_eq!(escape("foobar".into()), Cow::Borrowed("foobar"));
+        assert_eq!(escape("foo bar".into()), Cow::Borrowed("\"foo bar\""));
     }
 }
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 304b30f9..36080d39 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -2219,6 +2219,7 @@ pub(super) fn command_mode(cx: &mut Context) {
                     completer(editor, part)
                         .into_iter()
                         .map(|(range, file)| {
+                            let file = shellwords::escape(file);
                             // offset ranges to input
                             let offset = input.len() - part.len();
                             let range = (range.start + offset)..;
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index ca2872a7..51ef688d 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -1,6 +1,5 @@
 use crate::compositor::{Component, Compositor, Context, Event, EventResult};
 use crate::{alt, ctrl, key, shift, ui};
-use helix_core::shellwords;
 use helix_view::input::KeyEvent;
 use helix_view::keyboard::KeyCode;
 use std::{borrow::Cow, ops::RangeFrom};
@@ -336,10 +335,7 @@ impl Prompt {
 
         let (range, item) = &self.completion[index];
 
-        // since we are using shellwords to parse arguments, make sure
-        // that whitespace in files is properly escaped.
-        let item = shellwords::escape(item);
-        self.line.replace_range(range.clone(), &item);
+        self.line.replace_range(range.clone(), item);
 
         self.move_end();
     }

From 140df92d7936e1fd036128d98ab565d92e9d2bd8 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 3 Nov 2022 21:02:26 -0500
Subject: [PATCH 445/884] Fix command-mode completion behavior when input is
 escaped

If `a\ b.txt` were a local file, `:o a\ <tab>` would fill the prompt
with `:o aa\ b.txt` because the replacement range was calculated using
the shellwords-parsed part. Escaping the part before calculating its
length fixes this edge-case.
---
 helix-term/src/commands/typed.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 36080d39..2f387bfd 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -2216,12 +2216,15 @@ pub(super) fn command_mode(cx: &mut Context) {
                     ..
                 }) = typed::TYPABLE_COMMAND_MAP.get(&parts[0] as &str)
                 {
+                    let part_len = shellwords::escape(part.clone()).len();
+
                     completer(editor, part)
                         .into_iter()
                         .map(|(range, file)| {
                             let file = shellwords::escape(file);
+
                             // offset ranges to input
-                            let offset = input.len() - part.len();
+                            let offset = input.len() - part_len;
                             let range = (range.start + offset)..;
                             (range, file)
                         })

From eddf9f0b7f2eacac690afad05abdae398bb17366 Mon Sep 17 00:00:00 2001
From: Jonathan LEI <me@xjonathan.dev>
Date: Mon, 7 Nov 2022 12:39:18 +0800
Subject: [PATCH 446/884] Run clippy on workspace in CI (#4614)

---
 .github/workflows/build.yml | 2 +-
 helix-core/src/test.rs      | 1 +
 xtask/src/querycheck.rs     | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ef47a277..15734361 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -101,7 +101,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: --all-targets -- -D warnings
+          args: --workspace --all-targets -- -D warnings
 
       - name: Run cargo doc
         uses: actions-rs/cargo@v1
diff --git a/helix-core/src/test.rs b/helix-core/src/test.rs
index 3e54d2c2..17523ed7 100644
--- a/helix-core/src/test.rs
+++ b/helix-core/src/test.rs
@@ -148,6 +148,7 @@ pub fn plain(s: &str, selection: Selection) -> String {
 }
 
 #[cfg(test)]
+#[allow(clippy::module_inception)]
 mod test {
     use super::*;
 
diff --git a/xtask/src/querycheck.rs b/xtask/src/querycheck.rs
index 7014c7d6..454d0e5c 100644
--- a/xtask/src/querycheck.rs
+++ b/xtask/src/querycheck.rs
@@ -17,8 +17,8 @@ pub fn query_check() -> Result<(), DynError> {
         let language_name = &language.language_id;
         let grammar_name = language.grammar.as_ref().unwrap_or(language_name);
         for query_file in query_files {
-            let language = get_language(&grammar_name);
-            let query_text = read_query(&language_name, query_file);
+            let language = get_language(grammar_name);
+            let query_text = read_query(language_name, query_file);
             if let Ok(lang) = language {
                 if !query_text.is_empty() {
                     if let Err(reason) = Query::new(lang, &query_text) {

From da8f29eaa7d51be7b0417111281b6cc526842f85 Mon Sep 17 00:00:00 2001
From: Ryan Palmer <ryangpalmer@hotmail.com>
Date: Mon, 7 Nov 2022 05:32:40 -0800
Subject: [PATCH 447/884] Fixed disorienting selection palette on Gruvbox theme
 (#4626)

Co-authored-by: ryan.palmer <ryan.palmer@servicenow.com>
---
 runtime/themes/gruvbox.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml
index aa7a464a..4f0a7d9f 100644
--- a/runtime/themes/gruvbox.toml
+++ b/runtime/themes/gruvbox.toml
@@ -52,9 +52,9 @@
 "ui.help" = { bg = "bg1", fg = "fg1" }
 "ui.text" = { fg = "fg1" }
 "ui.text.focus" = { fg = "fg1" }
-"ui.selection" = { bg = "bg3", modifiers = ["reversed"] }
-"ui.cursor.primary" = { modifiers = ["reversed"] }
-"ui.cursor.match" = { bg = "bg2" }
+"ui.selection" = { bg = "bg2" }
+"ui.cursor.primary" = { bg = "fg4", fg = "bg1" }
+"ui.cursor.match" = { bg = "bg3" }
 "ui.menu" = { fg = "fg1", bg = "bg2" }
 "ui.menu.selected" = { fg = "bg2", bg = "blue1", modifiers = ["bold"] }
 "ui.virtual.whitespace" = "bg2"

From 6cafd81e41f353a7005eef4248a09a2b1849bc5c Mon Sep 17 00:00:00 2001
From: Tobias Kohlbau <tobias@kohlbau.de>
Date: Mon, 7 Nov 2022 14:53:29 +0100
Subject: [PATCH 448/884] tutor: fix wording in recap for chapter 5 (#4629)

In recap for chapter 5.1 specify that the cursor is duplicted to the next suitable line
instead of the next line.

Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
---
 runtime/tutor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/tutor b/runtime/tutor
index 43edb360..eb1d9885 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -596,8 +596,8 @@ _________________________________________________________________
 =                        CHAPTER 5 RECAP                        =
 =================================================================
 
- * Type C to copy the current selection to below and Alt-C for
-   above.
+ * Type C to duplicate the cursor to the next suitable line
+   and Alt-C for previous suitable line.
 
  * Type s to select all instances of a regex pattern inside
    the current selection.

From 5bfe84fb4f78379921fdd5eed03f118181e90a4e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 18:06:05 -0600
Subject: [PATCH 449/884] build(deps): bump libloading from 0.7.3 to 0.7.4
 (#4639)

Bumps [libloading](https://github.com/nagisa/rust_libloading) from 0.7.3 to 0.7.4.
- [Release notes](https://github.com/nagisa/rust_libloading/releases)
- [Commits](https://github.com/nagisa/rust_libloading/compare/0.7.3...0.7.4)

---
updated-dependencies:
- dependency-name: libloading
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 93459aa0..a4528289 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -655,9 +655,9 @@ checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
 
 [[package]]
 name = "libloading"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
 dependencies = [
  "cfg-if",
  "winapi",

From 535cf90093573d86af6e5510c90aee476703fed7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 18:07:21 -0600
Subject: [PATCH 450/884] build(deps): bump regex from 1.6.0 to 1.7.0 (#4640)

Bumps [regex](https://github.com/rust-lang/regex) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/rust-lang/regex/releases)
- [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/regex/compare/1.6.0...1.7.0)

---
updated-dependencies:
- dependency-name: regex
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a4528289..f0bf11f2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -876,9 +876,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
 dependencies = [
  "aho-corasick",
  "memchr",

From 188aff059bf9558b4fa28b03d5929020ff76cdb3 Mon Sep 17 00:00:00 2001
From: Danillo Melo <danillos@gmail.com>
Date: Mon, 7 Nov 2022 22:43:00 -0300
Subject: [PATCH 451/884] Improve Ruby TextObjects (#4601)

---
 runtime/queries/ruby/textobjects.scm | 50 +++++++++++-----------------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/runtime/queries/ruby/textobjects.scm b/runtime/queries/ruby/textobjects.scm
index 34888c17..2d48fa6f 100644
--- a/runtime/queries/ruby/textobjects.scm
+++ b/runtime/queries/ruby/textobjects.scm
@@ -1,11 +1,6 @@
-; Class
-(class) @class.around
-
-(class [(constant) (scope_resolution)] !superclass
-  (_)+ @class.inside) 
-
-(class [(constant) (scope_resolution)] (superclass)
-  (_)+ @class.inside) 
+; Class and Modules
+(class
+  body: (_)? @class.inside) @class.around
 
 (singleton_class
   value: (_)
@@ -17,37 +12,32 @@
   (#match? @class_const "Class")
   (#match? @class_method "new")
   (do_block (_)+ @class.inside)) @class.around
+  
+(module
+  body: (_)? @class.inside) @class.around
 
-; Functions
-(method) @function.around
+; Functions and Blocks
+(singleton_method
+  body: (_)? @function.inside) @function.around
 
-(method (identifier) (method_parameters)
-  (_)+ @function.inside)
-  
-(do_block !parameters
-  (_)+ @function.inside)
-  
-(do_block (block_parameters)
-  (_)+ @function.inside)
-    
-(block (block_parameters)
-  (_)+ @function.inside)
-      
-(block !parameters
-  (_)+ @function.inside)
-      
-(method (identifier) !parameters
-  (_)+  @function.inside)
+(method
+  body: (_)? @function.inside) @function.around
+
+(do_block
+  body: (_)? @function.inside) @function.around
+
+(block
+  body: (_)? @function.inside) @function.around
 
 ; Parameters      
 (method_parameters
-  (_) @parameter.inside)
+  (_) @parameter.inside) @parameter.around
         
 (block_parameters 
-  (_) @parameter.inside)
+  (_) @parameter.inside) @parameter.around
         
 (lambda_parameters 
-  (_) @parameter.inside)
+  (_) @parameter.inside) @parameter.around
 
 ; Comments
 (comment) @comment.inside 

From 13126823f83cb90a3aabfc2326c0907d1ca2d921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 8 Nov 2022 20:48:06 +0900
Subject: [PATCH 452/884] lsp: Support insertReplace

Fixes #4473
---
 helix-lsp/src/client.rs         | 1 +
 helix-term/src/ui/completion.rs | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 0b443ccf..81b7d8ad 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -311,6 +311,7 @@ impl Client {
                                     String::from("additionalTextEdits"),
                                 ],
                             }),
+                            insert_replace_support: Some(true),
                             ..Default::default()
                         }),
                         completion_item_kind: Some(lsp::CompletionItemKindCapability {
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index de7c3232..5ec8cf89 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -113,7 +113,8 @@ impl Completion {
                     let edit = match edit {
                         lsp::CompletionTextEdit::Edit(edit) => edit.clone(),
                         lsp::CompletionTextEdit::InsertAndReplace(item) => {
-                            unimplemented!("completion: insert_and_replace {:?}", item)
+                            // TODO: support using "insert" instead of "replace" via user config
+                            lsp::TextEdit::new(item.replace, item.new_text.clone())
                         }
                     };
 

From c94feed83d746e71fb030639d740af85162b0763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 8 Nov 2022 21:03:54 +0900
Subject: [PATCH 453/884] core: Move state into the history module

---
 helix-core/src/comment.rs  | 40 ++++++++++++++++++--------------------
 helix-core/src/history.rs  | 19 +++++++++++++++---
 helix-core/src/lib.rs      |  2 --
 helix-core/src/state.rs    | 17 ----------------
 helix-term/src/commands.rs |  1 -
 helix-view/src/document.rs |  4 ++--
 6 files changed, 37 insertions(+), 46 deletions(-)
 delete mode 100644 helix-core/src/state.rs

diff --git a/helix-core/src/comment.rs b/helix-core/src/comment.rs
index 44f6cdfe..ec5d7a45 100644
--- a/helix-core/src/comment.rs
+++ b/helix-core/src/comment.rs
@@ -100,43 +100,41 @@ mod test {
 
     #[test]
     fn test_find_line_comment() {
-        use crate::State;
-
         // four lines, two space indented, except for line 1 which is blank.
-        let doc = Rope::from("  1\n\n  2\n  3");
-
-        let mut state = State::new(doc);
+        let mut doc = Rope::from("  1\n\n  2\n  3");
         // select whole document
-        state.selection = Selection::single(0, state.doc.len_chars() - 1);
+        let mut selection = Selection::single(0, doc.len_chars() - 1);
 
-        let text = state.doc.slice(..);
+        let text = doc.slice(..);
 
         let res = find_line_comment("//", text, 0..3);
         // (commented = true, to_change = [line 0, line 2], min = col 2, margin = 1)
         assert_eq!(res, (false, vec![0, 2], 2, 1));
 
         // comment
-        let transaction = toggle_line_comments(&state.doc, &state.selection, None);
-        transaction.apply(&mut state.doc);
-        state.selection = state.selection.map(transaction.changes());
+        let transaction = toggle_line_comments(&doc, &selection, None);
+        transaction.apply(&mut doc);
+        selection = selection.map(transaction.changes());
 
-        assert_eq!(state.doc, "  // 1\n\n  // 2\n  // 3");
+        assert_eq!(doc, "  // 1\n\n  // 2\n  // 3");
 
         // uncomment
-        let transaction = toggle_line_comments(&state.doc, &state.selection, None);
-        transaction.apply(&mut state.doc);
-        state.selection = state.selection.map(transaction.changes());
-        assert_eq!(state.doc, "  1\n\n  2\n  3");
+        let transaction = toggle_line_comments(&doc, &selection, None);
+        transaction.apply(&mut doc);
+        selection = selection.map(transaction.changes());
+        assert_eq!(doc, "  1\n\n  2\n  3");
+        assert!(selection.len() == 1); // to ignore the selection unused warning
 
         // 0 margin comments
-        state.doc = Rope::from("  //1\n\n  //2\n  //3");
+        doc = Rope::from("  //1\n\n  //2\n  //3");
         // reset the selection.
-        state.selection = Selection::single(0, state.doc.len_chars() - 1);
+        selection = Selection::single(0, doc.len_chars() - 1);
 
-        let transaction = toggle_line_comments(&state.doc, &state.selection, None);
-        transaction.apply(&mut state.doc);
-        state.selection = state.selection.map(transaction.changes());
-        assert_eq!(state.doc, "  1\n\n  2\n  3");
+        let transaction = toggle_line_comments(&doc, &selection, None);
+        transaction.apply(&mut doc);
+        selection = selection.map(transaction.changes());
+        assert_eq!(doc, "  1\n\n  2\n  3");
+        assert!(selection.len() == 1); // to ignore the selection unused warning
 
         // TODO: account for uncommenting with uneven comment indentation
     }
diff --git a/helix-core/src/history.rs b/helix-core/src/history.rs
index 5cd72b07..51174c02 100644
--- a/helix-core/src/history.rs
+++ b/helix-core/src/history.rs
@@ -1,9 +1,15 @@
-use crate::{Assoc, ChangeSet, Range, Rope, State, Transaction};
+use crate::{Assoc, ChangeSet, Range, Rope, Selection, Transaction};
 use once_cell::sync::Lazy;
 use regex::Regex;
 use std::num::NonZeroUsize;
 use std::time::{Duration, Instant};
 
+#[derive(Debug, Clone)]
+pub struct State {
+    pub doc: Rope,
+    pub selection: Selection,
+}
+
 /// Stores the history of changes to a buffer.
 ///
 /// Currently the history is represented as a vector of revisions. The vector
@@ -366,12 +372,16 @@ impl std::str::FromStr for UndoKind {
 #[cfg(test)]
 mod test {
     use super::*;
+    use crate::Selection;
 
     #[test]
     fn test_undo_redo() {
         let mut history = History::default();
         let doc = Rope::from("hello");
-        let mut state = State::new(doc);
+        let mut state = State {
+            doc,
+            selection: Selection::point(0),
+        };
 
         let transaction1 =
             Transaction::change(&state.doc, vec![(5, 5, Some(" world!".into()))].into_iter());
@@ -420,7 +430,10 @@ mod test {
     fn test_earlier_later() {
         let mut history = History::default();
         let doc = Rope::from("a\n");
-        let mut state = State::new(doc);
+        let mut state = State {
+            doc,
+            selection: Selection::point(0),
+        };
 
         fn undo(history: &mut History, state: &mut State) {
             if let Some(transaction) = history.undo() {
diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index 8f869e35..5f60c048 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -21,7 +21,6 @@ pub mod register;
 pub mod search;
 pub mod selection;
 pub mod shellwords;
-mod state;
 pub mod surround;
 pub mod syntax;
 pub mod test;
@@ -103,7 +102,6 @@ pub use smallvec::{smallvec, SmallVec};
 pub use syntax::Syntax;
 
 pub use diagnostic::Diagnostic;
-pub use state::State;
 
 pub use line_ending::{LineEnding, DEFAULT_LINE_ENDING};
 pub use transaction::{Assoc, Change, ChangeSet, Operation, Transaction};
diff --git a/helix-core/src/state.rs b/helix-core/src/state.rs
deleted file mode 100644
index dcc4b11b..00000000
--- a/helix-core/src/state.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use crate::{Rope, Selection};
-
-#[derive(Debug, Clone)]
-pub struct State {
-    pub doc: Rope,
-    pub selection: Selection,
-}
-
-impl State {
-    #[must_use]
-    pub fn new(doc: Rope) -> Self {
-        Self {
-            doc,
-            selection: Selection::point(0),
-        }
-    }
-}
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index ae9e35f1..31498a7b 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3465,7 +3465,6 @@ fn paste_impl(values: &[String], doc: &mut Document, view: &mut View, action: Pa
         .any(|value| get_line_ending_of_str(value).is_some());
 
     // Only compiled once.
-    #[allow(clippy::trivial_regex)]
     static REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"\r\n|\r|\n").unwrap());
     let mut values = values
         .iter()
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 9a7febd2..08708528 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -16,11 +16,11 @@ use std::sync::Arc;
 
 use helix_core::{
     encoding,
-    history::{History, UndoKind},
+    history::{History, State, UndoKind},
     indent::{auto_detect_indent_style, IndentStyle},
     line_ending::auto_detect_line_ending,
     syntax::{self, LanguageConfiguration},
-    ChangeSet, Diagnostic, LineEnding, Rope, RopeBuilder, Selection, State, Syntax, Transaction,
+    ChangeSet, Diagnostic, LineEnding, Rope, RopeBuilder, Selection, Syntax, Transaction,
     DEFAULT_LINE_ENDING,
 };
 

From 7ed9e9cf2567ee5e23cd8694ffccb4b38602c02a Mon Sep 17 00:00:00 2001
From: Doug Kelkhoff <18220321+dgkf@users.noreply.github.com>
Date: Tue, 8 Nov 2022 07:19:59 -0500
Subject: [PATCH 454/884] Dynamically resize line number gutter width (#3469)

* dynamically resize line number gutter width

* removing digits lower-bound, permitting spacer

* removing max line num char limit; adding notes; qualified successors; notes

* updating tests to use new line number width when testing views

* linenr width based on document line count

* using min width of 2 so line numbers relative is useful

* lint rolling; removing unnecessary type parameter lifetime

* merge change resolution

* reformat code

* rename row_styler to style; add int_log resource

* adding spacer to gutters default; updating book config entry

* adding view.inner_height(), swap for loop for iterator

* reverting change of current! to view! now that doc is not needed
---
 book/src/configuration.md   |   2 +-
 helix-term/src/commands.rs  |  16 ++--
 helix-term/src/ui/editor.rs |  17 +++--
 helix-view/src/editor.rs    |   9 ++-
 helix-view/src/gutter.rs    |  57 ++++++++++++--
 helix-view/src/lib.rs       |   2 +-
 helix-view/src/tree.rs      |   4 +-
 helix-view/src/view.rs      | 145 ++++++++++++++++--------------------
 8 files changed, 143 insertions(+), 109 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 9f3fe2fa..20abeba5 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -46,7 +46,7 @@ on unix operating systems.
 | `line-number` | Line number display: `absolute` simply shows each line's number, while `relative` shows the distance from the current line. When unfocused or in insert mode, `relative` will still show absolute line numbers. | `absolute` |
 | `cursorline` | Highlight all lines with a cursor. | `false` |
 | `cursorcolumn` | Highlight all columns with a cursor. | `false` |
-| `gutters` | Gutters to display: Available are `diagnostics` and `line-numbers` and `spacer`, note that `diagnostics` also includes other features like breakpoints, 1-width padding will be inserted if gutters is non-empty | `["diagnostics", "line-numbers"]` |
+| `gutters` | Gutters to display: Available are `diagnostics` and `line-numbers` and `spacer`, note that `diagnostics` also includes other features like breakpoints, 1-width padding will be inserted if gutters is non-empty | `["diagnostics", "spacer", "line-numbers"]` |
 | `auto-completion` | Enable automatic pop up of auto-completion. | `true` |
 | `auto-format` | Enable automatic formatting on save. | `true` |
 | `auto-save` | Enable automatic saving on focus moving away from Helix. Requires [focus event support](https://github.com/helix-editor/helix/wiki/Terminal-Support) from your terminal. | `false` |
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 31498a7b..4e3c321c 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -870,7 +870,7 @@ fn goto_window(cx: &mut Context, align: Align) {
     let config = cx.editor.config();
     let (view, doc) = current!(cx.editor);
 
-    let height = view.inner_area().height as usize;
+    let height = view.inner_height();
 
     // respect user given count if any
     // - 1 so we have at least one gap in the middle.
@@ -1372,9 +1372,9 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction) {
         return;
     }
 
-    let height = view.inner_area().height;
+    let height = view.inner_height();
 
-    let scrolloff = config.scrolloff.min(height as usize / 2);
+    let scrolloff = config.scrolloff.min(height / 2);
 
     view.offset.row = match direction {
         Forward => view.offset.row + offset,
@@ -1412,25 +1412,25 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction) {
 
 fn page_up(cx: &mut Context) {
     let view = view!(cx.editor);
-    let offset = view.inner_area().height as usize;
+    let offset = view.inner_height();
     scroll(cx, offset, Direction::Backward);
 }
 
 fn page_down(cx: &mut Context) {
     let view = view!(cx.editor);
-    let offset = view.inner_area().height as usize;
+    let offset = view.inner_height();
     scroll(cx, offset, Direction::Forward);
 }
 
 fn half_page_up(cx: &mut Context) {
     let view = view!(cx.editor);
-    let offset = view.inner_area().height as usize / 2;
+    let offset = view.inner_height() / 2;
     scroll(cx, offset, Direction::Backward);
 }
 
 fn half_page_down(cx: &mut Context) {
     let view = view!(cx.editor);
-    let offset = view.inner_area().height as usize / 2;
+    let offset = view.inner_height() / 2;
     scroll(cx, offset, Direction::Forward);
 }
 
@@ -4342,7 +4342,7 @@ fn align_view_middle(cx: &mut Context) {
 
     view.offset.col = pos
         .col
-        .saturating_sub((view.inner_area().width as usize) / 2);
+        .saturating_sub((view.inner_area(doc).width as usize) / 2);
 }
 
 fn scroll_up(cx: &mut Context) {
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 2cd2ad05..f2a588e3 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -79,7 +79,7 @@ impl EditorView {
         surface: &mut Surface,
         is_focused: bool,
     ) {
-        let inner = view.inner_area();
+        let inner = view.inner_area(doc);
         let area = view.area;
         let theme = &editor.theme;
 
@@ -736,9 +736,10 @@ impl EditorView {
         // avoid lots of small allocations by reusing a text buffer for each line
         let mut text = String::with_capacity(8);
 
-        for (constructor, width) in view.gutters() {
-            let gutter = constructor(editor, doc, view, theme, is_focused, *width);
-            text.reserve(*width); // ensure there's enough space for the gutter
+        for gutter_type in view.gutters() {
+            let gutter = gutter_type.style(editor, doc, view, theme, is_focused);
+            let width = gutter_type.width(view, doc);
+            text.reserve(width); // ensure there's enough space for the gutter
             for (i, line) in (view.offset.row..(last_line + 1)).enumerate() {
                 let selected = cursors.contains(&line);
                 let x = viewport.x + offset;
@@ -751,13 +752,13 @@ impl EditorView {
                 };
 
                 if let Some(style) = gutter(line, selected, &mut text) {
-                    surface.set_stringn(x, y, &text, *width, gutter_style.patch(style));
+                    surface.set_stringn(x, y, &text, width, gutter_style.patch(style));
                 } else {
                     surface.set_style(
                         Rect {
                             x,
                             y,
-                            width: *width as u16,
+                            width: width as u16,
                             height: 1,
                         },
                         gutter_style,
@@ -766,7 +767,7 @@ impl EditorView {
                 text.clear();
             }
 
-            offset += *width as u16;
+            offset += width as u16;
         }
     }
 
@@ -882,7 +883,7 @@ impl EditorView {
             .or_else(|| theme.try_get_exact("ui.cursorcolumn"))
             .unwrap_or_else(|| theme.get("ui.cursorline.secondary"));
 
-        let inner_area = view.inner_area();
+        let inner_area = view.inner_area(doc);
         let offset = view.offset.col;
 
         let selection = doc.selection(view.id);
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index bcd8dedb..db97cbb1 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -456,6 +456,7 @@ impl std::str::FromStr for GutterType {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s.to_lowercase().as_str() {
             "diagnostics" => Ok(Self::Diagnostics),
+            "spacer" => Ok(Self::Spacer),
             "line-numbers" => Ok(Self::LineNumbers),
             _ => anyhow::bail!("Gutter type can only be `diagnostics` or `line-numbers`."),
         }
@@ -589,7 +590,11 @@ impl Default for Config {
             line_number: LineNumber::Absolute,
             cursorline: false,
             cursorcolumn: false,
-            gutters: vec![GutterType::Diagnostics, GutterType::LineNumbers],
+            gutters: vec![
+                GutterType::Diagnostics,
+                GutterType::Spacer,
+                GutterType::LineNumbers,
+            ],
             middle_click_paste: true,
             auto_pairs: AutoPairConfig::default(),
             auto_completion: true,
@@ -1308,7 +1313,7 @@ impl Editor {
             .primary()
             .cursor(doc.text().slice(..));
         if let Some(mut pos) = view.screen_coords_at_pos(doc, doc.text().slice(..), cursor) {
-            let inner = view.inner_area();
+            let inner = view.inner_area(doc);
             pos.col += inner.x as usize;
             pos.row += inner.y as usize;
             let cursorkind = config.cursor_shape.from_mode(self.mode);
diff --git a/helix-view/src/gutter.rs b/helix-view/src/gutter.rs
index 2c207d27..61a17791 100644
--- a/helix-view/src/gutter.rs
+++ b/helix-view/src/gutter.rs
@@ -1,21 +1,54 @@
 use std::fmt::Write;
 
 use crate::{
+    editor::GutterType,
     graphics::{Color, Style, UnderlineStyle},
     Document, Editor, Theme, View,
 };
 
+fn count_digits(n: usize) -> usize {
+    // NOTE: if int_log gets standardized in stdlib, can use checked_log10
+    // (https://github.com/rust-lang/rust/issues/70887#issue)
+    std::iter::successors(Some(n), |&n| (n >= 10).then(|| n / 10)).count()
+}
+
 pub type GutterFn<'doc> = Box<dyn Fn(usize, bool, &mut String) -> Option<Style> + 'doc>;
 pub type Gutter =
     for<'doc> fn(&'doc Editor, &'doc Document, &View, &Theme, bool, usize) -> GutterFn<'doc>;
 
+impl GutterType {
+    pub fn style<'doc>(
+        self,
+        editor: &'doc Editor,
+        doc: &'doc Document,
+        view: &View,
+        theme: &Theme,
+        is_focused: bool,
+    ) -> GutterFn<'doc> {
+        match self {
+            GutterType::Diagnostics => {
+                diagnostics_or_breakpoints(editor, doc, view, theme, is_focused)
+            }
+            GutterType::LineNumbers => line_numbers(editor, doc, view, theme, is_focused),
+            GutterType::Spacer => padding(editor, doc, view, theme, is_focused),
+        }
+    }
+
+    pub fn width(self, _view: &View, doc: &Document) -> usize {
+        match self {
+            GutterType::Diagnostics => 1,
+            GutterType::LineNumbers => line_numbers_width(_view, doc),
+            GutterType::Spacer => 1,
+        }
+    }
+}
+
 pub fn diagnostic<'doc>(
     _editor: &'doc Editor,
     doc: &'doc Document,
     _view: &View,
     theme: &Theme,
     _is_focused: bool,
-    _width: usize,
 ) -> GutterFn<'doc> {
     let warning = theme.get("warning");
     let error = theme.get("error");
@@ -56,10 +89,11 @@ pub fn line_numbers<'doc>(
     view: &View,
     theme: &Theme,
     is_focused: bool,
-    width: usize,
 ) -> GutterFn<'doc> {
     let text = doc.text().slice(..);
     let last_line = view.last_line(doc);
+    let width = GutterType::LineNumbers.width(view, doc);
+
     // Whether to draw the line number for the last line of the
     // document or not.  We only draw it if it's not an empty line.
     let draw_last = text.line_to_byte(last_line) < text.len_bytes();
@@ -91,24 +125,35 @@ pub fn line_numbers<'doc>(
             } else {
                 line + 1
             };
+
             let style = if selected && is_focused {
                 linenr_select
             } else {
                 linenr
             };
+
             write!(out, "{:>1$}", display_num, width).unwrap();
             Some(style)
         }
     })
 }
 
+pub fn line_numbers_width(_view: &View, doc: &Document) -> usize {
+    let text = doc.text();
+    let last_line = text.len_lines().saturating_sub(1);
+    let draw_last = text.line_to_byte(last_line) < text.len_bytes();
+    let last_drawn = if draw_last { last_line + 1 } else { last_line };
+
+    // set a lower bound to 2-chars to minimize ambiguous relative line numbers
+    std::cmp::max(count_digits(last_drawn), 2)
+}
+
 pub fn padding<'doc>(
     _editor: &'doc Editor,
     _doc: &'doc Document,
     _view: &View,
     _theme: &Theme,
     _is_focused: bool,
-    _width: usize,
 ) -> GutterFn<'doc> {
     Box::new(|_line: usize, _selected: bool, _out: &mut String| None)
 }
@@ -128,7 +173,6 @@ pub fn breakpoints<'doc>(
     _view: &View,
     theme: &Theme,
     _is_focused: bool,
-    _width: usize,
 ) -> GutterFn<'doc> {
     let warning = theme.get("warning");
     let error = theme.get("error");
@@ -181,10 +225,9 @@ pub fn diagnostics_or_breakpoints<'doc>(
     view: &View,
     theme: &Theme,
     is_focused: bool,
-    width: usize,
 ) -> GutterFn<'doc> {
-    let diagnostics = diagnostic(editor, doc, view, theme, is_focused, width);
-    let breakpoints = breakpoints(editor, doc, view, theme, is_focused, width);
+    let diagnostics = diagnostic(editor, doc, view, theme, is_focused);
+    let breakpoints = breakpoints(editor, doc, view, theme, is_focused);
 
     Box::new(move |line, selected, out| {
         breakpoints(line, selected, out).or_else(|| diagnostics(line, selected, out))
diff --git a/helix-view/src/lib.rs b/helix-view/src/lib.rs
index 52044ac7..4c32b356 100644
--- a/helix-view/src/lib.rs
+++ b/helix-view/src/lib.rs
@@ -55,7 +55,7 @@ pub fn align_view(doc: &Document, view: &mut View, align: Align) {
         .cursor(doc.text().slice(..));
     let line = doc.text().char_to_line(pos);
 
-    let last_line_height = view.inner_area().height.saturating_sub(1) as usize;
+    let last_line_height = view.inner_height().saturating_sub(1);
 
     let relative = match align {
         Align::Center => last_line_height / 2,
diff --git a/helix-view/src/tree.rs b/helix-view/src/tree.rs
index a1977764..6174021c 100644
--- a/helix-view/src/tree.rs
+++ b/helix-view/src/tree.rs
@@ -499,7 +499,7 @@ impl Tree {
                     // in a vertical container (and already correct based on previous search)
                     child_id = *container.children.iter().min_by_key(|id| {
                         let x = match &self.nodes[**id].content {
-                            Content::View(view) => view.inner_area().left(),
+                            Content::View(view) => view.area.left(),
                             Content::Container(container) => container.area.left(),
                         };
                         (current_x as i16 - x as i16).abs()
@@ -510,7 +510,7 @@ impl Tree {
                     // in a horizontal container (and already correct based on previous search)
                     child_id = *container.children.iter().min_by_key(|id| {
                         let y = match &self.nodes[**id].content {
-                            Content::View(view) => view.inner_area().top(),
+                            Content::View(view) => view.area.top(),
                             Content::Container(container) => container.area.top(),
                         };
                         (current_y as i16 - y as i16).abs()
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index 62984b88..6da4df1f 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -1,8 +1,4 @@
-use crate::{
-    graphics::Rect,
-    gutter::{self, Gutter},
-    Document, DocumentId, ViewId,
-};
+use crate::{editor::GutterType, graphics::Rect, Document, DocumentId, ViewId};
 use helix_core::{
     pos_at_visual_coords, visual_coords_at_pos, Position, RopeSlice, Selection, Transaction,
 };
@@ -98,11 +94,8 @@ pub struct View {
     pub last_modified_docs: [Option<DocumentId>; 2],
     /// used to store previous selections of tree-sitter objects
     pub object_selections: Vec<Selection>,
-    /// Gutter (constructor) and width of gutter, used to calculate
-    /// `gutter_offset`
-    gutters: Vec<(Gutter, usize)>,
-    /// cached total width of gutter
-    gutter_offset: u16,
+    /// GutterTypes used to fetch Gutter (constructor) and width for rendering
+    gutters: Vec<GutterType>,
 }
 
 impl fmt::Debug for View {
@@ -117,28 +110,6 @@ impl fmt::Debug for View {
 
 impl View {
     pub fn new(doc: DocumentId, gutter_types: Vec<crate::editor::GutterType>) -> Self {
-        let mut gutters: Vec<(Gutter, usize)> = vec![];
-        let mut gutter_offset = 0;
-        use crate::editor::GutterType;
-        for gutter_type in &gutter_types {
-            let width = match gutter_type {
-                GutterType::Diagnostics => 1,
-                GutterType::LineNumbers => 5,
-                GutterType::Spacer => 1,
-            };
-            gutter_offset += width;
-            gutters.push((
-                match gutter_type {
-                    GutterType::Diagnostics => gutter::diagnostics_or_breakpoints,
-                    GutterType::LineNumbers => gutter::line_numbers,
-                    GutterType::Spacer => gutter::padding,
-                },
-                width as usize,
-            ));
-        }
-        if !gutter_types.is_empty() {
-            gutter_offset += 1;
-        }
         Self {
             id: ViewId::default(),
             doc,
@@ -148,8 +119,7 @@ impl View {
             docs_access_history: Vec::new(),
             last_modified_docs: [None, None],
             object_selections: Vec::new(),
-            gutters,
-            gutter_offset,
+            gutters: gutter_types,
         }
     }
 
@@ -160,15 +130,32 @@ impl View {
         self.docs_access_history.push(id);
     }
 
-    pub fn inner_area(&self) -> Rect {
-        // TODO add abilty to not use cached offset for runtime configurable gutter
-        self.area.clip_left(self.gutter_offset).clip_bottom(1) // -1 for statusline
+    pub fn inner_area(&self, doc: &Document) -> Rect {
+        self.area.clip_left(self.gutter_offset(doc)).clip_bottom(1) // -1 for statusline
+    }
+
+    pub fn inner_height(&self) -> usize {
+        self.area.clip_bottom(1).height.into() // -1 for statusline
     }
 
-    pub fn gutters(&self) -> &[(Gutter, usize)] {
+    pub fn gutters(&self) -> &[GutterType] {
         &self.gutters
     }
 
+    pub fn gutter_offset(&self, doc: &Document) -> u16 {
+        let mut offset = self
+            .gutters
+            .iter()
+            .map(|gutter| gutter.width(self, doc) as u16)
+            .sum();
+
+        if offset > 0 {
+            offset += 1
+        }
+
+        offset
+    }
+
     //
     pub fn offset_coords_to_in_view(
         &self,
@@ -183,7 +170,7 @@ impl View {
         let Position { col, row: line } =
             visual_coords_at_pos(doc.text().slice(..), cursor, doc.tab_width());
 
-        let inner_area = self.inner_area();
+        let inner_area = self.inner_area(doc);
         let last_line = (self.offset.row + inner_area.height as usize).saturating_sub(1);
 
         // - 1 so we have at least one gap in the middle.
@@ -233,10 +220,9 @@ impl View {
     /// Calculates the last visible line on screen
     #[inline]
     pub fn last_line(&self, doc: &Document) -> usize {
-        let height = self.inner_area().height;
         std::cmp::min(
             // Saturating subs to make it inclusive zero indexing.
-            (self.offset.row + height as usize).saturating_sub(1),
+            (self.offset.row + self.inner_height()).saturating_sub(1),
             doc.text().len_lines().saturating_sub(1),
         )
     }
@@ -270,12 +256,13 @@ impl View {
 
     pub fn text_pos_at_screen_coords(
         &self,
-        text: &RopeSlice,
+        doc: &Document,
         row: u16,
         column: u16,
         tab_width: usize,
     ) -> Option<usize> {
-        let inner = self.inner_area();
+        let text = doc.text().slice(..);
+        let inner = self.inner_area(doc);
         // 1 for status
         if row < inner.top() || row >= inner.bottom() {
             return None;
@@ -293,7 +280,7 @@ impl View {
         let text_col = (column - inner.x) as usize + self.offset.col;
 
         Some(pos_at_visual_coords(
-            *text,
+            text,
             Position {
                 row: text_row,
                 col: text_col,
@@ -305,7 +292,7 @@ impl View {
     /// Translates a screen position to position in the text document.
     /// Returns a usize typed position in bounds of the text if found in this view, None if out of view.
     pub fn pos_at_screen_coords(&self, doc: &Document, row: u16, column: u16) -> Option<usize> {
-        self.text_pos_at_screen_coords(&doc.text().slice(..), row, column, doc.tab_width())
+        self.text_pos_at_screen_coords(doc, row, column, doc.tab_width())
     }
 
     /// Translates screen coordinates into coordinates on the gutter of the view.
@@ -366,9 +353,10 @@ impl View {
 mod tests {
     use super::*;
     use helix_core::Rope;
-    const OFFSET: u16 = 7; // 1 diagnostic + 5 linenr + 1 gutter
+    const OFFSET: u16 = 4; // 1 diagnostic + 2 linenr (< 100 lines) + 1 gutter
     const OFFSET_WITHOUT_LINE_NUMBERS: u16 = 2; // 1 diagnostic + 1 gutter
                                                 // const OFFSET: u16 = GUTTERS.iter().map(|(_, width)| *width as u16).sum();
+    use crate::document::Document;
     use crate::editor::GutterType;
 
     #[test]
@@ -379,45 +367,45 @@ mod tests {
         );
         view.area = Rect::new(40, 40, 40, 40);
         let rope = Rope::from_str("abc\n\tdef");
-        let text = rope.slice(..);
+        let doc = Document::from(rope, None);
 
-        assert_eq!(view.text_pos_at_screen_coords(&text, 40, 2, 4), None);
+        assert_eq!(view.text_pos_at_screen_coords(&doc, 40, 2, 4), None);
 
-        assert_eq!(view.text_pos_at_screen_coords(&text, 40, 41, 4), None);
+        assert_eq!(view.text_pos_at_screen_coords(&doc, 40, 41, 4), None);
 
-        assert_eq!(view.text_pos_at_screen_coords(&text, 0, 2, 4), None);
+        assert_eq!(view.text_pos_at_screen_coords(&doc, 0, 2, 4), None);
 
-        assert_eq!(view.text_pos_at_screen_coords(&text, 0, 49, 4), None);
+        assert_eq!(view.text_pos_at_screen_coords(&doc, 0, 49, 4), None);
 
-        assert_eq!(view.text_pos_at_screen_coords(&text, 0, 41, 4), None);
+        assert_eq!(view.text_pos_at_screen_coords(&doc, 0, 41, 4), None);
 
-        assert_eq!(view.text_pos_at_screen_coords(&text, 40, 81, 4), None);
+        assert_eq!(view.text_pos_at_screen_coords(&doc, 40, 81, 4), None);
 
-        assert_eq!(view.text_pos_at_screen_coords(&text, 78, 41, 4), None);
+        assert_eq!(view.text_pos_at_screen_coords(&doc, 78, 41, 4), None);
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 3, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 3, 4),
             Some(3)
         );
 
-        assert_eq!(view.text_pos_at_screen_coords(&text, 40, 80, 4), Some(3));
+        assert_eq!(view.text_pos_at_screen_coords(&doc, 40, 80, 4), Some(3));
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 41, 40 + OFFSET + 1, 4),
+            view.text_pos_at_screen_coords(&doc, 41, 40 + OFFSET + 1, 4),
             Some(4)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 41, 40 + OFFSET + 4, 4),
+            view.text_pos_at_screen_coords(&doc, 41, 40 + OFFSET + 4, 4),
             Some(5)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 41, 40 + OFFSET + 7, 4),
+            view.text_pos_at_screen_coords(&doc, 41, 40 + OFFSET + 7, 4),
             Some(8)
         );
 
-        assert_eq!(view.text_pos_at_screen_coords(&text, 41, 80, 4), Some(8));
+        assert_eq!(view.text_pos_at_screen_coords(&doc, 41, 80, 4), Some(8));
     }
 
     #[test]
@@ -425,9 +413,9 @@ mod tests {
         let mut view = View::new(DocumentId::default(), vec![GutterType::Diagnostics]);
         view.area = Rect::new(40, 40, 40, 40);
         let rope = Rope::from_str("abc\n\tdef");
-        let text = rope.slice(..);
+        let doc = Document::from(rope, None);
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 41, 40 + OFFSET_WITHOUT_LINE_NUMBERS + 1, 4),
+            view.text_pos_at_screen_coords(&doc, 41, 40 + OFFSET_WITHOUT_LINE_NUMBERS + 1, 4),
             Some(4)
         );
     }
@@ -437,11 +425,8 @@ mod tests {
         let mut view = View::new(DocumentId::default(), vec![]);
         view.area = Rect::new(40, 40, 40, 40);
         let rope = Rope::from_str("abc\n\tdef");
-        let text = rope.slice(..);
-        assert_eq!(
-            view.text_pos_at_screen_coords(&text, 41, 40 + 1, 4),
-            Some(4)
-        );
+        let doc = Document::from(rope, None);
+        assert_eq!(view.text_pos_at_screen_coords(&doc, 41, 40 + 1, 4), Some(4));
     }
 
     #[test]
@@ -452,34 +437,34 @@ mod tests {
         );
         view.area = Rect::new(40, 40, 40, 40);
         let rope = Rope::from_str("Hi! こんにちは皆さん");
-        let text = rope.slice(..);
+        let doc = Document::from(rope, None);
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET, 4),
             Some(0)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 4, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 4, 4),
             Some(4)
         );
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 5, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 5, 4),
             Some(4)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 6, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 6, 4),
             Some(5)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 7, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 7, 4),
             Some(5)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 8, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 8, 4),
             Some(6)
         );
     }
@@ -492,30 +477,30 @@ mod tests {
         );
         view.area = Rect::new(40, 40, 40, 40);
         let rope = Rope::from_str("Hèl̀l̀ò world!");
-        let text = rope.slice(..);
+        let doc = Document::from(rope, None);
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET, 4),
             Some(0)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 1, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 1, 4),
             Some(1)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 2, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 2, 4),
             Some(3)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 3, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 3, 4),
             Some(5)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&text, 40, 40 + OFFSET + 4, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 4, 4),
             Some(7)
         );
     }

From cd8bbbc0443554125d375ec764d174c68f3ac710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 8 Nov 2022 21:48:56 +0900
Subject: [PATCH 455/884] fix tests

---
 helix-core/src/transaction.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-core/src/transaction.rs b/helix-core/src/transaction.rs
index daf4a77e..2f9eb090 100644
--- a/helix-core/src/transaction.rs
+++ b/helix-core/src/transaction.rs
@@ -577,7 +577,7 @@ impl<'a> Iterator for ChangeIterator<'a> {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::State;
+    use crate::history::State;
 
     #[test]
     fn composition() {

From bb303cf41d5bd02641bf436e07b08bd4ae5418de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 8 Nov 2022 22:20:32 +0900
Subject: [PATCH 456/884] fix tests

---
 helix-core/src/transaction.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/helix-core/src/transaction.rs b/helix-core/src/transaction.rs
index 2f9eb090..3fb39413 100644
--- a/helix-core/src/transaction.rs
+++ b/helix-core/src/transaction.rs
@@ -704,7 +704,10 @@ mod test {
 
     #[test]
     fn optimized_composition() {
-        let mut state = State::new("".into());
+        let mut state = State {
+            doc: "".into(),
+            selection: Selection::point(0),
+        };
         let t1 = Transaction::insert(&state.doc, &state.selection, Tendril::from("h"));
         t1.apply(&mut state.doc);
         state.selection = state.selection.clone().map(t1.changes());

From 64359f8b484062e8c17b02fd2b2d690bb5bdfbd7 Mon Sep 17 00:00:00 2001
From: Max Hille <mh@lambdasoup.com>
Date: Tue, 8 Nov 2022 14:50:17 +0100
Subject: [PATCH 457/884] bash completion: use builtin filenames option (#4648)

Use a builtin bash option which detects filenames in completion outputs
and reflects this in sensible <tab> completion behaviour.
---
 contrib/completion/hx.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/completion/hx.bash b/contrib/completion/hx.bash
index 89f3283c..01b42deb 100644
--- a/contrib/completion/hx.bash
+++ b/contrib/completion/hx.bash
@@ -19,5 +19,5 @@ _hx() {
 		COMPREPLY=($(compgen -fd -W "-h --help --tutor -V --version -v -vv -vvv --health -g --grammar --vsplit --hsplit -c --config --log" -- $2))
 		;;
 	esac
-} && complete -F _hx hx
+} && complete -o filenames -F _hx hx
 

From 75d7e0555e4993d021f212b6a9297ff04a937fc3 Mon Sep 17 00:00:00 2001
From: 0xflotus <0xflotus@gmail.com>
Date: Tue, 8 Nov 2022 15:29:48 +0100
Subject: [PATCH 458/884] fix: small error (#4651)

---
 README.md           | 2 +-
 book/src/install.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d09bbad5..c1953a7c 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ config directory (for example `~/.config/helix/runtime` on Linux/macOS, or `%App
 | Linux / MacOS        | `ln -s $PWD/runtime ~/.config/helix/runtime`     |
 
 Starting with Windows Vista you can also create symbolic links on Windows. Note that this requires
-elevated priviliges - i.e. PowerShell or Cmd must be run as administrator.
+elevated privileges - i.e. PowerShell or Cmd must be run as administrator.
 
 **PowerShell:**
 
diff --git a/book/src/install.md b/book/src/install.md
index a041d651..ccfb0b1e 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -106,7 +106,7 @@ via the `HELIX_RUNTIME` environment variable.
 | Linux / MacOS        | `ln -s $PWD/runtime ~/.config/helix/runtime`     |
 
 Starting with Windows Vista you can also create symbolic links on Windows. Note that this requires
-elevated priviliges - i.e. PowerShell or Cmd must be run as administrator.
+elevated privileges - i.e. PowerShell or Cmd must be run as administrator.
 
 **PowerShell:**
 

From 0c30aeea5b6ba3c8b6b72b8a92cd319b4db44510 Mon Sep 17 00:00:00 2001
From: Zhizhen He <hezhizhen.yi@gmail.com>
Date: Wed, 9 Nov 2022 01:02:49 +0800
Subject: [PATCH 459/884] fix typo (#4656)

---
 README.md           | 6 +++---
 book/src/install.md | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index c1953a7c..c1f30218 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ config directory (for example `~/.config/helix/runtime` on Linux/macOS, or `%App
 | -------------------- | ------------------------------------------------ |
 | Windows (Cmd)        | `xcopy /e /i runtime %AppData%\helix\runtime`    |
 | Windows (PowerShell) | `xcopy /e /i runtime $Env:AppData\helix\runtime` |
-| Linux / MacOS        | `ln -s $PWD/runtime ~/.config/helix/runtime`     |
+| Linux / macOS        | `ln -s $PWD/runtime ~/.config/helix/runtime`     |
 
 Starting with Windows Vista you can also create symbolic links on Windows. Note that this requires
 elevated privileges - i.e. PowerShell or Cmd must be run as administrator.
@@ -109,9 +109,9 @@ sed -i "s|Terminal=true|Terminal=false|g" ~/.local/share/applications/Helix.desk
 
 Please note: there is no icon for Helix yet, so the system default will be used.
 
-## MacOS
+## macOS
 
-Helix can be installed on MacOS through homebrew:
+Helix can be installed on macOS through homebrew:
 
 ```
 brew install helix
diff --git a/book/src/install.md b/book/src/install.md
index ccfb0b1e..44f13584 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -103,7 +103,7 @@ via the `HELIX_RUNTIME` environment variable.
 | -------------------- | ------------------------------------------------ |
 | Windows (Cmd)        | `xcopy /e /i runtime %AppData%\helix\runtime`    |
 | Windows (PowerShell) | `xcopy /e /i runtime $Env:AppData\helix\runtime` |
-| Linux / MacOS        | `ln -s $PWD/runtime ~/.config/helix/runtime`     |
+| Linux / macOS        | `ln -s $PWD/runtime ~/.config/helix/runtime`     |
 
 Starting with Windows Vista you can also create symbolic links on Windows. Note that this requires
 elevated privileges - i.e. PowerShell or Cmd must be run as administrator.

From d8e9c85f5ec10433eb17f8f240e08e765a218cfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Klobu=C4=8Dar=20Ledin=C5=A1=C4=87ak?=
 <mrqoqlobo@gmail.com>
Date: Tue, 8 Nov 2022 19:36:01 +0100
Subject: [PATCH 460/884] `error!` on unknown `CompletionItemKind` (#4658)

---
 helix-term/src/ui/completion.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 5ec8cf89..545b19d8 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -66,7 +66,10 @@ impl menu::Item for CompletionItem {
                 Some(lsp::CompletionItemKind::EVENT) => "event",
                 Some(lsp::CompletionItemKind::OPERATOR) => "operator",
                 Some(lsp::CompletionItemKind::TYPE_PARAMETER) => "type_param",
-                Some(kind) => unimplemented!("{:?}", kind),
+                Some(kind) => {
+                    log::error!("Received unknown completion item kind: {:?}", kind);
+                    ""
+                }
                 None => "",
             }),
             // self.detail.as_deref().unwrap_or("")

From 07d31572734dedfd850d9d978fafe80278a88a3d Mon Sep 17 00:00:00 2001
From: Anton Romanov <theli.ua@gmail.com>
Date: Tue, 8 Nov 2022 11:41:09 -0800
Subject: [PATCH 461/884] [rust highlights] fix scoped attribute macro matching
 (#4659)

Without this scoped attribute macros are not matched as macros.
Eg
```
  #[path::macro]
```
---
 runtime/queries/rust/highlights.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm
index 0afb8388..42fc9681 100644
--- a/runtime/queries/rust/highlights.scm
+++ b/runtime/queries/rust/highlights.scm
@@ -274,7 +274,11 @@
 (meta_item
   (identifier) @function.macro)
 (attr_item
-  (identifier) @function.macro
+  [
+    (identifier) @function.macro
+    (scoped_identifier
+      name: (identifier) @function.macro)
+  ]
   (token_tree (identifier) @function.macro)?)
 
 (inner_attribute_item) @attribute

From a19eee6450764ec2be0e8ad25582f33bd68a5d8c Mon Sep 17 00:00:00 2001
From: Kirawi <67773714+kirawi@users.noreply.github.com>
Date: Tue, 8 Nov 2022 16:06:27 -0500
Subject: [PATCH 462/884] Update `dark_plus` diff colors (#4661)

---
 runtime/themes/dark_plus.toml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/runtime/themes/dark_plus.toml b/runtime/themes/dark_plus.toml
index fbb58e64..305117c6 100644
--- a/runtime/themes/dark_plus.toml
+++ b/runtime/themes/dark_plus.toml
@@ -49,9 +49,9 @@
 "markup.quote" = "dark_green"
 "markup.raw" = "orange"
 
-"diff.plus" = { fg = "pale_green" }
-"diff.delta" = { fg = "gold" }
-"diff.minus" = { fg = "red" }
+"diff.plus" = { fg = "dark_green2" }
+"diff.delta" = { fg = "blue4" }
+"diff.minus" = { fg = "orange_red" }
 
 "ui.background" = { fg = "light_gray", bg = "dark_gray2" }
 
@@ -102,6 +102,7 @@ gold = "#d7ba7d"
 gold2 = "#cca700"
 pale_green = "#b5cea8"
 dark_green = "#6A9955"
+dark_green2 = "#487e02"
 light_gray = "#d4d4d4"
 light_gray2 = "#c6c6c6"
 light_gray3 = "#eeeeee"
@@ -112,10 +113,12 @@ dark_gray4 = "#404040"
 blue = "#007acc"
 blue2 = "#569CD6"
 blue3 = "#6796E6"
+blue4 = "#1b81a8"
 light_blue = "#75beff"
 dark_blue = "#264f78"
 dark_blue2 = "#094771"
 red = "#ff1212"
+orange_red = "#f14c4c"
 
 type = "#4EC9B0"
 special = "#C586C0"

From 260ae3a0f4b94eb0af3477c3e7b94b7a0033431c Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 8 Nov 2022 18:54:41 -0600
Subject: [PATCH 463/884] style: Only call extend_nodes when deepest_preceding
 is Some

---
 helix-core/src/indent.rs | 100 +++++++++++++++++++--------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index 9526fc8a..1c813c9a 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -461,60 +461,58 @@ fn query_indents(
 /// so that the indent computation starts with the correct syntax node.
 fn extend_nodes<'a>(
     node: &mut Node<'a>,
-    deepest_preceding: Option<Node<'a>>,
+    mut deepest_preceding: Node<'a>,
     extend_captures: &HashMap<usize, Vec<ExtendCapture>>,
     text: RopeSlice,
     line: usize,
     tab_width: usize,
 ) {
-    if let Some(mut deepest_preceding) = deepest_preceding {
-        let mut stop_extend = false;
-        while deepest_preceding != *node {
-            let mut extend_node = false;
-            // This will be set to true if this node is captured, regardless of whether
-            // it actually will be extended (e.g. because the cursor isn't indented
-            // more than the node).
-            let mut node_captured = false;
-            if let Some(captures) = extend_captures.get(&deepest_preceding.id()) {
-                for capture in captures {
-                    match capture {
-                        ExtendCapture::PreventOnce => {
-                            stop_extend = true;
-                        }
-                        ExtendCapture::Extend => {
-                            node_captured = true;
-                            // We extend the node if
-                            // - the cursor is on the same line as the end of the node OR
-                            // - the line that the cursor is on is more indented than the
-                            //   first line of the node
-                            if deepest_preceding.end_position().row == line {
+    let mut stop_extend = false;
+
+    while deepest_preceding != *node {
+        let mut extend_node = false;
+        // This will be set to true if this node is captured, regardless of whether
+        // it actually will be extended (e.g. because the cursor isn't indented
+        // more than the node).
+        let mut node_captured = false;
+        if let Some(captures) = extend_captures.get(&deepest_preceding.id()) {
+            for capture in captures {
+                match capture {
+                    ExtendCapture::PreventOnce => {
+                        stop_extend = true;
+                    }
+                    ExtendCapture::Extend => {
+                        node_captured = true;
+                        // We extend the node if
+                        // - the cursor is on the same line as the end of the node OR
+                        // - the line that the cursor is on is more indented than the
+                        //   first line of the node
+                        if deepest_preceding.end_position().row == line {
+                            extend_node = true;
+                        } else {
+                            let cursor_indent = indent_level_for_line(text.line(line), tab_width);
+                            let node_indent = indent_level_for_line(
+                                text.line(deepest_preceding.start_position().row),
+                                tab_width,
+                            );
+                            if cursor_indent > node_indent {
                                 extend_node = true;
-                            } else {
-                                let cursor_indent =
-                                    indent_level_for_line(text.line(line), tab_width);
-                                let node_indent = indent_level_for_line(
-                                    text.line(deepest_preceding.start_position().row),
-                                    tab_width,
-                                );
-                                if cursor_indent > node_indent {
-                                    extend_node = true;
-                                }
                             }
                         }
                     }
                 }
             }
-            // If we encountered some `StopExtend` capture before, we don't
-            // extend the node even if we otherwise would
-            if node_captured && stop_extend {
-                stop_extend = false;
-            } else if extend_node && !stop_extend {
-                *node = deepest_preceding;
-                break;
-            }
-            // This parent always exists since node is an ancestor of deepest_preceding
-            deepest_preceding = deepest_preceding.parent().unwrap();
         }
+        // If we encountered some `StopExtend` capture before, we don't
+        // extend the node even if we otherwise would
+        if node_captured && stop_extend {
+            stop_extend = false;
+        } else if extend_node && !stop_extend {
+            *node = deepest_preceding;
+            break;
+        }
+        // This parent always exists since node is an ancestor of deepest_preceding
+        deepest_preceding = deepest_preceding.parent().unwrap();
     }
 }
 
@@ -612,14 +610,16 @@ pub fn treesitter_indent_for_pos(
     let extend_captures = query_result.extend_captures;
 
     // Check for extend captures, potentially changing the node that the indent calculation starts with
-    extend_nodes(
-        &mut node,
-        deepest_preceding,
-        &extend_captures,
-        text,
-        line,
-        tab_width,
-    );
+    if let Some(deepest_preceding) = deepest_preceding {
+        extend_nodes(
+            &mut node,
+            deepest_preceding,
+            &extend_captures,
+            text,
+            line,
+            tab_width,
+        );
+    }
     let mut first_in_line = get_first_in_line(node, new_line.then(|| byte_pos));
 
     let mut result = Indentation::default();

From 3e84434c695379dd2b56415c5cec46990488d007 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 8 Nov 2022 18:58:27 -0600
Subject: [PATCH 464/884] Fix panic from indenting on tree with errors

`deepest_preceding` is known to be a descendant of `node`. Repeated
calls of `Node::parent` _should_ eventually turn `deepest_preceding`
into `node`, but when the node is errored (the tree contains a syntax
error), `Node::parent` returns None.

In the typescript case:

    if(true) &&true
    //      ^ press enter here

The tree is:

    (program [0, 0] - [1, 0]
      (if_statement [0, 0] - [0, 15]
        condition: (parenthesized_expression [0, 2] - [0, 8]
          (true [0, 3] - [0, 7]))
        consequence: (expression_statement [0, 8] - [0, 15]
          (binary_expression [0, 8] - [0, 15]
            left: (identifier [0, 8] - [0, 8])
            right: (true [0, 11] - [0, 15])))))

`node` is the `program` node and `deepest_preceding` is the
`binary_expression`. The tree is errored on the `binary_expression`
node with `(MISSING identifier [0, 8] - [0, 8])`.

In the C++ case:

    ; <<
    // press enter after the ';'

The tree is:

    (translation_unit [0, 0] - [1, 0]
      (expression_statement [0, 0] - [0, 1])
      (ERROR [0, 1] - [0, 4]
        (identifier [0, 1] - [0, 1])))

`node` is the `translation_unit` and `deepest_preceding` is the `ERROR`
node.

In both cases, `Node::parent` on the errored node returns None.
---
 helix-core/src/indent.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index 1c813c9a..d6aa5edb 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -511,8 +511,12 @@ fn extend_nodes<'a>(
             *node = deepest_preceding;
             break;
         }
-        // This parent always exists since node is an ancestor of deepest_preceding
-        deepest_preceding = deepest_preceding.parent().unwrap();
+        // If the tree contains a syntax error, `deepest_preceding` may not
+        // have a parent despite being a descendant of `node`.
+        deepest_preceding = match deepest_preceding.parent() {
+            Some(parent) => parent,
+            None => return,
+        }
     }
 }
 

From dee5b2a983f6a334753be48730868e8dd651b505 Mon Sep 17 00:00:00 2001
From: Matthias Deiml <matthias@deiml.net>
Date: Wed, 9 Nov 2022 10:17:09 +0100
Subject: [PATCH 465/884] Add LSP workspace command picker (#3140)

* Add workspace command picker

* Make command typable

* Add optional argument to lsp-workspace-command
---
 book/src/generated/typable-cmd.md |  1 +
 helix-lsp/src/client.rs           |  3 ++
 helix-term/src/commands/lsp.rs    |  8 ++++
 helix-term/src/commands/typed.rs  | 78 +++++++++++++++++++++++++++++++
 helix-term/src/ui/mod.rs          | 39 ++++++++++++++++
 5 files changed, 129 insertions(+)

diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index f858ba72..b7496d33 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -45,6 +45,7 @@
 | `:encoding` | Set encoding. Based on `https://encoding.spec.whatwg.org`. |
 | `:reload` | Discard changes and reload from the source file. |
 | `:update` | Write changes only if the file has been modified. |
+| `:lsp-workspace-command` | Open workspace command picker |
 | `:lsp-restart` | Restarts the Language Server that is in use by the current doc |
 | `:tree-sitter-scopes` | Display tree sitter scopes, primarily for theming and development. |
 | `:debug-start`, `:dbg` | Start a debug session from a given template with given parameters. |
diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 81b7d8ad..50c4b87f 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -298,6 +298,9 @@ impl Client {
                         dynamic_registration: Some(false),
                         ..Default::default()
                     }),
+                    execute_command: Some(lsp::DynamicRegistrationClientCapabilities {
+                        dynamic_registration: Some(false),
+                    }),
                     ..Default::default()
                 }),
                 text_document: Some(lsp::TextDocumentClientCapabilities {
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 5498fc83..c149e62b 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -603,6 +603,14 @@ pub fn code_action(cx: &mut Context) {
         },
     )
 }
+
+impl ui::menu::Item for lsp::Command {
+    type Data = ();
+    fn label(&self, _data: &Self::Data) -> Spans {
+        self.title.as_str().into()
+    }
+}
+
 pub fn execute_lsp_command(editor: &mut Editor, cmd: lsp::Command) {
     let doc = doc!(editor);
     let language_server = language_server!(editor, doc);
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 2f387bfd..c6810f05 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1052,6 +1052,77 @@ fn update(
     }
 }
 
+fn lsp_workspace_command(
+    cx: &mut compositor::Context,
+    args: &[Cow<str>],
+    event: PromptEvent,
+) -> anyhow::Result<()> {
+    if event != PromptEvent::Validate {
+        return Ok(());
+    }
+
+    let (_, doc) = current!(cx.editor);
+
+    let language_server = match doc.language_server() {
+        Some(language_server) => language_server,
+        None => {
+            cx.editor
+                .set_status("Language server not active for current buffer");
+            return Ok(());
+        }
+    };
+
+    let options = match &language_server.capabilities().execute_command_provider {
+        Some(options) => options,
+        None => {
+            cx.editor
+                .set_status("Workspace commands are not supported for this language server");
+            return Ok(());
+        }
+    };
+    if args.is_empty() {
+        let commands = options
+            .commands
+            .iter()
+            .map(|command| helix_lsp::lsp::Command {
+                title: command.clone(),
+                command: command.clone(),
+                arguments: None,
+            })
+            .collect::<Vec<_>>();
+        let callback = async move {
+            let call: job::Callback = Callback::EditorCompositor(Box::new(
+                move |_editor: &mut Editor, compositor: &mut Compositor| {
+                    let picker = ui::Picker::new(commands, (), |cx, command, _action| {
+                        execute_lsp_command(cx.editor, command.clone());
+                    });
+                    compositor.push(Box::new(overlayed(picker)))
+                },
+            ));
+            Ok(call)
+        };
+        cx.jobs.callback(callback);
+    } else {
+        let command = args.join(" ");
+        if options.commands.iter().any(|c| c == &command) {
+            execute_lsp_command(
+                cx.editor,
+                helix_lsp::lsp::Command {
+                    title: command.clone(),
+                    arguments: None,
+                    command,
+                },
+            );
+        } else {
+            cx.editor.set_status(format!(
+                "`{command}` is not supported for this language server"
+            ));
+            return Ok(());
+        }
+    }
+    Ok(())
+}
+
 fn lsp_restart(
     cx: &mut compositor::Context,
     _args: &[Cow<str>],
@@ -1987,6 +2058,13 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
             fun: update,
             completer: None,
         },
+        TypableCommand {
+            name: "lsp-workspace-command",
+            aliases: &[],
+            doc: "Open workspace command picker",
+            fun: lsp_workspace_command,
+            completer: Some(completers::lsp_workspace_command),
+        },
         TypableCommand {
             name: "lsp-restart",
             aliases: &[],
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index f99dea0b..cca9e9bf 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -390,6 +390,45 @@ pub mod completers {
             .collect()
     }
 
+    pub fn lsp_workspace_command(editor: &Editor, input: &str) -> Vec<Completion> {
+        let matcher = Matcher::default();
+
+        let (_, doc) = current_ref!(editor);
+
+        let language_server = match doc.language_server() {
+            Some(language_server) => language_server,
+            None => {
+                return vec![];
+            }
+        };
+
+        let options = match &language_server.capabilities().execute_command_provider {
+            Some(options) => options,
+            None => {
+                return vec![];
+            }
+        };
+
+        let mut matches: Vec<_> = options
+            .commands
+            .iter()
+            .filter_map(|command| {
+                matcher
+                    .fuzzy_match(command, input)
+                    .map(|score| (command, score))
+            })
+            .collect();
+
+        matches.sort_unstable_by(|(command1, score1), (command2, score2)| {
+            (Reverse(*score1), command1).cmp(&(Reverse(*score2), command2))
+        });
+
+        matches
+            .into_iter()
+            .map(|(command, _score)| ((0..), command.clone().into()))
+            .collect()
+    }
+
     pub fn directory(editor: &Editor, input: &str) -> Vec<Completion> {
         filename_impl(editor, input, |entry| {
             let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());

From d4f5cab7b53d4e10cc1907156876441744eff646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 8 Nov 2022 23:15:38 +0900
Subject: [PATCH 466/884] Re-enable format_selections for a single selection
 range

---
 helix-term/src/commands.rs | 49 +++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 4e3c321c..7e4969c1 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3748,7 +3748,7 @@ fn format_selections(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
 
     // via lsp if available
-    // else via tree-sitter indentation calculations
+    // TODO: else via tree-sitter indentation calculations
 
     let language_server = match doc.language_server() {
         Some(language_server) => language_server,
@@ -3761,33 +3761,34 @@ fn format_selections(cx: &mut Context) {
         .map(|range| range_to_lsp_range(doc.text(), *range, language_server.offset_encoding()))
         .collect();
 
-    // TODO: all of the TODO's and commented code inside the loop,
-    // to make this actually work.
-    for _range in ranges {
-        let _language_server = match doc.language_server() {
-            Some(language_server) => language_server,
-            None => return,
-        };
-        // TODO: handle fails
-        // TODO: concurrent map
+    if ranges.len() != 1 {
+        cx.editor
+            .set_error("format_selections only supports a single selection for now");
+        return;
+    }
 
-        // TODO: need to block to get the formatting
+    // TODO: handle fails
+    // TODO: concurrent map over all ranges
 
-        // let edits = block_on(language_server.text_document_range_formatting(
-        //     doc.identifier(),
-        //     range,
-        //     lsp::FormattingOptions::default(),
-        // ))
-        // .unwrap_or_default();
+    let range = ranges[0];
 
-        // let transaction = helix_lsp::util::generate_transaction_from_edits(
-        //     doc.text(),
-        //     edits,
-        //     language_server.offset_encoding(),
-        // );
+    let edits = tokio::task::block_in_place(|| {
+        helix_lsp::block_on(language_server.text_document_range_formatting(
+            doc.identifier(),
+            range,
+            lsp::FormattingOptions::default(),
+            None,
+        ))
+    })
+    .unwrap_or_default();
 
-        // apply_transaction(&transaction, doc, view);
-    }
+    let transaction = helix_lsp::util::generate_transaction_from_edits(
+        doc.text(),
+        edits,
+        language_server.offset_encoding(),
+    );
+
+    apply_transaction(&transaction, doc, view);
 }
 
 fn join_selections_inner(cx: &mut Context, select_space: bool) {

From b2e7171fedd501f2d804f95ed7eaf476d5e352ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 29 Mar 2022 09:57:12 +0900
Subject: [PATCH 467/884] Drop terminal interaction in compositor.size()

---
 helix-term/src/compositor.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs
index 971dc52d..ad1a29ab 100644
--- a/helix-term/src/compositor.rs
+++ b/helix-term/src/compositor.rs
@@ -93,6 +93,7 @@ type Terminal = tui::terminal::Terminal<TestBackend>;
 pub struct Compositor {
     layers: Vec<Box<dyn Component>>,
     terminal: Terminal,
+    area: Rect,
 
     pub(crate) last_picker: Option<Box<dyn Component>>,
 }
@@ -106,21 +107,25 @@ impl Compositor {
         let backend = TestBackend::new(120, 150);
 
         let terminal = Terminal::new(backend).context("build terminal")?;
+        let area = terminal.size().expect("couldn't get terminal size");
         Ok(Self {
             layers: Vec::new(),
+            area,
             terminal,
             last_picker: None,
         })
     }
 
     pub fn size(&self) -> Rect {
-        self.terminal.size().expect("couldn't get terminal size")
+        self.area
     }
 
     pub fn resize(&mut self, width: u16, height: u16) {
         self.terminal
             .resize(Rect::new(0, 0, width, height))
-            .expect("Unable to resize terminal")
+            .expect("Unable to resize terminal");
+
+        self.area = self.terminal.size().expect("couldn't get terminal size");
     }
 
     pub fn save_cursor(&mut self) {

From 00d7b1809714b82f24542f5b9099649e10d5a0b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 29 Mar 2022 10:01:02 +0900
Subject: [PATCH 468/884] This term specific behavior really doesn't belong to
 compositor

---
 helix-term/src/application.rs | 16 ++++++++++++++--
 helix-term/src/compositor.rs  | 18 +-----------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index e356c1f9..19eb2e5c 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -395,7 +395,6 @@ impl Application {
         use helix_view::graphics::Rect;
         match signal {
             signal::SIGTSTP => {
-                self.compositor.save_cursor();
                 restore_term().unwrap();
                 low_level::emulate_default_handler(signal::SIGTSTP).unwrap();
             }
@@ -404,7 +403,6 @@ impl Application {
                 // redraw the terminal
                 let Rect { width, height, .. } = self.compositor.size();
                 self.compositor.resize(width, height);
-                self.compositor.load_cursor();
                 self.render();
             }
             signal::SIGUSR1 => {
@@ -924,7 +922,12 @@ impl Application {
     }
 
     async fn claim_term(&mut self) -> Result<(), Error> {
+        use helix_view::graphics::CursorKind;
+        use tui::backend::Backend;
         terminal::enable_raw_mode()?;
+        if self.compositor.terminal.cursor_kind() == CursorKind::Hidden {
+            self.compositor.terminal.backend_mut().hide_cursor().ok();
+        }
         let mut stdout = stdout();
         execute!(
             stdout,
@@ -958,6 +961,15 @@ impl Application {
         self.event_loop(input_stream).await;
 
         let close_errs = self.close().await;
+
+        use helix_view::graphics::CursorKind;
+        use tui::backend::Backend;
+        self.compositor
+            .terminal
+            .backend_mut()
+            .show_cursor(CursorKind::Block)
+            .ok();
+
         restore_term()?;
 
         for err in close_errs {
diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs
index ad1a29ab..1452d31f 100644
--- a/helix-term/src/compositor.rs
+++ b/helix-term/src/compositor.rs
@@ -76,7 +76,6 @@ pub trait Component: Any + AnyComponent {
 }
 
 use anyhow::Context as AnyhowContext;
-use tui::backend::Backend;
 
 #[cfg(not(feature = "integration"))]
 use tui::backend::CrosstermBackend;
@@ -92,7 +91,7 @@ type Terminal = tui::terminal::Terminal<TestBackend>;
 
 pub struct Compositor {
     layers: Vec<Box<dyn Component>>,
-    terminal: Terminal,
+    pub terminal: Terminal,
     area: Rect,
 
     pub(crate) last_picker: Option<Box<dyn Component>>,
@@ -128,21 +127,6 @@ impl Compositor {
         self.area = self.terminal.size().expect("couldn't get terminal size");
     }
 
-    pub fn save_cursor(&mut self) {
-        if self.terminal.cursor_kind() == CursorKind::Hidden {
-            self.terminal
-                .backend_mut()
-                .show_cursor(CursorKind::Block)
-                .ok();
-        }
-    }
-
-    pub fn load_cursor(&mut self) {
-        if self.terminal.cursor_kind() == CursorKind::Hidden {
-            self.terminal.backend_mut().hide_cursor().ok();
-        }
-    }
-
     pub fn push(&mut self, mut layer: Box<dyn Component>) {
         let size = self.size();
         // trigger required_size on init

From 264a455c18f765b04c31a613ccc336dd893c4cbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 29 Mar 2022 10:11:44 +0900
Subject: [PATCH 469/884] Move terminal out of compositor

---
 helix-term/src/application.rs | 75 +++++++++++++++++++++++++++--------
 helix-term/src/compositor.rs  | 55 +++----------------------
 2 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 19eb2e5c..433104dc 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -10,11 +10,13 @@ use helix_view::{
     align_view,
     document::DocumentSavedEventResult,
     editor::{ConfigEvent, EditorEvent},
+    graphics::Rect,
     theme,
     tree::Layout,
     Align, Editor,
 };
 use serde_json::json;
+use tui::backend::Backend;
 
 use crate::{
     args::Args,
@@ -53,8 +55,18 @@ type Signals = futures_util::stream::Empty<()>;
 
 const LSP_DEADLINE: Duration = Duration::from_millis(16);
 
+#[cfg(not(feature = "integration"))]
+use tui::backend::CrosstermBackend;
+
+#[cfg(not(feature = "integration"))]
+type Terminal = tui::terminal::Terminal<CrosstermBackend<std::io::Stdout>>;
+
+#[cfg(feature = "integration")]
+type Terminal = tui::terminal::Terminal<TestBackend>;
+
 pub struct Application {
     compositor: Compositor,
+    terminal: Terminal,
     pub editor: Editor,
 
     config: Arc<ArcSwap<Config>>,
@@ -143,10 +155,18 @@ impl Application {
 
         let syn_loader = std::sync::Arc::new(syntax::Loader::new(syn_loader_conf));
 
-        let mut compositor = Compositor::new().context("build compositor")?;
+        #[cfg(not(feature = "integration"))]
+        let backend = CrosstermBackend::new(stdout());
+
+        #[cfg(feature = "integration")]
+        let backend = TestBackend::new(120, 150);
+
+        let terminal = Terminal::new(backend)?;
+        let area = terminal.size().expect("couldn't get terminal size");
+        let mut compositor = Compositor::new(area);
         let config = Arc::new(ArcSwap::from_pointee(config));
         let mut editor = Editor::new(
-            compositor.size(),
+            area,
             theme_loader.clone(),
             syn_loader.clone(),
             Box::new(Map::new(Arc::clone(&config), |config: &Config| {
@@ -233,6 +253,7 @@ impl Application {
 
         let app = Self {
             compositor,
+            terminal,
             editor,
 
             config,
@@ -254,15 +275,26 @@ impl Application {
 
     #[cfg(not(feature = "integration"))]
     fn render(&mut self) {
-        let compositor = &mut self.compositor;
-
         let mut cx = crate::compositor::Context {
             editor: &mut self.editor,
             jobs: &mut self.jobs,
             scroll: None,
         };
 
-        compositor.render(&mut cx);
+        let area = self
+            .terminal
+            .autoresize()
+            .expect("Unable to determine terminal size");
+
+        // TODO: need to recalculate view tree if necessary
+
+        let surface = self.terminal.current_buffer_mut();
+
+        self.compositor.render(area, surface, &mut cx);
+
+        let (pos, kind) = self.compositor.cursor(area, &self.editor);
+        let pos = pos.map(|pos| (pos.col as u16, pos.row as u16));
+        self.terminal.draw(pos, kind).unwrap();
     }
 
     pub async fn event_loop<S>(&mut self, input_stream: &mut S)
@@ -392,17 +424,24 @@ impl Application {
 
     #[cfg(not(windows))]
     pub async fn handle_signals(&mut self, signal: i32) {
-        use helix_view::graphics::Rect;
         match signal {
             signal::SIGTSTP => {
+                // restore cursor
+                use helix_view::graphics::CursorKind;
+                self.terminal
+                    .backend_mut()
+                    .show_cursor(CursorKind::Block)
+                    .ok();
                 restore_term().unwrap();
                 low_level::emulate_default_handler(signal::SIGTSTP).unwrap();
             }
             signal::SIGCONT => {
                 self.claim_term().await.unwrap();
                 // redraw the terminal
-                let Rect { width, height, .. } = self.compositor.size();
-                self.compositor.resize(width, height);
+                let area = self.terminal.size().expect("couldn't get terminal size");
+                self.compositor.resize(area);
+                self.terminal.clear().expect("couldn't clear terminal");
+
                 self.render();
             }
             signal::SIGUSR1 => {
@@ -539,7 +578,14 @@ impl Application {
         // Handle key events
         let should_redraw = match event.unwrap() {
             CrosstermEvent::Resize(width, height) => {
-                self.compositor.resize(width, height);
+                self.terminal
+                    .resize(Rect::new(0, 0, width, height))
+                    .expect("Unable to resize terminal");
+
+                let area = self.terminal.size().expect("couldn't get terminal size");
+
+                self.compositor.resize(area);
+
                 self.compositor
                     .handle_event(&Event::Resize(width, height), &mut cx)
             }
@@ -923,10 +969,9 @@ impl Application {
 
     async fn claim_term(&mut self) -> Result<(), Error> {
         use helix_view::graphics::CursorKind;
-        use tui::backend::Backend;
         terminal::enable_raw_mode()?;
-        if self.compositor.terminal.cursor_kind() == CursorKind::Hidden {
-            self.compositor.terminal.backend_mut().hide_cursor().ok();
+        if self.terminal.cursor_kind() == CursorKind::Hidden {
+            self.terminal.backend_mut().hide_cursor().ok();
         }
         let mut stdout = stdout();
         execute!(
@@ -962,14 +1007,12 @@ impl Application {
 
         let close_errs = self.close().await;
 
+        // restore cursor
         use helix_view::graphics::CursorKind;
-        use tui::backend::Backend;
-        self.compositor
-            .terminal
+        self.terminal
             .backend_mut()
             .show_cursor(CursorKind::Block)
             .ok();
-
         restore_term()?;
 
         for err in close_errs {
diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs
index 1452d31f..bbcd2181 100644
--- a/helix-term/src/compositor.rs
+++ b/helix-term/src/compositor.rs
@@ -75,56 +75,28 @@ pub trait Component: Any + AnyComponent {
     }
 }
 
-use anyhow::Context as AnyhowContext;
-
-#[cfg(not(feature = "integration"))]
-use tui::backend::CrosstermBackend;
-
-#[cfg(not(feature = "integration"))]
-use std::io::stdout;
-
-#[cfg(not(feature = "integration"))]
-type Terminal = tui::terminal::Terminal<CrosstermBackend<std::io::Stdout>>;
-
-#[cfg(feature = "integration")]
-type Terminal = tui::terminal::Terminal<TestBackend>;
-
 pub struct Compositor {
     layers: Vec<Box<dyn Component>>,
-    pub terminal: Terminal,
     area: Rect,
 
     pub(crate) last_picker: Option<Box<dyn Component>>,
 }
 
 impl Compositor {
-    pub fn new() -> anyhow::Result<Self> {
-        #[cfg(not(feature = "integration"))]
-        let backend = CrosstermBackend::new(stdout());
-
-        #[cfg(feature = "integration")]
-        let backend = TestBackend::new(120, 150);
-
-        let terminal = Terminal::new(backend).context("build terminal")?;
-        let area = terminal.size().expect("couldn't get terminal size");
-        Ok(Self {
+    pub fn new(area: Rect) -> Self {
+        Self {
             layers: Vec::new(),
             area,
-            terminal,
             last_picker: None,
-        })
+        }
     }
 
     pub fn size(&self) -> Rect {
         self.area
     }
 
-    pub fn resize(&mut self, width: u16, height: u16) {
-        self.terminal
-            .resize(Rect::new(0, 0, width, height))
-            .expect("Unable to resize terminal");
-
-        self.area = self.terminal.size().expect("couldn't get terminal size");
+    pub fn resize(&mut self, area: Rect) {
+        self.area = area;
     }
 
     pub fn push(&mut self, mut layer: Box<dyn Component>) {
@@ -192,25 +164,10 @@ impl Compositor {
         consumed
     }
 
-    pub fn render(&mut self, cx: &mut Context) {
-        self.terminal
-            .autoresize()
-            .expect("Unable to determine terminal size");
-
-        // TODO: need to recalculate view tree if necessary
-
-        let surface = self.terminal.current_buffer_mut();
-
-        let area = *surface.area();
-
+    pub fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
         for layer in &mut self.layers {
             layer.render(area, surface, cx);
         }
-
-        let (pos, kind) = self.cursor(area, cx.editor);
-        let pos = pos.map(|pos| (pos.col as u16, pos.row as u16));
-
-        self.terminal.draw(pos, kind).unwrap();
     }
 
     pub fn cursor(&self, area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {

From 758bace2210e83dacadd755c3f97bb62ad259a73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Wed, 9 Nov 2022 22:17:14 +0900
Subject: [PATCH 470/884] fix test compilation

---
 helix-term/src/application.rs | 3 +++
 helix-term/src/compositor.rs  | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 433104dc..39a6532d 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -58,6 +58,9 @@ const LSP_DEADLINE: Duration = Duration::from_millis(16);
 #[cfg(not(feature = "integration"))]
 use tui::backend::CrosstermBackend;
 
+#[cfg(feature = "integration")]
+use tui::backend::TestBackend;
+
 #[cfg(not(feature = "integration"))]
 type Terminal = tui::terminal::Terminal<CrosstermBackend<std::io::Stdout>>;
 
diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs
index bbcd2181..9dad3620 100644
--- a/helix-term/src/compositor.rs
+++ b/helix-term/src/compositor.rs
@@ -4,8 +4,6 @@
 use helix_core::Position;
 use helix_view::graphics::{CursorKind, Rect};
 
-#[cfg(feature = "integration")]
-use tui::backend::TestBackend;
 use tui::buffer::Buffer as Surface;
 
 pub type Callback = Box<dyn FnOnce(&mut Compositor, &mut Context)>;

From d7136d691a32cb327c358ab9e19bd9d25d61a457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20S=C3=A1?= <enkodr@outlook.com>
Date: Thu, 10 Nov 2022 00:42:44 +0000
Subject: [PATCH 471/884] Update ayu themes (#4662)

---
 runtime/themes/ayu_dark.toml   |  76 ++++++++++++------------
 runtime/themes/ayu_light.toml  | 103 +++++++++++++++------------------
 runtime/themes/ayu_mirage.toml |  93 +++++++++++++++--------------
 3 files changed, 132 insertions(+), 140 deletions(-)

diff --git a/runtime/themes/ayu_dark.toml b/runtime/themes/ayu_dark.toml
index 43fffee8..3b989f82 100644
--- a/runtime/themes/ayu_dark.toml
+++ b/runtime/themes/ayu_dark.toml
@@ -2,56 +2,56 @@
 # Based on the AYU theme colors from https://github.com/dempfi/ayu
 
 # Syntax highlighting
-"type" = { fg = "blue" }
-"type.builtin" = { fg = "blue" }
-"constructor" = { fg = "green" }
-"constant" = { fg = "magenta" }
-"string" = { fg = "green" }
-"string.regexp" = { fg = "orange" }
-"string.special" = { fg = "yellow" }
+"type" = "blue"
+"type.builtin" = "blue"
+"constructor" = "green"
+"constant" = "magenta"
+"string" = "green"
+"string.regexp" = "orange"
+"string.special" = "yellow"
 "comment" = { fg = "gray", modifiers = ["italic"] }
-"variable" = { fg = "foreground" }
-"variable.parameter" = { fg = "yellow" }
-"label" = { fg = "orange" }
-"punctuation" = { fg = "foreground" }
-"keyword" = { fg = "orange" }
-"keyword.control" = { fg = "yellow" }
-"keyword.directive" = { fg = "yellow" }
-"operator" = { fg = "orange" }
-"function" = { fg = "yellow", modifiers = ["bold"] }
-"tag" = { fg = "blue" }
-"namespace" = { fg = "blue" }
-"markup.heading" = { fg = "orange" }
-"markup.list" = { fg = "yellow" }
+"comment.block.documentation" = { fg = "blue", modifiers = ["italic"] }
+"variable" = "foreground"
+"label" = "orange"
+"punctuation" = "foreground"
+"keyword" = "orange"
+"keyword.control" = "yellow"
+"keyword.directive" = "yellow"
+"operator" = "orange"
+"function" = "yellow"
+"tag" = "blue"
+"namespace" = "blue"
+"markup.heading" = "orange"
+"markup.list" = "yellow"
 "markup.raw.block" = { bg = "gray", fg = "orange" }
-"markup.link.url" = { fg = "blue" }
-"markup.link.text" = { fg = "yellow" }
-"markup.link.label" = { fg = "green" }
-"markup.quote" = { fg = "yellow" }
-"diff.plus" = { fg = "green" }
-"diff.minus" = { fg = "red" }
-"diff.delta" = { fg = "green" }
+"markup.link.url" = "blue"
+"markup.link.text" = "yellow"
+"markup.link.label" = "green"
+"markup.quote" = "yellow"
+"diff.plus" =  "green"
+"diff.minus" = "red"
+"diff.delta" = "yellow"
 
 # Interface
 "ui.background"= { bg = "background" }
-"ui.cursor" = { bg = "yellow", fg = "dark_gray" }
-"ui.cursor.match" = { fg = "orange" }
-"ui.linenr" = { fg = "dark_gray" }
-"ui.linenr.selected" = { fg = "orange" }
+"ui.cursor" = { modifiers = ["reversed"] }
+"ui.cursor.match" = "orange"
+"ui.linenr" = "dark_gray"
+"ui.linenr.selected" = "gray"
 "ui.statusline" = { fg = "foreground", bg = "black" }
 "ui.cursorline" = { bg = "black" }
 "ui.popup" = { fg = "#7B91b3", bg = "black" }
-"ui.window" = { fg = "dark_gray" }
+"ui.window" = "dark_gray"
 "ui.help" = { fg = "#7B91b3", bg = "black" }
-"ui.text" = { fg = "foreground" }
+"ui.text" = "foreground"
 "ui.text.focus" = { bg = "dark_gray", fg = "foreground" }
-"ui.text.info" = { fg = "foreground" }
-"ui.virtual.whitespace" = { fg = "dark_gray" }
+"ui.text.info" = "foreground"
+"ui.virtual.whitespace" = "dark_gray"
 "ui.virtual.ruler" = { bg = "black" }
 "ui.menu" = { fg = "foreground", bg = "black" }
-"ui.menu.selected" = { bg = "orange", fg = "background" }
+"ui.menu.selected" = { bg = "gray", fg = "background" }
 "ui.selection" = { bg = "dark_gray" }
-"warning" = { fg = "yellow" }
+"warning" = "yellow"
 "error" = { fg = "red", modifiers = ["bold"] }
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "blue", modifiers = ["bold"] }
@@ -62,7 +62,7 @@
 "ui.bufferline" = { fg = "gray", bg = "background" }
 "ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
 
-"special" = { fg = "orange" }
+"special" = "orange"
 
 [palette]
 background = "#0f1419"
diff --git a/runtime/themes/ayu_light.toml b/runtime/themes/ayu_light.toml
index 80943613..6a801951 100644
--- a/runtime/themes/ayu_light.toml
+++ b/runtime/themes/ayu_light.toml
@@ -2,55 +2,56 @@
 # Based on the AYU theme colors from https://github.com/dempfi/ayu
 
 # Syntax highlighting
-"type" = { fg = "blue" }
-"type.builtin" = { fg = "blue" }
-"constructor" = { fg = "green" }
-"constant" = { fg = "magenta" }
-"string" = { fg = "green" }
-"string.regexp" = { fg = "orange" }
-"string.special" = { fg = "yellow" }
+"type" = "blue"
+"type.builtin" = "blue"
+"constructor" = "green"
+"constant" = "magenta"
+"string" = "green"
+"string.regexp" = "orange"
+"string.special" = "yellow"
 "comment" = { fg = "gray", modifiers = ["italic"] }
-"variable" = { fg = "foreground" }
-"variable.parameter" = { fg = "yellow" }
-"label" = { fg = "orange" }
-"punctuation" = { fg = "foreground" }
-"keyword" = { fg = "orange" }
-"keyword.control" = { fg = "yellow" }
-"keyword.directive" = { fg = "yellow" }
-"operator" = { fg = "orange" }
-"function" = { fg = "yellow", modifiers = ["bold"] }
-"tag" = { fg = "blue" }
-"namespace" = { fg = "blue" }
-"markup.heading" = { fg = "orange" }
-"markup.list" = { fg = "yellow" }
+"comment.block.documentation" = { fg = "blue", modifiers = ["italic"] }
+"variable" = "foreground"
+"label" = "orange"
+"punctuation" = "foreground"
+"keyword" = "orange"
+"keyword.control" = "yellow"
+"keyword.directive" = "yellow"
+"operator" = "orange"
+"function" = "yellow"
+"tag" = "blue"
+"namespace" = "blue"
+"markup.heading" = "orange"
+"markup.list" = "yellow"
 "markup.raw.block" = { bg = "gray", fg = "orange" }
-"markup.link.url" = { fg = "blue" }
-"markup.link.text" = { fg = "yellow" }
-"markup.link.label" = { fg = "green" }
-"markup.quote" = { fg = "yellow" }
-"diff.plus" = { fg = "green" }
-"diff.minus" = { fg = "red" }
-"diff.delta" = { fg = "green" }
+"markup.link.url" = "blue"
+"markup.link.text" = "yellow"
+"markup.link.label" = "green"
+"markup.quote" = "yellow"
+"diff.plus" =  "green"
+"diff.minus" = "red"
+"diff.delta" = "yellow"
 
 # Interface
 "ui.background"= { bg = "background" }
-"ui.cursor" = { bg = "yellow", fg = "light_gray" }
-"ui.cursor.match" = { fg = "orange" }
-"ui.linenr" = { fg = "light_gray" }
-"ui.linenr.selected" = { fg = "orange" }
+"ui.cursor" = { modifiers = ["reversed"] }
+"ui.cursor.match" = "orange"
+"ui.linenr" = "dark_gray"
+"ui.linenr.selected" = "gray"
+"ui.statusline" = { fg = "foreground", bg = "black" }
 "ui.cursorline" = { bg = "black" }
-"ui.popup" = { bg = "black" }
-"ui.window" = { fg = "light_gray" }
-"ui.help" = { fg  = "foreground", bg = "black" }
-"ui.text" = { fg = "foreground" }
-"ui.text.focus" = { bg = "light_gray", fg = "foreground" }
-"ui.text.info" = { fg = "foreground" }
-"ui.virtual.whitespace" = { fg = "light_gray" }
+"ui.popup" = { fg = "#7B91b3", bg = "black" }
+"ui.window" = "dark_gray"
+"ui.help" = { fg = "#7B91b3", bg = "black" }
+"ui.text" = "foreground"
+"ui.text.focus" = { bg = "dark_gray", fg = "foreground" }
+"ui.text.info" = "foreground"
+"ui.virtual.whitespace" = "dark_gray"
 "ui.virtual.ruler" = { bg = "black" }
 "ui.menu" = { fg = "foreground", bg = "black" }
-"ui.menu.selected" = { bg = "orange", fg = "background" }
-"ui.selection" = { bg = "light_gray" }
-"warning" = { fg = "yellow" }
+"ui.menu.selected" = { bg = "gray", fg = "background" }
+"ui.selection" = { bg = "dark_gray" }
+"warning" = "yellow"
 "error" = { fg = "red", modifiers = ["bold"] }
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "blue", modifiers = ["bold"] }
@@ -58,30 +59,22 @@
 "diagnostic.info"= { fg = "blue", modifiers = ["underlined"] }
 "diagnostic.warning"= { fg = "yellow", modifiers = ["underlined"] }
 "diagnostic.error"= { fg = "red", modifiers = ["underlined"] }
-"ui.bufferline" = { fg = "ui_foreground", bg = "ui_background" }
-"ui.bufferline.active" = { fg = "ui_background", bg = "ui_foreground" }
-"ui.statusline" = { fg = "ui_foreground", bg = "ui_background" }
-"ui.statusline.inactive" = { fg = "ui_foreground", bg = "ui_background" }
-"ui.statusline.normal" = { fg = "white", bg = "light_blue" }
-"ui.statusline.insert" = { fg = "white", bg = "orange" }
-"ui.statusline.select" = { fg = "white", bg = "magenta" }
+"ui.bufferline" = { fg = "gray", bg = "background" }
+"ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
 
-"special" = { fg = "orange" }
+"special" = "orange"
 
 [palette]
-background = "#fcfcfc"
+background = "#fafafa"
 foreground = "#5c6166"
 
-ui_foreground = "#8a9199"
-ui_background = "#f8f9fa"
-
 black = "#e7eaed"
 white = "#fcfcfc"
 blue = "#399ee6"
 light_blue = "#55b4d4"
 cyan = "#478acc"
-light_gray = "#e7eaed"
-gray = "#787b8099"
+dark_gray = "#d8d8d7"
+gray = "#828c9a"
 green = "#86b300"
 magenta = "#a37acc"
 orange = "#fa8d3e"
diff --git a/runtime/themes/ayu_mirage.toml b/runtime/themes/ayu_mirage.toml
index e01866a9..b1abd9a3 100644
--- a/runtime/themes/ayu_mirage.toml
+++ b/runtime/themes/ayu_mirage.toml
@@ -2,57 +2,56 @@
 # Based on the AYU theme colors from https://github.com/dempfi/ayu
 
 # Syntax highlighting
-"type" = { fg = "blue" }
-"type.builtin" = { fg = "blue" }
-"constructor" = { fg = "green" }
-"constant" = { fg = "magenta" }
-"string" = { fg = "green" }
-"string.regexp" = { fg = "orange" }
-"string.special" = { fg = "yellow" }
+"type" = "blue"
+"type.builtin" = "blue"
+"constructor" = "green"
+"constant" = "magenta"
+"string" = "green"
+"string.regexp" = "orange"
+"string.special" = "yellow"
 "comment" = { fg = "gray", modifiers = ["italic"] }
-"variable" = { fg = "foreground" }
-"variable.parameter" = { fg = "yellow" }
-"label" = { fg = "orange" }
-"punctuation" = { fg = "foreground" }
-"keyword" = { fg = "orange" }
-"keyword.control" = { fg = "yellow" }
-"keyword.directive" = { fg = "yellow" }
-"operator" = { fg = "orange" }
-"function" = { fg = "yellow", modifiers = ["bold"] }
-"tag" = { fg = "blue" }
-"namespace" = { fg = "blue" }
-"markup.heading" = { fg = "orange" }
-"markup.list" = { fg = "yellow" }
+"comment.block.documentation" = { fg = "blue", modifiers = ["italic"] }
+"variable" = "foreground"
+"label" = "orange"
+"punctuation" = "foreground"
+"keyword" = "orange"
+"keyword.control" = "yellow"
+"keyword.directive" = "yellow"
+"operator" = "orange"
+"function" = "yellow"
+"tag" = "blue"
+"namespace" = "blue"
+"markup.heading" = "orange"
+"markup.list" = "yellow"
 "markup.raw.block" = { bg = "gray", fg = "orange" }
-"markup.link.url" = { fg = "blue" }
-"markup.link.text" = { fg = "yellow" }
-"markup.link.label" = { fg = "green" }
-"markup.quote" = { fg = "yellow" }
-"diff.plus" = { fg = "green" }
-"diff.minus" = { fg = "red" }
-"diff.delta" = { fg = "green" }
+"markup.link.url" = "blue"
+"markup.link.text" = "yellow"
+"markup.link.label" = "green"
+"markup.quote" = "yellow"
+"diff.plus" =  "green"
+"diff.minus" = "red"
+"diff.delta" = "yellow"
 
 # Interface
 "ui.background"= { bg = "background" }
-"ui.cursor" = { bg = "green", fg = "dark_gray" }
-"ui.cursor.primary" = { bg = "orange", fg = "dark_gray" }
-"ui.cursor.match" = { fg = "orange" }
-"ui.linenr" = { fg = "dark_gray" }
-"ui.linenr.selected" = { fg = "orange" }
-"ui.cursorline" = { bg = "black" }
+"ui.cursor" = { modifiers = ["reversed"] }
+"ui.cursor.match" = "orange"
+"ui.linenr" = "dark_gray"
+"ui.linenr.selected" = "gray"
 "ui.statusline" = { fg = "foreground", bg = "black" }
-"ui.popup" = { bg = "black" }
-"ui.window" = { fg = "dark_gray" }
-"ui.help" = { fg = "foreground", bg = "black" }
-"ui.text" = { fg = "foreground" }
+"ui.cursorline" = { bg = "black" }
+"ui.popup" = { fg = "#7B91b3", bg = "black" }
+"ui.window" = "dark_gray"
+"ui.help" = { fg = "#7B91b3", bg = "black" }
+"ui.text" = "foreground"
 "ui.text.focus" = { bg = "dark_gray", fg = "foreground" }
-"ui.text.info" = { fg = "foreground" }
-"ui.virtual.whitespace" = { fg = "dark_gray" }
+"ui.text.info" = "foreground"
+"ui.virtual.whitespace" = "dark_gray"
 "ui.virtual.ruler" = { bg = "black" }
 "ui.menu" = { fg = "foreground", bg = "black" }
-"ui.menu.selected" = { bg = "orange", fg = "background" }
+"ui.menu.selected" = { bg = "gray", fg = "background" }
 "ui.selection" = { bg = "dark_gray" }
-"warning" = { fg = "yellow" }
+"warning" = "yellow"
 "error" = { fg = "red", modifiers = ["bold"] }
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "blue", modifiers = ["bold"] }
@@ -60,19 +59,19 @@
 "diagnostic.info"= { fg = "blue", modifiers = ["underlined"] }
 "diagnostic.warning"= { fg = "yellow", modifiers = ["underlined"] }
 "diagnostic.error"= { fg = "red", modifiers = ["underlined"] }
-"ui.bufferline" = { fg = "gray", bg = "black" }
-"ui.bufferline.active" = { fg = "foreground", bg = "background" }
+"ui.bufferline" = { fg = "gray", bg = "background" }
+"ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
 
-"special" = { fg = "orange" }
+"special" = "orange"
 
 [palette]
-background = "#242936"
+background = "#1f2430"
 foreground = "#cccac2"
 
 black = "#1a1f29"
 blue = "#73d0ff"
-dark_gray = "#8a919959"
-cyan = "#80bfff"
+dark_gray = "#323843"
+cyan = "#444b55"
 gray = "#565b66"
 green = "#d5ff80"
 magenta = "#dfbfff"

From 183d1fadf463093b7e11ed60dc169d512d7ae290 Mon Sep 17 00:00:00 2001
From: Chris Kipp <ckipp@pm.me>
Date: Thu, 10 Nov 2022 16:17:01 +0100
Subject: [PATCH 472/884] feat: add sc to filetypes for Scala (#4697)

Files ending in `.sc` are known as "Scala Scripts". The scalac compiler
knows how to handle these, popular tools like
[Ammonite](https://github.com/com-lihaoyi/Ammonite) and
[scala-cli](https://github.com/Virtuslab/scala-cli) use them, and even
some Scala build tools like [mill](https://github.com/com-lihaoyi/mill)
use them as their build files (`build.sc`). This change just makes sure
that they are treated as Scala files so Metals kicks in.
---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 41558e10..4ac39b02 100644
--- a/languages.toml
+++ b/languages.toml
@@ -998,7 +998,7 @@ source = { git = "https://github.com/UserNobody14/tree-sitter-dart", rev = "2d7f
 name = "scala"
 scope = "source.scala"
 roots = ["build.sbt", "pom.xml"]
-file-types = ["scala", "sbt"]
+file-types = ["scala", "sbt", "sc"]
 comment-token = "//"
 indent = { tab-width = 2, unit = "  " }
 language-server = { command = "metals" }

From bc52b0369b35f670e29728de5e3c0afdf804f9d8 Mon Sep 17 00:00:00 2001
From: janos-r <30606201+janos-r@users.noreply.github.com>
Date: Thu, 10 Nov 2022 16:18:38 +0100
Subject: [PATCH 473/884] theme dark_plus color-modes insert and select (#4678)

---
 runtime/themes/dark_plus.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/runtime/themes/dark_plus.toml b/runtime/themes/dark_plus.toml
index 305117c6..b4e30798 100644
--- a/runtime/themes/dark_plus.toml
+++ b/runtime/themes/dark_plus.toml
@@ -75,6 +75,8 @@
 "ui.cursorline.primary" = { bg = "dark_gray3" }
 "ui.statusline" = { fg = "white", bg = "blue" }
 "ui.statusline.inactive" = { fg = "white", bg = "blue" }
+"ui.statusline.insert" = { fg = "white", bg = "yellow" }
+"ui.statusline.select" = { fg = "white", bg = "magenta" }
 
 "ui.bufferline" = { fg = "text", bg = "widget" }
 "ui.bufferline.active" = { fg = "white", bg = "blue" }

From e17ad2722a12ffd6ea3a42405ce6ab0ccb8c0486 Mon Sep 17 00:00:00 2001
From: Philip Giuliani <giiuliio@gmail.com>
Date: Thu, 10 Nov 2022 16:21:31 +0100
Subject: [PATCH 474/884] Enable elixir-ls for heex language (#4679)

---
 book/src/generated/lang-support.md | 2 +-
 languages.toml                     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 411e67b8..086cd3c6 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -50,7 +50,7 @@
 | hare | ✓ |  |  |  |
 | haskell | ✓ |  |  | `haskell-language-server-wrapper` |
 | hcl | ✓ |  | ✓ | `terraform-ls` |
-| heex | ✓ | ✓ |  |  |
+| heex | ✓ | ✓ |  | `elixir-ls` |
 | html | ✓ |  |  | `vscode-html-language-server` |
 | idris |  |  |  | `idris2-lsp` |
 | iex | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 4ac39b02..8b87cd1d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1355,6 +1355,8 @@ injection-regex = "heex"
 file-types = ["heex"]
 roots = ["mix.exs", "mix.lock"]
 indent = { tab-width = 2, unit = "  " }
+language-server = { command = "elixir-ls" }
+config = { elixirLS.dialyzerEnabled = false }
 
 [[grammar]]
 name = "heex"

From bb5a122cdef79978f7ec770f30da914eee5bb9f3 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Fri, 11 Nov 2022 02:47:12 +0100
Subject: [PATCH 475/884] improve performance of tree sitter query captures
 (for text object motions in particular) (#4707)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add tree sitter match limit to avoid slowdowns for larger files

Affects all tree sitter queries and should speedup both
syntax highlighting and text object queries.
This has been shown to fix significant slowdowns with textobjects
for rust files as small as 3k loc.

* Apply suggestions from code review

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
---
 helix-core/src/syntax.rs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 0f62577f..b320fcda 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -354,6 +354,25 @@ impl<'a> CapturedNode<'a> {
     }
 }
 
+/// The number of matches a TS cursor can at once to avoid performance problems for medium to large files.
+/// Set with `set_match_limit`.
+/// Using such a limit means that we lose valid captures in, so there is fundamentally a tradeoff here.
+///
+///
+/// Old tree sitter versions used a limit of 32 by default until this limit was removed in version `0.19.5` (must now be set manually).
+/// However, this causes performance issues for medium to large files.
+/// In helix, this problem caused treesitter motions to take multiple seconds to complete in medium-sized rust files (3k loc).
+/// Neovim also encountered this problem and reintroduced this limit after it was removed upstream
+/// (see <https://github.com/neovim/neovim/issues/14897> and <https://github.com/neovim/neovim/pull/14915>).
+/// The number used here is fundamentally a tradeoff between breaking some obscure edge cases and performance.
+///
+///
+/// A value of 64 was chosen because neovim uses that value.
+/// Neovim chose this value somewhat arbitrarily (<https://github.com/neovim/neovim/pull/18397>) adjusting it whenever issues occur in practice.
+/// However this value has been in use for a long time and due to the large userbase of neovim it is probably a good choice.
+/// If this limit causes problems for a grammar in the future, it could be increased.
+const TREE_SITTER_MATCH_LIMIT: u32 = 64;
+
 impl TextObjectQuery {
     /// Run the query on the given node and return sub nodes which match given
     /// capture ("function.inside", "class.around", etc).
@@ -394,6 +413,8 @@ impl TextObjectQuery {
             .iter()
             .find_map(|cap| self.query.capture_index_for_name(cap))?;
 
+        cursor.set_match_limit(TREE_SITTER_MATCH_LIMIT);
+
         let nodes = cursor
             .captures(&self.query, node, RopeProvider(slice))
             .filter_map(move |(mat, _)| {
@@ -843,6 +864,7 @@ impl Syntax {
             let mut cursor = ts_parser.cursors.pop().unwrap_or_else(QueryCursor::new);
             // TODO: might need to set cursor range
             cursor.set_byte_range(0..usize::MAX);
+            cursor.set_match_limit(TREE_SITTER_MATCH_LIMIT);
 
             let source_slice = source.slice(..);
 
@@ -1032,6 +1054,7 @@ impl Syntax {
 
                 // if reusing cursors & no range this resets to whole range
                 cursor_ref.set_byte_range(range.clone().unwrap_or(0..usize::MAX));
+                cursor_ref.set_match_limit(TREE_SITTER_MATCH_LIMIT);
 
                 let mut captures = cursor_ref
                     .captures(

From 7367abd6c6f764b45802613ca9c46e921b4394e6 Mon Sep 17 00:00:00 2001
From: Gabriel Dinner-David <82682503+gabydd@users.noreply.github.com>
Date: Fri, 11 Nov 2022 00:42:56 -0500
Subject: [PATCH 476/884] Update typescript grammar and queries (#4703)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(grammars): update treesitter grammar and queries

* add override keyword

* Update runtime/queries/typescript/highlights.scm

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
---
 languages.toml                            |  4 ++--
 runtime/queries/typescript/highlights.scm | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/languages.toml b/languages.toml
index 8b87cd1d..00eff068 100644
--- a/languages.toml
+++ b/languages.toml
@@ -399,7 +399,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "typescript"
-source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "3e897ea5925f037cfae2e551f8e6b12eec2a201a", subpath = "typescript" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "6aac031ad88dd6317f02ac0bb27d099a553a7d8c", subpath = "typescript" }
 
 [[language]]
 name = "tsx"
@@ -413,7 +413,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "tsx"
-source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "3e897ea5925f037cfae2e551f8e6b12eec2a201a", subpath = "tsx" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "6aac031ad88dd6317f02ac0bb27d099a553a7d8c", subpath = "tsx" }
 
 [[language]]
 name = "css"
diff --git a/runtime/queries/typescript/highlights.scm b/runtime/queries/typescript/highlights.scm
index 7c15cf3d..fc8d110d 100644
--- a/runtime/queries/typescript/highlights.scm
+++ b/runtime/queries/typescript/highlights.scm
@@ -34,6 +34,7 @@
   "implements"
   "keyof"
   "namespace"
+  "override"
 ] @keyword
 
 [
@@ -62,3 +63,15 @@
 
 ((identifier) @type
  (#match? @type "^[A-Z]"))
+
+; Literals
+
+[
+  (template_literal_type)
+] @string
+
+; Tokens
+
+(template_type
+  "${" @punctuation.special
+  "}" @punctuation.special) @embedded

From d7be5463c59a0983d6b507f2a35f6755a44d5c75 Mon Sep 17 00:00:00 2001
From: Chris Kipp <ckipp@pm.me>
Date: Fri, 11 Nov 2022 14:49:56 +0100
Subject: [PATCH 477/884] update scala roots (#4701)

This adds in a couple more roots that are common in Scala.

- `build.sc` which is used in Mill
- `build.gradle` for Scala Gradle projects
- `.scala-build` for scala-cli projects
---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 00eff068..4013adb6 100644
--- a/languages.toml
+++ b/languages.toml
@@ -997,7 +997,7 @@ source = { git = "https://github.com/UserNobody14/tree-sitter-dart", rev = "2d7f
 [[language]]
 name = "scala"
 scope = "source.scala"
-roots = ["build.sbt", "pom.xml"]
+roots = ["build.sbt", "build.sc", "build.gradle", "pom.xml", ".scala-build"]
 file-types = ["scala", "sbt", "sc"]
 comment-token = "//"
 indent = { tab-width = 2, unit = "  " }

From 5b73c8c7248254c905be86e625b25cb5a1d743d0 Mon Sep 17 00:00:00 2001
From: Anton Romanov <theli.ua@gmail.com>
Date: Fri, 11 Nov 2022 06:15:22 -0800
Subject: [PATCH 478/884] Add port of VIM's Zenburn, a low-contrast color
 scheme for Vim (#4613)

---
 runtime/themes/zenburn.toml | 60 +++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 runtime/themes/zenburn.toml

diff --git a/runtime/themes/zenburn.toml b/runtime/themes/zenburn.toml
new file mode 100644
index 00000000..affb9f56
--- /dev/null
+++ b/runtime/themes/zenburn.toml
@@ -0,0 +1,60 @@
+# A unofficial port of VIM's zenburn theme: https://github.com/jnurmine/Zenburn/
+
+"ui.background" = { bg = "bg" }
+"ui.menu" = { fg = "#9f9f9f", bg = "uibg" }
+"ui.menu.selected" = { fg = "#d0d0a0", bg = "#242424", modifiers = ["bold"] }
+"ui.linenr" = { fg = "#9fafaf", bg = "#262626"}
+"ui.linenr.selected" = { modifiers = ["bold"]}
+"ui.popup" = { bg = "uibg" }
+"ui.selection" = { bg = "#2f2f2f" }
+"comment" = { fg = "#7f9f7f" }
+"comment.block.documentation" = { fg = "black", modifiers = ["bold"] }
+"ui.statusline" = { bg = "statusbg", fg = "#ccdc90" }
+"ui.statusline.inactive" = { fg = '#2e3330', bg = '#88b090' }
+"ui.cursor" = { fg = "#000d18", bg = "#8faf9f", modifiers = ["bold"] }
+"ui.text" = { fg = "normal"}
+"operator" = { fg = "#f0efd0" , modifiers = []}
+"variable" = "normal"
+"variable.builtin" = {fg = "constant", modifiers = ["bold"]}
+"constant.numeric" = "numeric"
+"constant" = { fg = "constant", modifiers = ["bold"] }
+"type" = { fg = "#dfdfbf", modifiers = ["bold"] }
+"ui.cursor.match" = { fg = "#343434", bg = "#284f28", modifiers = ["bold"] }
+"string"  = "#cc9393"
+"variable.other.member" = "#efef8f"
+"constant.character.escape" = { fg = "#dca3a3", modifiers = ["bold"]}
+"function" = "#efef8f"
+"function.macro" = { fg = "#ffcfaf", modifiers = ["bold"] }
+"special" = "#cfbfaf"
+"keyword" = { fg = "#f0dfaf", modifiers = ["bold"]}
+"keyword.storage-class" = { fg = "#c3bf9f", modifiers = ["bold"]}
+"label" = { fg = "#dfcfaf", modifiers = ["underlined"] }
+"ui.help" = { fg = "white", bg = "black" }
+"ui.virtual.ruler" = { bg = "#484848" }
+"ui.virtual.whitespace" = { fg = "#5b605e", modifiers = ["bold"]}
+
+"punctuation.delimiter" = "#8f8f8f"
+
+"ui.virtual.indent-guide" = "#4f4f4f"
+
+"diff.plus" = {fg = "#709080", bg = "#313c36", modifiers = ["bold"] }
+"diff.delta" = "#333333"
+"diff.minus" = {fg = "#333333", bg = "#464646"}
+
+"diagnostic" = {bg = "statusbg"}
+"diagnostic.error" = { fg = "errorfg", bg = "errorbg"}
+"ui.gutter" = { bg = "statusbg" }
+"hint" = {fg = "numeric", bg = "statusbg"}
+"warning" = "numeric"
+"error" = "errorfg"
+
+[palette]
+bg = "#3f3f3f"
+uibg = "#2c2e2e"
+constant = "#dca3a3"
+normal = "#dcdccc"
+todo = "#dfdfdf"
+errorfg = "#e37170"
+errorbg = "#3d3535"
+statusbg = "#313633"
+numeric = "#8cd0d3"
\ No newline at end of file

From bc0a3037eacf172e5919ac8cae5f068c868c3fa3 Mon Sep 17 00:00:00 2001
From: Bruce Hopkins <behopkinsjr@gmail.com>
Date: Fri, 11 Nov 2022 19:50:25 +0100
Subject: [PATCH 479/884] feat(commands): increment by range (#4418)

---
 helix-term/src/commands.rs | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 7e4969c1..71356d08 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4863,14 +4863,18 @@ fn add_newline_impl(cx: &mut Context, open: Open) {
     apply_transaction(&transaction, doc, view);
 }
 
+enum IncrementDirection {
+    Increase,
+    Decrease,
+}
 /// Increment object under cursor by count.
 fn increment(cx: &mut Context) {
-    increment_impl(cx, cx.count() as i64);
+    increment_impl(cx, IncrementDirection::Increase);
 }
 
 /// Decrement object under cursor by count.
 fn decrement(cx: &mut Context) {
-    increment_impl(cx, -(cx.count() as i64));
+    increment_impl(cx, IncrementDirection::Decrease);
 }
 
 /// This function differs from find_next_char_impl in that it stops searching at the newline, but also
@@ -4894,7 +4898,7 @@ fn find_next_char_until_newline<M: CharMatcher>(
 }
 
 /// Decrement object under cursor by `amount`.
-fn increment_impl(cx: &mut Context, amount: i64) {
+fn increment_impl(cx: &mut Context, increment_direction: IncrementDirection) {
     // TODO: when incrementing or decrementing a number that gets a new digit or lose one, the
     // selection is updated improperly.
     find_char_impl(
@@ -4906,6 +4910,17 @@ fn increment_impl(cx: &mut Context, amount: i64) {
         1,
     );
 
+    // Increase by 1 if `IncrementDirection` is `Increase`
+    // Decrease by 1 if `IncrementDirection` is `Decrease`
+    let sign = match increment_direction {
+        IncrementDirection::Increase => 1,
+        IncrementDirection::Decrease => -1,
+    };
+    let mut amount = sign * cx.count() as i64;
+
+    // If the register is `#` then increase or decrease the `amount` by 1 per element
+    let increase_by = if cx.register == Some('#') { sign } else { 0 };
+
     let (view, doc) = current!(cx.editor);
     let selection = doc.selection(view.id);
     let text = doc.text().slice(..);
@@ -4925,6 +4940,8 @@ fn increment_impl(cx: &mut Context, amount: i64) {
 
             let (range, new_text) = incrementor.increment(amount);
 
+            amount += increase_by;
+
             Some((range.from(), range.to(), Some(new_text)))
         })
         .collect();

From 53b70d821e552f9ebd89d6352d6eaf87a6a3ef6c Mon Sep 17 00:00:00 2001
From: "Alexis (Poliorcetics) Bourget" <alexis.bourget@gmail.com>
Date: Fri, 11 Nov 2022 23:40:03 +0100
Subject: [PATCH 480/884] deps: Update tree-sitter-rust (supports let-else &&
 let-chains)

---
 .github/workflows/languages.toml            | 2 +-
 helix-core/tests/data/indent/languages.toml | 2 +-
 languages.toml                              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/languages.toml b/.github/workflows/languages.toml
index 18cf71cf..b883ba1a 100644
--- a/.github/workflows/languages.toml
+++ b/.github/workflows/languages.toml
@@ -11,7 +11,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[grammar]]
 name = "rust"
-source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "a360da0a29a19c281d08295a35ecd0544d2da211" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "0431a2c60828731f27491ee9fdefe25e250ce9c9" }
 
 [[language]]
 name = "nix"
diff --git a/helix-core/tests/data/indent/languages.toml b/helix-core/tests/data/indent/languages.toml
index f9cef494..3206f124 100644
--- a/helix-core/tests/data/indent/languages.toml
+++ b/helix-core/tests/data/indent/languages.toml
@@ -10,4 +10,4 @@ indent = { tab-width = 4, unit = "    " }
 
 [[grammar]]
 name = "rust"
-source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "a360da0a29a19c281d08295a35ecd0544d2da211" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "0431a2c60828731f27491ee9fdefe25e250ce9c9" }
diff --git a/languages.toml b/languages.toml
index 4013adb6..839b6223 100644
--- a/languages.toml
+++ b/languages.toml
@@ -50,7 +50,7 @@ args = { attachCommands = [ "platform select remote-gdb-server", "platform conne
 
 [[grammar]]
 name = "rust"
-source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "41e23b454f503e6fe63ec4b6d9f7f2cf7788ab8e" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "0431a2c60828731f27491ee9fdefe25e250ce9c9" }
 
 [[language]]
 name = "toml"

From e232333d4aae5fc56182df896aec02c597590e4f Mon Sep 17 00:00:00 2001
From: "Alexis (Poliorcetics) Bourget" <alexis.bourget@gmail.com>
Date: Fri, 11 Nov 2022 23:51:58 +0100
Subject: [PATCH 481/884] fix: Outdated Rust queries after TS update

Ref: https://github.com/tree-sitter/tree-sitter-rust/commit/3ddebf46e6fe5e27fa03dc07a829a766b9979c8d
---
 runtime/queries/rust/highlights.scm  | 4 ++--
 runtime/queries/rust/indents.scm     | 5 +++--
 runtime/queries/rust/textobjects.scm | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm
index 42fc9681..5606e93d 100644
--- a/runtime/queries/rust/highlights.scm
+++ b/runtime/queries/rust/highlights.scm
@@ -271,9 +271,9 @@
 ; ---
 ; Macros
 ; ---
-(meta_item
+(attribute
   (identifier) @function.macro)
-(attr_item
+(attribute
   [
     (identifier) @function.macro
     (scoped_identifier
diff --git a/runtime/queries/rust/indents.scm b/runtime/queries/rust/indents.scm
index 600c77a3..5c2c70d0 100644
--- a/runtime/queries/rust/indents.scm
+++ b/runtime/queries/rust/indents.scm
@@ -51,13 +51,14 @@
   .
   (_) @expr-start
   value: (_) @indent
+  alternative: (_)? @indent
   (#not-same-line? @indent @expr-start)
   (#set! "scope" "all")
 )
-(if_let_expression
+(if_expression
   .
   (_) @expr-start
-  value: (_) @indent
+  condition: (_) @indent
   (#not-same-line? @indent @expr-start)
   (#set! "scope" "all")
 )
diff --git a/runtime/queries/rust/textobjects.scm b/runtime/queries/rust/textobjects.scm
index 7005d9c7..496f752e 100644
--- a/runtime/queries/rust/textobjects.scm
+++ b/runtime/queries/rust/textobjects.scm
@@ -42,7 +42,7 @@
 
 (; #[test]
  (attribute_item
-   (meta_item
+   (attribute
      (identifier) @_test_attribute))
  ; allow other attributes like #[should_panic] and comments
  [

From 7468fa28fd41ed24c5ca8067274ad7fc86092971 Mon Sep 17 00:00:00 2001
From: asvln <nlvsa@pm.me>
Date: Tue, 8 Nov 2022 10:42:07 -0500
Subject: [PATCH 482/884] add `extend_prev_word_end` command

---
 helix-term/src/commands.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 71356d08..9ea04c43 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -210,17 +210,18 @@ impl MappableCommand {
         copy_selection_on_prev_line, "Copy selection on previous line",
         move_next_word_start, "Move to start of next word",
         move_prev_word_start, "Move to start of previous word",
-        move_prev_word_end, "Move to end of previous word",
         move_next_word_end, "Move to end of next word",
+        move_prev_word_end, "Move to end of previous word",
         move_next_long_word_start, "Move to start of next long word",
         move_prev_long_word_start, "Move to start of previous long word",
         move_next_long_word_end, "Move to end of next long word",
         extend_next_word_start, "Extend to start of next word",
         extend_prev_word_start, "Extend to start of previous word",
+        extend_next_word_end, "Extend to end of next word",
+        extend_prev_word_end, "Extend to end of previous word",
         extend_next_long_word_start, "Extend to start of next long word",
         extend_prev_long_word_start, "Extend to start of previous long word",
         extend_next_long_word_end, "Extend to end of next long word",
-        extend_next_word_end, "Extend to end of next word",
         find_till_char, "Move till next occurrence of char",
         find_next_char, "Move to next occurrence of char",
         extend_till_char, "Extend till next occurrence of char",
@@ -310,8 +311,7 @@ impl MappableCommand {
         goto_line_end, "Goto line end",
         goto_next_buffer, "Goto next buffer",
         goto_previous_buffer, "Goto previous buffer",
-        // TODO: different description ?
-        goto_line_end_newline, "Goto line end",
+        goto_line_end_newline, "Goto line end (newline)",
         goto_first_nonwhitespace, "Goto first non-blank in line",
         trim_selections, "Trim whitespace from selections",
         extend_to_line_start, "Extend to line start",
@@ -1093,6 +1093,10 @@ fn extend_next_word_end(cx: &mut Context) {
     extend_word_impl(cx, movement::move_next_word_end)
 }
 
+fn extend_prev_word_end(cx: &mut Context) {
+    extend_word_impl(cx, movement::move_prev_word_end)
+}
+
 fn extend_next_long_word_start(cx: &mut Context) {
     extend_word_impl(cx, movement::move_next_long_word_start)
 }

From 1f72d342493206b83ed82efd402aca712eaffbf8 Mon Sep 17 00:00:00 2001
From: asvln <nlvsa@pm.me>
Date: Fri, 11 Nov 2022 14:36:56 -0500
Subject: [PATCH 483/884] rename description for `goto_line_end_newline`

---
 helix-term/src/commands.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 9ea04c43..c74dfb39 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -311,7 +311,7 @@ impl MappableCommand {
         goto_line_end, "Goto line end",
         goto_next_buffer, "Goto next buffer",
         goto_previous_buffer, "Goto previous buffer",
-        goto_line_end_newline, "Goto line end (newline)",
+        goto_line_end_newline, "Goto newline at line end",
         goto_first_nonwhitespace, "Goto first non-blank in line",
         trim_selections, "Trim whitespace from selections",
         extend_to_line_start, "Extend to line start",

From fd585c1ee4ae0ac541f99b5e69a40833f5e3246d Mon Sep 17 00:00:00 2001
From: wes adams <wes-adams@users.noreply.github.com>
Date: Sat, 12 Nov 2022 12:31:09 -0500
Subject: [PATCH 484/884] Statusline indicator to show number of selected chars
 (#4682)

Co-authored-by: wes adams <wadams@grayshift.com>
---
 book/src/configuration.md       |  1 +
 helix-term/src/ui/statusline.rs | 15 +++++++++++++++
 helix-view/src/editor.rs        |  3 +++
 3 files changed, 19 insertions(+)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 20abeba5..8713c3ff 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -103,6 +103,7 @@ The following statusline elements can be configured:
 | `file-type` | The type of the opened file |
 | `diagnostics` | The number of warnings and/or errors |
 | `selections` | The number of active selections |
+| `primary-selection-length` | The number of characters currently in primary selection |
 | `position` | The cursor position |
 | `position-percentage` | The cursor position as a percentage of the total number of lines |
 | `separator` | The string defined in `editor.statusline.separator` (defaults to `"│"`) |
diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index b0e8ec5d..47bb1129 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -142,6 +142,9 @@ where
         helix_view::editor::StatusLineElement::FileType => render_file_type,
         helix_view::editor::StatusLineElement::Diagnostics => render_diagnostics,
         helix_view::editor::StatusLineElement::Selections => render_selections,
+        helix_view::editor::StatusLineElement::PrimarySelectionLength => {
+            render_primary_selection_length
+        }
         helix_view::editor::StatusLineElement::Position => render_position,
         helix_view::editor::StatusLineElement::PositionPercentage => render_position_percentage,
         helix_view::editor::StatusLineElement::TotalLineNumbers => render_total_line_numbers,
@@ -254,6 +257,18 @@ where
     );
 }
 
+fn render_primary_selection_length<F>(context: &mut RenderContext, write: F)
+where
+    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
+{
+    let tot_sel = context.doc.selection(context.view.id).primary().len();
+    write(
+        context,
+        format!(" {} char{} ", tot_sel, if tot_sel == 1 { "" } else { "s" }),
+        None,
+    );
+}
+
 fn get_position(context: &RenderContext) -> Position {
     coords_at_pos(
         context.doc.text().slice(..),
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index db97cbb1..213141ff 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -328,6 +328,9 @@ pub enum StatusLineElement {
     /// The number of selections (cursors)
     Selections,
 
+    /// The number of characters currently in primary selection
+    PrimarySelectionLength,
+
     /// The cursor position
     Position,
 

From c74b97447f7a84f7728ce41c796f435371563a68 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 13 Nov 2022 18:45:52 -0600
Subject: [PATCH 485/884] Fix range offsets for multiple shell insertions
 (#4619)

d6323b7cbc21a9d3ba29738c76581dad93f9f415 introduced a regression for
shell commands like `|`, `!`, and `<A-!>` which caused the new
selections to be incorrect. This caused a panic when piping (`|`)
would cause the new range to extend past the document end.

The paste version of this bug was fixed in
48a3965ab43718ce2a49724cbcc294b04c328b81.

This change also inherits the direction of the new range from the old
range and adds integration tests to ensure that the behavior isn't
broken in the future.
---
 helix-term/src/commands.rs        | 24 ++++++++---
 helix-term/tests/test/commands.rs | 68 +++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index c74dfb39..5498a437 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4773,6 +4773,8 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
     let mut ranges = SmallVec::with_capacity(selection.len());
     let text = doc.text().slice(..);
 
+    let mut offset = 0isize;
+
     for range in selection.ranges() {
         let fragment = range.slice(text);
         let (output, success) = match shell_impl(shell, cmd, pipe.then(|| fragment.into())) {
@@ -4788,13 +4790,23 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
             return;
         }
 
-        let (from, to) = match behavior {
-            ShellBehavior::Replace => (range.from(), range.to()),
-            ShellBehavior::Insert => (range.from(), range.from()),
-            ShellBehavior::Append => (range.to(), range.to()),
-            _ => (range.from(), range.from()),
+        let output_len = output.chars().count();
+
+        let (from, to, deleted_len) = match behavior {
+            ShellBehavior::Replace => (range.from(), range.to(), range.len()),
+            ShellBehavior::Insert => (range.from(), range.from(), 0),
+            ShellBehavior::Append => (range.to(), range.to(), 0),
+            _ => (range.from(), range.from(), 0),
         };
-        ranges.push(Range::new(to, to + output.chars().count()));
+
+        // These `usize`s cannot underflow because selection ranges cannot overlap.
+        // Once the MSRV is 1.66.0 (mixed_integer_ops is stabilized), we can use checked
+        // arithmetic to assert this.
+        let anchor = (to as isize + offset - deleted_len as isize) as usize;
+        let new_range = Range::new(anchor, anchor + output_len).with_direction(range.direction());
+        ranges.push(new_range);
+        offset = offset + output_len as isize - deleted_len as isize;
+
         changes.push((from, to, Some(output)));
     }
 
diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index e78e6c9f..114bf222 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -215,3 +215,71 @@ async fn test_multi_selection_paste() -> anyhow::Result<()> {
 
     Ok(())
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_multi_selection_shell_commands() -> anyhow::Result<()> {
+    // pipe
+    test((
+        platform_line(indoc! {"\
+            #[|lorem]#
+            #(|ipsum)#
+            #(|dolor)#
+            "})
+        .as_str(),
+        "|echo foo<ret>",
+        platform_line(indoc! {"\
+            #[|foo
+            ]#
+            #(|foo
+            )#
+            #(|foo
+            )#
+            "})
+        .as_str(),
+    ))
+    .await?;
+
+    // insert-output
+    test((
+        platform_line(indoc! {"\
+            #[|lorem]#
+            #(|ipsum)#
+            #(|dolor)#
+            "})
+        .as_str(),
+        "!echo foo<ret>",
+        platform_line(indoc! {"\
+            #[|foo
+            ]#lorem
+            #(|foo
+            )#ipsum
+            #(|foo
+            )#dolor
+            "})
+        .as_str(),
+    ))
+    .await?;
+
+    // append-output
+    test((
+        platform_line(indoc! {"\
+            #[|lorem]#
+            #(|ipsum)#
+            #(|dolor)#
+            "})
+        .as_str(),
+        "<A-!>echo foo<ret>",
+        platform_line(indoc! {"\
+            lorem#[|foo
+            ]#
+            ipsum#(|foo
+            )#
+            dolor#(|foo
+            )#
+            "})
+        .as_str(),
+    ))
+    .await?;
+
+    Ok(())
+}

From 4f924f47710e504d66be0c599ce34221a310df3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Nov 2022 18:23:17 -0600
Subject: [PATCH 486/884] build(deps): bump similar from 2.2.0 to 2.2.1 (#4746)

Bumps [similar](https://github.com/mitsuhiko/similar) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/mitsuhiko/similar/releases)
- [Changelog](https://github.com/mitsuhiko/similar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mitsuhiko/similar/compare/2.2.0...2.2.1)

---
updated-dependencies:
- dependency-name: similar
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f0bf11f2..59108a99 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1023,9 +1023,9 @@ dependencies = [
 
 [[package]]
 name = "similar"
-version = "2.2.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ac7f900db32bf3fd12e0117dd3dc4da74bc52ebaac97f39668446d89694803"
+checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf"
 
 [[package]]
 name = "slab"

From 4791bd66b719423cf03e0046ae5f08ab2afafad1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Nov 2022 18:24:32 -0600
Subject: [PATCH 487/884] build(deps): bump cc from 1.0.74 to 1.0.76 (#4748)

Bumps [cc](https://github.com/rust-lang/cc-rs) from 1.0.74 to 1.0.76.
- [Release notes](https://github.com/rust-lang/cc-rs/releases)
- [Commits](https://github.com/rust-lang/cc-rs/compare/1.0.74...1.0.76)

---
updated-dependencies:
- dependency-name: cc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 59108a99..122f3610 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -92,9 +92,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
 
 [[package]]
 name = "cc"
-version = "1.0.74"
+version = "1.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574"
+checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f"
 
 [[package]]
 name = "cfg-if"

From 1233c9a989f419315a9fc2ed0bc10f9338aa8322 Mon Sep 17 00:00:00 2001
From: Jonathan <jon.lundholm@gmail.com>
Date: Tue, 15 Nov 2022 02:43:22 +0100
Subject: [PATCH 488/884] Add support for Bicep files (#4403)

---
 book/src/generated/lang-support.md   |  1 +
 languages.toml                       | 14 ++++++
 runtime/queries/bicep/highlights.scm | 73 ++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+)
 create mode 100644 runtime/queries/bicep/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 086cd3c6..1c2ffdc6 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -5,6 +5,7 @@
 | bash | ✓ |  |  | `bash-language-server` |
 | bass | ✓ |  |  | `bass` |
 | beancount | ✓ |  |  |  |
+| bicep | ✓ |  |  | `bicep-langserver` |
 | c | ✓ | ✓ | ✓ | `clangd` |
 | c-sharp | ✓ | ✓ |  | `OmniSharp` |
 | cairo | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 839b6223..78e3a35d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1966,3 +1966,17 @@ roots = []
 [[grammar]]
 name = "ini"
 source = { git = "https://github.com/justinmk/tree-sitter-ini", rev = "4d247fb876b4ae6b347687de4a179511bf67fcbc" }
+
+[[language]]
+name = "bicep"
+scope = "source.bicep"
+file-types = ["bicep"]
+roots = []
+auto-format = true
+comment-token = "//"
+indent = { tab-width = 2, unit = " "}
+language-server = { command = "bicep-langserver" }
+
+[[grammar]]
+name = "bicep"
+source = { git = "https://github.com/Sjord/tree-sitter-bicep", rev = "60795d3a1b493e064b263a64cb4f7f758a3394d7" }
diff --git a/runtime/queries/bicep/highlights.scm b/runtime/queries/bicep/highlights.scm
new file mode 100644
index 00000000..b6f92872
--- /dev/null
+++ b/runtime/queries/bicep/highlights.scm
@@ -0,0 +1,73 @@
+; Keywords
+
+[
+  "module"
+  "var"
+  "param"
+  "import"
+  "resource"
+  "existing"
+  "if"
+  "targetScope"
+  "output"
+] @keyword
+
+; Functions
+
+(decorator) @function.builtin
+
+(functionCall) @function
+
+(functionCall
+  (functionArgument
+    (variableAccess) @variable))
+
+; Literals/Types
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+(resourceDeclaration
+  (string
+    (stringLiteral) @string.special))
+
+(moduleDeclaration
+  (string
+    (stringLiteral) @string.special))
+
+[
+  (string)
+  (stringLiteral)
+] @string
+
+(nullLiteral) @keyword
+(booleanLiteral) @constant.builtin.boolean
+(integerLiteral) @constant.numeric.integer
+(comment) @comment
+
+(string
+  (variableAccess
+    (identifier) @variable))
+
+(type) @type
+
+; Variables
+
+(localVariable) @variable
+
+; Statements
+
+(object
+  (objectProperty
+    (identifier) @identifier))
+
+(propertyAccess
+  (identifier) @identifier)
+  
+(ifCondition) @keyword.control.conditional

From 91ff903bf3867f112d242d6ecbe0b417b900656f Mon Sep 17 00:00:00 2001
From: Gaurav Tyagi <grvtyagi22@gmail.com>
Date: Tue, 15 Nov 2022 07:16:07 +0530
Subject: [PATCH 489/884] Add global error/warning count statusline element
 (#4569)

---
 book/src/configuration.md       |  1 +
 helix-term/src/ui/statusline.rs | 44 +++++++++++++++++++++++++++++++++
 helix-view/src/editor.rs        |  3 +++
 3 files changed, 48 insertions(+)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 8713c3ff..e4854cda 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -102,6 +102,7 @@ The following statusline elements can be configured:
 | `total-line-numbers` | The total line numbers of the opened file |
 | `file-type` | The type of the opened file |
 | `diagnostics` | The number of warnings and/or errors |
+| `workspace-diagnostics` | The number of warnings and/or errors on workspace |
 | `selections` | The number of active selections |
 | `primary-selection-length` | The number of characters currently in primary selection |
 | `position` | The cursor position |
diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index 47bb1129..6ea0570d 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -1,4 +1,5 @@
 use helix_core::{coords_at_pos, encoding, Position};
+use helix_lsp::lsp::DiagnosticSeverity;
 use helix_view::{
     document::{Mode, SCRATCH_BUFFER_NAME},
     graphics::Rect,
@@ -141,6 +142,7 @@ where
         helix_view::editor::StatusLineElement::FileLineEnding => render_file_line_ending,
         helix_view::editor::StatusLineElement::FileType => render_file_type,
         helix_view::editor::StatusLineElement::Diagnostics => render_diagnostics,
+        helix_view::editor::StatusLineElement::WorkspaceDiagnostics => render_workspace_diagnostics,
         helix_view::editor::StatusLineElement::Selections => render_selections,
         helix_view::editor::StatusLineElement::PrimarySelectionLength => {
             render_primary_selection_length
@@ -245,6 +247,48 @@ where
     }
 }
 
+fn render_workspace_diagnostics<F>(context: &mut RenderContext, write: F)
+where
+    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
+{
+    let (warnings, errors) =
+        context
+            .editor
+            .diagnostics
+            .values()
+            .flatten()
+            .fold((0, 0), |mut counts, diag| {
+                match diag.severity {
+                    Some(DiagnosticSeverity::WARNING) => counts.0 += 1,
+                    Some(DiagnosticSeverity::ERROR) | None => counts.1 += 1,
+                    _ => {}
+                }
+                counts
+            });
+
+    if warnings > 0 || errors > 0 {
+        write(context, format!(" {} ", "W"), None);
+    }
+
+    if warnings > 0 {
+        write(
+            context,
+            "●".to_string(),
+            Some(context.editor.theme.get("warning")),
+        );
+        write(context, format!(" {} ", warnings), None);
+    }
+
+    if errors > 0 {
+        write(
+            context,
+            "●".to_string(),
+            Some(context.editor.theme.get("error")),
+        );
+        write(context, format!(" {} ", errors), None);
+    }
+}
+
 fn render_selections<F>(context: &mut RenderContext, write: F)
 where
     F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 213141ff..4e3a69a2 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -325,6 +325,9 @@ pub enum StatusLineElement {
     /// A summary of the number of errors and warnings
     Diagnostics,
 
+    /// A summary of the number of errors and warnings on file and workspace
+    WorkspaceDiagnostics,
+
     /// The number of selections (cursors)
     Selections,
 

From 506e8caba7887a86bc686fc778dc7ce0f1b4b79d Mon Sep 17 00:00:00 2001
From: Sora <dream@neoncity.dev>
Date: Tue, 15 Nov 2022 02:46:38 +0100
Subject: [PATCH 490/884] Remove Statement in Zig indentation query (#4745)

---
 runtime/queries/zig/indents.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/runtime/queries/zig/indents.scm b/runtime/queries/zig/indents.scm
index b177b165..d460214e 100644
--- a/runtime/queries/zig/indents.scm
+++ b/runtime/queries/zig/indents.scm
@@ -6,7 +6,6 @@
   (ContainerDecl)
   (ErrorUnionExpr)
   (InitList)
-  (Statement)
   (SwitchExpr)
   (TestDecl)
 ] @indent

From 652497bdd613d2854f63a1e99e9625a21a007389 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 14 Nov 2022 23:57:36 -0600
Subject: [PATCH 491/884] Use tree-sitter-bicep fork with sources checked in
 (#4751)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 78e3a35d..e69c4a4d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1979,4 +1979,4 @@ language-server = { command = "bicep-langserver" }
 
 [[grammar]]
 name = "bicep"
-source = { git = "https://github.com/Sjord/tree-sitter-bicep", rev = "60795d3a1b493e064b263a64cb4f7f758a3394d7" }
+source = { git = "https://github.com/the-mikedavis/tree-sitter-bicep", rev = "d8e097fcfa143854861ef737161163a09cc2916b" }

From 3b7760dfb0cdb547ff8c94f7685554f59d16bf0a Mon Sep 17 00:00:00 2001
From: ath3 <45574139+ath3@users.noreply.github.com>
Date: Tue, 15 Nov 2022 15:14:18 +0100
Subject: [PATCH 492/884] Refactor blackhole register (#4504)

---
 helix-core/src/register.rs  | 36 +++++++++++++++++-------------------
 helix-term/src/commands.rs  | 10 ++++------
 helix-term/src/ui/prompt.rs | 20 ++++++++------------
 3 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/helix-core/src/register.rs b/helix-core/src/register.rs
index 1cff77ba..52eb6e3e 100644
--- a/helix-core/src/register.rs
+++ b/helix-core/src/register.rs
@@ -15,11 +15,7 @@ impl Register {
     }
 
     pub fn new_with_values(name: char, values: Vec<String>) -> Self {
-        if name == '_' {
-            Self::new(name)
-        } else {
-            Self { name, values }
-        }
+        Self { name, values }
     }
 
     pub const fn name(&self) -> char {
@@ -31,15 +27,11 @@ impl Register {
     }
 
     pub fn write(&mut self, values: Vec<String>) {
-        if self.name != '_' {
-            self.values = values;
-        }
+        self.values = values;
     }
 
     pub fn push(&mut self, value: String) {
-        if self.name != '_' {
-            self.values.push(value);
-        }
+        self.values.push(value);
     }
 }
 
@@ -54,19 +46,25 @@ impl Registers {
         self.inner.get(&name)
     }
 
-    pub fn get_mut(&mut self, name: char) -> &mut Register {
-        self.inner
-            .entry(name)
-            .or_insert_with(|| Register::new(name))
+    pub fn read(&self, name: char) -> Option<&[String]> {
+        self.get(name).map(|reg| reg.read())
     }
 
     pub fn write(&mut self, name: char, values: Vec<String>) {
-        self.inner
-            .insert(name, Register::new_with_values(name, values));
+        if name != '_' {
+            self.inner
+                .insert(name, Register::new_with_values(name, values));
+        }
     }
 
-    pub fn read(&self, name: char) -> Option<&[String]> {
-        self.get(name).map(|reg| reg.read())
+    pub fn push(&mut self, name: char, value: String) {
+        if name != '_' {
+            if let Some(r) = self.inner.get_mut(&name) {
+                r.push(value);
+            } else {
+                self.write(name, vec![value]);
+            }
+        }
     }
 
     pub fn first(&self, name: char) -> Option<&String> {
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 5498a437..e5ca5611 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1805,7 +1805,7 @@ fn search_selection(cx: &mut Context) {
         .join("|");
 
     let msg = format!("register '{}' set to '{}'", '/', &regex);
-    cx.editor.registers.get_mut('/').push(regex);
+    cx.editor.registers.push('/', regex);
     cx.editor.set_status(msg);
 }
 
@@ -2121,16 +2121,14 @@ enum Operation {
 fn delete_selection_impl(cx: &mut Context, op: Operation) {
     let (view, doc) = current!(cx.editor);
 
-    let text = doc.text().slice(..);
     let selection = doc.selection(view.id);
 
     if cx.register != Some('_') {
         // first yank the selection
+        let text = doc.text().slice(..);
         let values: Vec<String> = selection.fragments(text).map(Cow::into_owned).collect();
         let reg_name = cx.register.unwrap_or('"');
-        let registers = &mut cx.editor.registers;
-        let reg = registers.get_mut(reg_name);
-        reg.write(values);
+        cx.editor.registers.write(reg_name, values);
     };
 
     // then delete
@@ -5005,7 +5003,7 @@ fn record_macro(cx: &mut Context) {
                 }
             })
             .collect::<String>();
-        cx.editor.registers.get_mut(reg).write(vec![s]);
+        cx.editor.registers.write(reg, vec![s]);
         cx.editor
             .set_status(format!("Recorded to register [{}]", reg));
     } else {
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 51ef688d..b19b9a9f 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -294,23 +294,22 @@ impl Prompt {
         direction: CompletionDirection,
     ) {
         (self.callback_fn)(cx, &self.line, PromptEvent::Abort);
-        let register = cx.editor.registers.get_mut(register).read();
-
-        if register.is_empty() {
-            return;
-        }
+        let values = match cx.editor.registers.read(register) {
+            Some(values) if !values.is_empty() => values,
+            _ => return,
+        };
 
-        let end = register.len().saturating_sub(1);
+        let end = values.len().saturating_sub(1);
 
         let index = match direction {
             CompletionDirection::Forward => self.history_pos.map_or(0, |i| i + 1),
             CompletionDirection::Backward => {
-                self.history_pos.unwrap_or(register.len()).saturating_sub(1)
+                self.history_pos.unwrap_or(values.len()).saturating_sub(1)
             }
         }
         .min(end);
 
-        self.line = register[index].clone();
+        self.line = values[index].clone();
 
         self.history_pos = Some(index);
 
@@ -548,10 +547,7 @@ impl Component for Prompt {
                         if last_item != self.line {
                             // store in history
                             if let Some(register) = self.history_register {
-                                cx.editor
-                                    .registers
-                                    .get_mut(register)
-                                    .push(self.line.clone());
+                                cx.editor.registers.push(register, self.line.clone());
                             };
                         }
 

From 77be98c78321cc2643f23f0b16889417ea9b0596 Mon Sep 17 00:00:00 2001
From: Manos Mertzianis <15073846+Manosmer@users.noreply.github.com>
Date: Tue, 15 Nov 2022 16:15:52 +0200
Subject: [PATCH 493/884]  Popup scrollbar (#4449)

* init

* cargo fmt

* optimisation of the scrollbar render both for Menu and Popup. Toggling off scrollbar for Popup<Menu>, since Menu has its own

* rendering scroll track

* removed unnecessary cast

* improve memory allocation

* small correction
---
 helix-term/src/commands/lsp.rs  |  2 +-
 helix-term/src/ui/completion.rs |  2 +-
 helix-term/src/ui/menu.rs       | 31 +++++++++++------------
 helix-term/src/ui/popup.rs      | 44 +++++++++++++++++++++++++++++++++
 4 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index c149e62b..33d33440 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -598,7 +598,7 @@ pub fn code_action(cx: &mut Context) {
             });
             picker.move_down(); // pre-select the first item
 
-            let popup = Popup::new("code-action", picker);
+            let popup = Popup::new("code-action", picker).with_scrollbar(false);
             compositor.replace_or_push("code-action", popup);
         },
     )
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 545b19d8..229dcda1 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -227,7 +227,7 @@ impl Completion {
                 }
             };
         });
-        let popup = Popup::new(Self::ID, menu);
+        let popup = Popup::new(Self::ID, menu).with_scrollbar(false);
         let mut completion = Self {
             popup,
             start_offset,
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index 1baaf40a..961b7451 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -320,11 +320,6 @@ impl<T: Item + 'static> Component for Menu<T> {
             (a + b - 1) / b
         }
 
-        let scroll_height = std::cmp::min(div_ceil(win_height.pow(2), len), win_height as usize);
-
-        let scroll_line = (win_height - scroll_height) * scroll
-            / std::cmp::max(1, len.saturating_sub(win_height));
-
         let rows = options.iter().map(|option| option.row(&self.editor_data));
         let table = Table::new(rows)
             .style(style)
@@ -357,20 +352,24 @@ impl<T: Item + 'static> Component for Menu<T> {
         let fits = len <= win_height;
 
         let scroll_style = theme.get("ui.menu.scroll");
-        for (i, _) in (scroll..(scroll + win_height).min(len)).enumerate() {
-            let cell = &mut surface[(area.x + area.width - 1, area.y + i as u16)];
+        if !fits {
+            let scroll_height = div_ceil(win_height.pow(2), len).min(win_height);
+            let scroll_line = (win_height - scroll_height) * scroll
+                / std::cmp::max(1, len.saturating_sub(win_height));
 
-            if !fits {
-                // Draw scroll track
-                cell.set_symbol("▐"); // right half block
-                cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
-            }
+            let mut cell;
+            for i in 0..win_height {
+                cell = &mut surface[(area.right() - 1, area.top() + i as u16)];
 
-            let is_marked = i >= scroll_line && i < scroll_line + scroll_height;
+                cell.set_symbol("▐"); // right half block
 
-            if !fits && is_marked {
-                // Draw scroll thumb
-                cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset));
+                if scroll_line <= i && i < scroll_line + scroll_height {
+                    // Draw scroll thumb
+                    cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset));
+                } else {
+                    // Draw scroll track
+                    cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
+                }
             }
         }
     }
diff --git a/helix-term/src/ui/popup.rs b/helix-term/src/ui/popup.rs
index 3c140da4..62a6785a 100644
--- a/helix-term/src/ui/popup.rs
+++ b/helix-term/src/ui/popup.rs
@@ -22,6 +22,7 @@ pub struct Popup<T: Component> {
     auto_close: bool,
     ignore_escape_key: bool,
     id: &'static str,
+    has_scrollbar: bool,
 }
 
 impl<T: Component> Popup<T> {
@@ -37,6 +38,7 @@ impl<T: Component> Popup<T> {
             auto_close: false,
             ignore_escape_key: false,
             id,
+            has_scrollbar: true,
         }
     }
 
@@ -128,6 +130,14 @@ impl<T: Component> Popup<T> {
         }
     }
 
+    /// Toggles the Popup's scrollbar.
+    /// Consider disabling the scrollbar in case the child
+    /// already has its own.
+    pub fn with_scrollbar(mut self, enable_scrollbar: bool) -> Self {
+        self.has_scrollbar = enable_scrollbar;
+        self
+    }
+
     pub fn contents(&self) -> &T {
         &self.contents
     }
@@ -228,6 +238,40 @@ impl<T: Component> Component for Popup<T> {
 
         let inner = area.inner(&self.margin);
         self.contents.render(inner, surface, cx);
+
+        // render scrollbar if contents do not fit
+        if self.has_scrollbar {
+            let win_height = inner.height as usize;
+            let len = self.child_size.1 as usize;
+            let fits = len <= win_height;
+            let scroll = self.scroll;
+            let scroll_style = cx.editor.theme.get("ui.menu.scroll");
+
+            const fn div_ceil(a: usize, b: usize) -> usize {
+                (a + b - 1) / b
+            }
+
+            if !fits {
+                let scroll_height = div_ceil(win_height.pow(2), len).min(win_height);
+                let scroll_line = (win_height - scroll_height) * scroll
+                    / std::cmp::max(1, len.saturating_sub(win_height));
+
+                let mut cell;
+                for i in 0..win_height {
+                    cell = &mut surface[(inner.right() - 1, inner.top() + i as u16)];
+
+                    cell.set_symbol("▐"); // right half block
+
+                    if scroll_line <= i && i < scroll_line + scroll_height {
+                        // Draw scroll thumb
+                        cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset));
+                    } else {
+                        // Draw scroll track
+                        cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
+                    }
+                }
+            }
+        }
     }
 
     fn id(&self) -> Option<&'static str> {

From 392a018aebe1716c94be94dbbf967b1698843218 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Tue, 15 Nov 2022 15:16:27 +0100
Subject: [PATCH 494/884] Add command to add word boundaries to search (#4322)

* Add command to add word boundaries to search

* Calculate string capacity before building
---
 helix-term/src/commands.rs | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index e5ca5611..e56c2b67 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -250,6 +250,7 @@ impl MappableCommand {
         extend_search_next, "Add next search match to selection",
         extend_search_prev, "Add previous search match to selection",
         search_selection, "Use current selection as search pattern",
+        make_search_word_bounded, "Modify current search to make it word bounded",
         global_search, "Global search in workspace folder",
         extend_line, "Select current line, if already selected, extend to another line based on the anchor",
         extend_line_below, "Select current line, if already selected, extend to next line",
@@ -1809,6 +1810,35 @@ fn search_selection(cx: &mut Context) {
     cx.editor.set_status(msg);
 }
 
+fn make_search_word_bounded(cx: &mut Context) {
+    let regex = match cx.editor.registers.last('/') {
+        Some(regex) => regex,
+        None => return,
+    };
+    let start_anchored = regex.starts_with("\\b");
+    let end_anchored = regex.ends_with("\\b");
+
+    if start_anchored && end_anchored {
+        return;
+    }
+
+    let mut new_regex = String::with_capacity(
+        regex.len() + if start_anchored { 0 } else { 2 } + if end_anchored { 0 } else { 2 },
+    );
+
+    if !start_anchored {
+        new_regex.push_str("\\b");
+    }
+    new_regex.push_str(regex);
+    if !end_anchored {
+        new_regex.push_str("\\b");
+    }
+
+    let msg = format!("register '{}' set to '{}'", '/', &new_regex);
+    cx.editor.registers.get_mut('/').push(new_regex);
+    cx.editor.set_status(msg);
+}
+
 fn global_search(cx: &mut Context) {
     #[derive(Debug)]
     struct FileResult {

From df6d04425d130f385c4314ed944d5a27963ae9a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 15 Nov 2022 23:34:00 +0900
Subject: [PATCH 495/884] fix build

---
 helix-term/src/commands.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index e56c2b67..f5bf6bf1 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1835,7 +1835,7 @@ fn make_search_word_bounded(cx: &mut Context) {
     }
 
     let msg = format!("register '{}' set to '{}'", '/', &new_regex);
-    cx.editor.registers.get_mut('/').push(new_regex);
+    cx.editor.registers.push('/', new_regex);
     cx.editor.set_status(msg);
 }
 

From 888368dae955acd274c2f35790a38f1d3e14028d Mon Sep 17 00:00:00 2001
From: dxtr85 <dxtr85@gmail.com>
Date: Tue, 15 Nov 2022 20:08:29 +0100
Subject: [PATCH 496/884] Fix deprecation warnings for chrono 0.4.23 (#4738)

Co-authored-by: dxtr <dxtr@W540.mito>
---
 helix-core/src/increment/date_time.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/helix-core/src/increment/date_time.rs b/helix-core/src/increment/date_time.rs
index 1574bf4d..265242ce 100644
--- a/helix-core/src/increment/date_time.rs
+++ b/helix-core/src/increment/date_time.rs
@@ -74,12 +74,12 @@ impl DateTimeIncrementor {
                 (true, false) => {
                     let date = NaiveDate::parse_from_str(date_time, format.fmt).ok()?;
 
-                    date.and_hms(0, 0, 0)
+                    date.and_hms_opt(0, 0, 0).unwrap()
                 }
                 (false, true) => {
                     let time = NaiveTime::parse_from_str(date_time, format.fmt).ok()?;
 
-                    NaiveDate::from_ymd(0, 1, 1).and_time(time)
+                    NaiveDate::from_ymd_opt(0, 1, 1).unwrap().and_time(time)
                 }
                 (false, false) => return None,
             };
@@ -312,10 +312,10 @@ fn ndays_in_month(year: i32, month: u32) -> u32 {
     } else {
         (year, month + 1)
     };
-    let d = NaiveDate::from_ymd(y, m, 1);
+    let d = NaiveDate::from_ymd_opt(y, m, 1).unwrap();
 
     // ...is preceded by the last day of the original month.
-    d.pred().day()
+    d.pred_opt().unwrap().day()
 }
 
 fn add_months(date_time: NaiveDateTime, amount: i64) -> Option<NaiveDateTime> {
@@ -334,7 +334,7 @@ fn add_months(date_time: NaiveDateTime, amount: i64) -> Option<NaiveDateTime> {
 
     let day = cmp::min(date_time.day(), ndays_in_month(year, month));
 
-    Some(NaiveDate::from_ymd(year, month, day).and_time(date_time.time()))
+    NaiveDate::from_ymd_opt(year, month, day).map(|date| date.and_time(date_time.time()))
 }
 
 fn add_years(date_time: NaiveDateTime, amount: i64) -> Option<NaiveDateTime> {
@@ -342,8 +342,8 @@ fn add_years(date_time: NaiveDateTime, amount: i64) -> Option<NaiveDateTime> {
     let ndays = ndays_in_month(year, date_time.month());
 
     if date_time.day() > ndays {
-        let d = NaiveDate::from_ymd(year, date_time.month(), ndays);
-        Some(d.succ().and_time(date_time.time()))
+        NaiveDate::from_ymd_opt(year, date_time.month(), ndays)
+            .and_then(|date| date.succ_opt().map(|date| date.and_time(date_time.time())))
     } else {
         date_time.with_year(year)
     }

From 70ebbd018ad80c9fe0067c99f5fa86d1c529486a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 13:20:39 -0600
Subject: [PATCH 497/884] build(deps): bump chrono from 0.4.22 to 0.4.23
 (#4747)

Bumps [chrono](https://github.com/chronotope/chrono) from 0.4.22 to 0.4.23.
- [Release notes](https://github.com/chronotope/chrono/releases)
- [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md)
- [Commits](https://github.com/chronotope/chrono/compare/v0.4.22...v0.4.23)

---
updated-dependencies:
- dependency-name: chrono
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 122f3610..3a967374 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -115,9 +115,9 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.22"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
+checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
 dependencies = [
  "iana-time-zone",
  "num-integer",

From f843967059fc36bf497bde31ce9ed18b1354f1eb Mon Sep 17 00:00:00 2001
From: Garrett D'Amore <garrett@damore.org>
Date: Tue, 15 Nov 2022 18:17:03 -0800
Subject: [PATCH 498/884] Improvements to Meson syntax. (#4572)

Co-authored-by: Garrett D'Amore <garrett.damore@weka.io>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 languages.toml                       |  2 +-
 runtime/queries/meson/highlights.scm | 92 ++++++++++++++--------------
 runtime/queries/meson/indents.scm    |  7 ++-
 3 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/languages.toml b/languages.toml
index e69c4a4d..6c2a4c59 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1510,7 +1510,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "meson"
-source = { git = "https://github.com/bearcove/tree-sitter-meson", rev = "feea83be9225842490066522ced2d13eb9cce0bd" }
+source = { git = "https://github.com/staysail/tree-sitter-meson", rev = "32a83e8f200c347232fa795636cfe60dde22957a" }
 
 [[language]]
 name = "sshclientconfig"
diff --git a/runtime/queries/meson/highlights.scm b/runtime/queries/meson/highlights.scm
index 01df8f27..c4775540 100644
--- a/runtime/queries/meson/highlights.scm
+++ b/runtime/queries/meson/highlights.scm
@@ -1,62 +1,62 @@
-(string_literal) @string
+(comment) @comment
 
-(boolean_literal) @constant.builtin.boolean
-(integer_literal) @constant.numeric.integer
-
-(comment) @comment.line
-(function_id) @function
-(keyword_arg_key) @variable.other.member
-(id_expression) @variable
+; these are listed first, because they override keyword queries
+(function_expression (identifier) @function)
 
 [
-  "if"
-  "elif"
-  "else"
-  "endif"
-] @keyword.control.conditional
+    (assignment_operator)
+    (additive_operator)
+    (multiplicative_operator)
+    (equality_operator)
+    ">="
+    "<="
+    "<"
+    ">"
+    "+"
+    "-"
+] @operator
 
 [
-  "foreach"
-  "endforeach"
-] @keyword.control.repeat
+    (and)
+    (or)
+    (not)
+    (in)
+] @keyword.operator
 
 [
-  "break"
-  "continue"
-] @keyword.control
+    "(" ")" "[" "]" "{" "}"
+] @punctuation.bracket
 
 [
-  "not"
-  "in"
-  "and"
-  "or"
-] @keyword.operator
+    (if)
+    (elif)
+    (else)
+    (endif)
+] @keyword.control.conditional
 
 [
-  "!"
-  "+"
-  "-"
-  "*"
-  "/"
-  "%"
-  "=="
-  "!="
-  ">"
-  "<"
-  ">="
-  "<="
-] @operator
+    (foreach)
+    (endforeach)
+    (break)
+    (continue)
+] @keyword.control.repeat
+
+(boolean_literal) @constant.builtin.boolean
+(int_literal) @constant.numeric.integer
+
+(keyword_argument keyword: (identifier) @variable.parameter)
+(escape_sequence) @constant.character.escape
+(bad_escape) @warning
 
 [
-  ":"
-  ","
+"."
+","
+":"
 ] @punctuation.delimiter
 
 [
-  "("
-  ")"
-  "["
-  "]"
-  "{"
-  "}"
-] @punctuation.bracket
+    (string_literal)
+    (fstring_literal)
+] @string
+
+(identifier) @variable
diff --git a/runtime/queries/meson/indents.scm b/runtime/queries/meson/indents.scm
index a1c7b3fa..2a4c6c62 100644
--- a/runtime/queries/meson/indents.scm
+++ b/runtime/queries/meson/indents.scm
@@ -1,5 +1,5 @@
+; Indentation queries for helix
 [
-  (method_expression)
   (function_expression)
   (array_literal)
   (dictionary_literal)
@@ -7,10 +7,11 @@
   (iteration_statement)
 ] @indent
 
+; question - what about else, elif
 [
   ")"
   "]"
   "}"
-  "endif"
-  "endforeach"
+  (endif)
+  (endforeach)
 ] @outdent

From a3173c2280aecfcb3d79254058f993c43cab5b90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Wed, 16 Nov 2022 17:54:41 +0900
Subject: [PATCH 499/884] minor: cloning filter and using count() is wasteful
 here

---
 helix-term/src/commands.rs | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index f5bf6bf1..2d455df0 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -5002,16 +5002,20 @@ fn increment_impl(cx: &mut Context, increment_direction: IncrementDirection) {
             overlapping_indexes.insert(i + 1);
         }
     }
-    let changes = changes.into_iter().enumerate().filter_map(|(i, change)| {
-        if overlapping_indexes.contains(&i) {
-            None
-        } else {
-            Some(change)
-        }
-    });
+    let changes: Vec<_> = changes
+        .into_iter()
+        .enumerate()
+        .filter_map(|(i, change)| {
+            if overlapping_indexes.contains(&i) {
+                None
+            } else {
+                Some(change)
+            }
+        })
+        .collect();
 
-    if changes.clone().count() > 0 {
-        let transaction = Transaction::change(doc.text(), changes);
+    if !changes.is_empty() {
+        let transaction = Transaction::change(doc.text(), changes.into_iter());
         let transaction = transaction.with_selection(selection.clone());
 
         apply_transaction(&transaction, doc, view);

From fe11ae221812c2aaa917359377f92c511a861886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Wed, 16 Nov 2022 18:13:36 +0900
Subject: [PATCH 500/884] minor: Simplify some command code

---
 helix-term/src/commands.rs | 50 +++++++++++++-------------------------
 1 file changed, 17 insertions(+), 33 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 2d455df0..707cc9bd 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -780,11 +780,7 @@ fn trim_selections(cx: &mut Context) {
             let mut end = range.to();
             start = movement::skip_while(text, start, |x| x.is_whitespace()).unwrap_or(start);
             end = movement::backwards_skip_while(text, end, |x| x.is_whitespace()).unwrap_or(end);
-            if range.anchor < range.head {
-                Some(Range::new(start, end))
-            } else {
-                Some(Range::new(end, start))
-            }
+            Some(Range::new(start, end).with_direction(range.direction()))
         })
         .collect();
 
@@ -1656,11 +1652,7 @@ fn search_impl(
 
         // Determine range direction based on the primary range
         let primary = selection.primary();
-        let range = if primary.head < primary.anchor {
-            Range::new(end, start)
-        } else {
-            Range::new(start, end)
-        };
+        let range = Range::new(start, end).with_direction(primary.direction());
 
         let selection = match movement {
             Movement::Extend => selection.clone().push(range),
@@ -2093,11 +2085,7 @@ fn extend_to_line_bounds(cx: &mut Context) {
             let start = text.line_to_char(start_line);
             let end = text.line_to_char((end_line + 1).min(text.len_lines()));
 
-            if range.anchor <= range.head {
-                Range::new(start, end)
-            } else {
-                Range::new(end, start)
-            }
+            Range::new(start, end).with_direction(range.direction())
         }),
     );
 }
@@ -2134,11 +2122,7 @@ fn shrink_to_line_bounds(cx: &mut Context) {
                 end = text.line_to_char(end_line);
             }
 
-            if range.anchor <= range.head {
-                Range::new(start, end)
-            } else {
-                Range::new(end, start)
-            }
+            Range::new(start, end).with_direction(range.direction())
         }),
     );
 }
@@ -2753,15 +2737,15 @@ fn goto_line(cx: &mut Context) {
 fn goto_line_impl(editor: &mut Editor, count: Option<NonZeroUsize>) {
     if let Some(count) = count {
         let (view, doc) = current!(editor);
-        let max_line = if doc.text().line(doc.text().len_lines() - 1).len_chars() == 0 {
+        let text = doc.text().slice(..);
+        let max_line = if text.line(text.len_lines() - 1).len_chars() == 0 {
             // If the last line is blank, don't jump to it.
-            doc.text().len_lines().saturating_sub(2)
+            text.len_lines().saturating_sub(2)
         } else {
-            doc.text().len_lines() - 1
+            text.len_lines() - 1
         };
         let line_idx = std::cmp::min(count.get() - 1, max_line);
-        let text = doc.text().slice(..);
-        let pos = doc.text().line_to_char(line_idx);
+        let pos = text.line_to_char(line_idx);
         let selection = doc
             .selection(view.id)
             .clone()
@@ -2774,14 +2758,14 @@ fn goto_line_impl(editor: &mut Editor, count: Option<NonZeroUsize>) {
 
 fn goto_last_line(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
-    let line_idx = if doc.text().line(doc.text().len_lines() - 1).len_chars() == 0 {
+    let text = doc.text().slice(..);
+    let line_idx = if text.line(text.len_lines() - 1).len_chars() == 0 {
         // If the last line is blank, don't jump to it.
-        doc.text().len_lines().saturating_sub(2)
+        text.len_lines().saturating_sub(2)
     } else {
-        doc.text().len_lines() - 1
+        text.len_lines() - 1
     };
-    let text = doc.text().slice(..);
-    let pos = doc.text().line_to_char(line_idx);
+    let pos = text.line_to_char(line_idx);
     let selection = doc
         .selection(view.id)
         .clone()
@@ -3823,7 +3807,7 @@ fn format_selections(cx: &mut Context) {
     apply_transaction(&transaction, doc, view);
 }
 
-fn join_selections_inner(cx: &mut Context, select_space: bool) {
+fn join_selections_impl(cx: &mut Context, select_space: bool) {
     use movement::skip_while;
     let (view, doc) = current!(cx.editor);
     let text = doc.text();
@@ -3902,11 +3886,11 @@ fn keep_or_remove_selections_impl(cx: &mut Context, remove: bool) {
 }
 
 fn join_selections(cx: &mut Context) {
-    join_selections_inner(cx, false)
+    join_selections_impl(cx, false)
 }
 
 fn join_selections_space(cx: &mut Context) {
-    join_selections_inner(cx, true)
+    join_selections_impl(cx, true)
 }
 
 fn keep_selections(cx: &mut Context) {

From 4b89177e53a467ceda2e3ee95fc77874f77d2b85 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Thu, 17 Nov 2022 00:28:20 +0100
Subject: [PATCH 501/884] sort fuzzy matches with equal score by length in
 picker (#4698)

---
 helix-term/src/ui/picker.rs | 82 +++++++++++++++++++++++++------------
 1 file changed, 55 insertions(+), 27 deletions(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 2505f219..54911924 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -11,9 +11,8 @@ use tui::{
 use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
 use tui::widgets::Widget;
 
-use std::time::Instant;
+use std::{cmp::Ordering, time::Instant};
 use std::{
-    cmp::Reverse,
     collections::HashMap,
     io::Read,
     path::{Path, PathBuf},
@@ -309,13 +308,34 @@ impl<T: Item + 'static> Component for FilePicker<T> {
     }
 }
 
+#[derive(PartialEq, Eq, Debug)]
+struct PickerMatch {
+    index: usize,
+    score: i64,
+    len: usize,
+}
+
+impl PartialOrd for PickerMatch {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Ord for PickerMatch {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.score
+            .cmp(&other.score)
+            .reverse()
+            .then_with(|| self.len.cmp(&other.len))
+    }
+}
+
 pub struct Picker<T: Item> {
     options: Vec<T>,
     editor_data: T::Data,
     // filter: String,
     matcher: Box<Matcher>,
-    /// (index, score)
-    matches: Vec<(usize, i64)>,
+    matches: Vec<PickerMatch>,
 
     /// Current height of the completions box
     completion_height: u16,
@@ -361,13 +381,16 @@ impl<T: Item> Picker<T> {
 
         // scoring on empty input:
         // TODO: just reuse score()
-        picker.matches.extend(
-            picker
-                .options
-                .iter()
-                .enumerate()
-                .map(|(index, _option)| (index, 0)),
-        );
+        picker
+            .matches
+            .extend(picker.options.iter().enumerate().map(|(index, option)| {
+                let text = option.filter_text(&picker.editor_data);
+                PickerMatch {
+                    index,
+                    score: 0,
+                    len: text.chars().count(),
+                }
+            }));
 
         picker
     }
@@ -384,32 +407,34 @@ impl<T: Item> Picker<T> {
         if pattern.is_empty() {
             // Fast path for no pattern.
             self.matches.clear();
-            self.matches.extend(
-                self.options
-                    .iter()
-                    .enumerate()
-                    .map(|(index, _option)| (index, 0)),
-            );
+            self.matches
+                .extend(self.options.iter().enumerate().map(|(index, option)| {
+                    let text = option.filter_text(&self.editor_data);
+                    PickerMatch {
+                        index,
+                        score: 0,
+                        len: text.chars().count(),
+                    }
+                }));
         } else if pattern.starts_with(&self.previous_pattern) {
             let query = FuzzyQuery::new(pattern);
             // optimization: if the pattern is a more specific version of the previous one
             // then we can score the filtered set.
-            self.matches.retain_mut(|(index, score)| {
-                let option = &self.options[*index];
+            self.matches.retain_mut(|pmatch| {
+                let option = &self.options[pmatch.index];
                 let text = option.sort_text(&self.editor_data);
 
                 match query.fuzzy_match(&text, &self.matcher) {
                     Some(s) => {
                         // Update the score
-                        *score = s;
+                        pmatch.score = s;
                         true
                     }
                     None => false,
                 }
             });
 
-            self.matches
-                .sort_unstable_by_key(|(_, score)| Reverse(*score));
+            self.matches.sort_unstable();
         } else {
             let query = FuzzyQuery::new(pattern);
             self.matches.clear();
@@ -422,11 +447,14 @@ impl<T: Item> Picker<T> {
 
                         query
                             .fuzzy_match(&text, &self.matcher)
-                            .map(|score| (index, score))
+                            .map(|score| PickerMatch {
+                                index,
+                                score,
+                                len: text.chars().count(),
+                            })
                     }),
             );
-            self.matches
-                .sort_unstable_by_key(|(_, score)| Reverse(*score));
+            self.matches.sort_unstable();
         }
 
         log::debug!("picker score {:?}", Instant::now().duration_since(now));
@@ -478,7 +506,7 @@ impl<T: Item> Picker<T> {
     pub fn selection(&self) -> Option<&T> {
         self.matches
             .get(self.cursor)
-            .map(|(index, _score)| &self.options[*index])
+            .map(|pmatch| &self.options[pmatch.index])
     }
 
     pub fn toggle_preview(&mut self) {
@@ -625,7 +653,7 @@ impl<T: Item + 'static> Component for Picker<T> {
             .matches
             .iter()
             .skip(offset)
-            .map(|(index, _score)| (*index, self.options.get(*index).unwrap()));
+            .map(|pmatch| (pmatch.index, self.options.get(pmatch.index).unwrap()));
 
         for (i, (_index, option)) in files.take(rows as usize).enumerate() {
             let is_active = i == (self.cursor - offset);

From 6eec14ee3726fc46850025ea1e184ecf74db5cf4 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 16 Nov 2022 18:58:54 -0600
Subject: [PATCH 502/884] Use key-sequence format for command palette keybinds
 (#4712)

The text within the command palette used a custom format to display
the keybinding for a command. This change switches to the key sequence
format that we use for pending keys and macros.
---
 helix-term/src/commands.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 707cc9bd..2f2427ec 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -54,7 +54,7 @@ use crate::{
 
 use crate::job::{self, Jobs};
 use futures_util::StreamExt;
-use std::{collections::HashMap, fmt, fmt::Write, future::Future};
+use std::{collections::HashMap, fmt, future::Future};
 use std::{collections::HashSet, num::NonZeroUsize};
 
 use std::{
@@ -2447,13 +2447,11 @@ impl ui::menu::Item for MappableCommand {
         let fmt_binding = |bindings: &Vec<Vec<KeyEvent>>| -> String {
             bindings.iter().fold(String::new(), |mut acc, bind| {
                 if !acc.is_empty() {
-                    acc.push_str(", ");
+                    acc.push(' ');
+                }
+                for key in bind {
+                    acc.push_str(&key.key_sequence_format());
                 }
-                bind.iter().fold(false, |needs_plus, key| {
-                    write!(&mut acc, "{}{}", if needs_plus { "+" } else { "" }, key)
-                        .expect("Writing to a string can only fail on an Out-Of-Memory error");
-                    true
-                });
                 acc
             })
         };

From b474ee1843d5cb7cb5291bee4166490a223e5aac Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 16 Nov 2022 18:59:59 -0600
Subject: [PATCH 503/884] Factor out common code for focusing the next view
 (#4607)

There is some common code between Editor::focus_next and Editor::focus
that can be eliminated by refactoring Tree::focus_next into a function
that only returns the next ViewId.
---
 helix-view/src/editor.rs | 11 +----------
 helix-view/src/tree.rs   |  8 ++++----
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 4e3a69a2..23e0a497 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1243,16 +1243,7 @@ impl Editor {
     }
 
     pub fn focus_next(&mut self) {
-        let prev_id = self.tree.focus;
-        self.tree.focus_next();
-        let id = self.tree.focus;
-
-        // if leaving the view: mode should reset and the cursor should be
-        // within view
-        if prev_id != id {
-            self.mode = Mode::Normal;
-            self.ensure_cursor_in_view(id);
-        }
+        self.focus(self.tree.next());
     }
 
     pub fn focus_direction(&mut self, direction: tree::Direction) {
diff --git a/helix-view/src/tree.rs b/helix-view/src/tree.rs
index 6174021c..40484024 100644
--- a/helix-view/src/tree.rs
+++ b/helix-view/src/tree.rs
@@ -219,7 +219,7 @@ impl Tree {
 
         if self.focus == index {
             // focus on something else
-            self.focus_next();
+            self.focus = self.next();
         }
 
         stack.push(index);
@@ -521,7 +521,7 @@ impl Tree {
         Some(child_id)
     }
 
-    pub fn focus_next(&mut self) {
+    pub fn next(&self) -> ViewId {
         // This function is very dumb, but that's because we don't store any parent links.
         // (we'd be able to go parent.next_sibling() recursively until we find something)
         // For now that's okay though, since it's unlikely you'll be able to open a large enough
@@ -532,11 +532,11 @@ impl Tree {
             .skip_while(|&(id, _view)| id != self.focus)
             .skip(1); // Skip focused value
         if let Some((id, _)) = views.next() {
-            self.focus = id;
+            id
         } else {
             // extremely crude, take the first item again
             let (key, _) = self.traverse().next().unwrap();
-            self.focus = key;
+            key
         }
     }
 

From c6b83368b3b626cb63120b5ac684cc8b1b693172 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 16 Nov 2022 19:00:48 -0600
Subject: [PATCH 504/884] Capture word parts while calculating shellwords
 (#4632)

This fixes an edge case for completing shellwords. With a file
"a b.txt" in the current directory, the sequence `:open a\<tab>`
will result in the prompt containing `:open aa\ b.txt`. This is
because the length of the input which is trimmed when replacing with
completion is calculated on the part of the input which is parsed by
shellwords and then escaped (in a separate operation), which is lossy.
In this case it loses the trailing backslash.

The fix provided here refactors shellwords to track both the _words_
(shellwords with quotes and escapes resolved) and the _parts_ (chunks
of the input which turned into each word, with separating whitespace
removed). When calculating how much of the input to delete when
replacing with the completion item, we now use the length of the last
part.

This also allows us to eliminate the duplicate work done in the
`ends_with_whitespace` check.
---
 helix-core/src/shellwords.rs     | 331 ++++++++++++++++---------------
 helix-term/src/commands/typed.rs |  25 ++-
 2 files changed, 186 insertions(+), 170 deletions(-)

diff --git a/helix-core/src/shellwords.rs b/helix-core/src/shellwords.rs
index 7742896c..9475f5e5 100644
--- a/helix-core/src/shellwords.rs
+++ b/helix-core/src/shellwords.rs
@@ -27,181 +27,172 @@ enum State {
     DquoteEscaped,
 }
 
-/// Get the vec of escaped / quoted / doublequoted filenames from the input str
-pub fn shellwords(input: &str) -> Vec<Cow<'_, str>> {
-    use State::*;
+pub struct Shellwords<'a> {
+    state: State,
+    /// Shellwords where whitespace and escapes has been resolved.
+    words: Vec<Cow<'a, str>>,
+    /// The parts of the input that are divided into shellwords. This can be
+    /// used to retrieve the original text for a given word by looking up the
+    /// same index in the Vec as the word in `words`.
+    parts: Vec<&'a str>,
+}
 
-    let mut state = Unquoted;
-    let mut args: Vec<Cow<str>> = Vec::new();
-    let mut escaped = String::with_capacity(input.len());
+impl<'a> From<&'a str> for Shellwords<'a> {
+    fn from(input: &'a str) -> Self {
+        use State::*;
 
-    let mut start = 0;
-    let mut end = 0;
+        let mut state = Unquoted;
+        let mut words = Vec::new();
+        let mut parts = Vec::new();
+        let mut escaped = String::with_capacity(input.len());
 
-    for (i, c) in input.char_indices() {
-        state = match state {
-            OnWhitespace => match c {
-                '"' => {
-                    end = i;
-                    Dquoted
-                }
-                '\'' => {
-                    end = i;
-                    Quoted
-                }
-                '\\' => {
-                    if cfg!(unix) {
-                        escaped.push_str(&input[start..i]);
-                        start = i + 1;
-                        UnquotedEscaped
-                    } else {
+        let mut part_start = 0;
+        let mut unescaped_start = 0;
+        let mut end = 0;
+
+        for (i, c) in input.char_indices() {
+            state = match state {
+                OnWhitespace => match c {
+                    '"' => {
+                        end = i;
+                        Dquoted
+                    }
+                    '\'' => {
+                        end = i;
+                        Quoted
+                    }
+                    '\\' => {
+                        if cfg!(unix) {
+                            escaped.push_str(&input[unescaped_start..i]);
+                            unescaped_start = i + 1;
+                            UnquotedEscaped
+                        } else {
+                            OnWhitespace
+                        }
+                    }
+                    c if c.is_ascii_whitespace() => {
+                        end = i;
                         OnWhitespace
                     }
-                }
-                c if c.is_ascii_whitespace() => {
-                    end = i;
-                    OnWhitespace
-                }
-                _ => Unquoted,
-            },
-            Unquoted => match c {
-                '\\' => {
-                    if cfg!(unix) {
-                        escaped.push_str(&input[start..i]);
-                        start = i + 1;
-                        UnquotedEscaped
-                    } else {
-                        Unquoted
+                    _ => Unquoted,
+                },
+                Unquoted => match c {
+                    '\\' => {
+                        if cfg!(unix) {
+                            escaped.push_str(&input[unescaped_start..i]);
+                            unescaped_start = i + 1;
+                            UnquotedEscaped
+                        } else {
+                            Unquoted
+                        }
                     }
-                }
-                c if c.is_ascii_whitespace() => {
-                    end = i;
-                    OnWhitespace
-                }
-                _ => Unquoted,
-            },
-            UnquotedEscaped => Unquoted,
-            Quoted => match c {
-                '\\' => {
-                    if cfg!(unix) {
-                        escaped.push_str(&input[start..i]);
-                        start = i + 1;
-                        QuoteEscaped
-                    } else {
-                        Quoted
+                    c if c.is_ascii_whitespace() => {
+                        end = i;
+                        OnWhitespace
                     }
-                }
-                '\'' => {
-                    end = i;
-                    OnWhitespace
-                }
-                _ => Quoted,
-            },
-            QuoteEscaped => Quoted,
-            Dquoted => match c {
-                '\\' => {
-                    if cfg!(unix) {
-                        escaped.push_str(&input[start..i]);
-                        start = i + 1;
-                        DquoteEscaped
-                    } else {
-                        Dquoted
+                    _ => Unquoted,
+                },
+                UnquotedEscaped => Unquoted,
+                Quoted => match c {
+                    '\\' => {
+                        if cfg!(unix) {
+                            escaped.push_str(&input[unescaped_start..i]);
+                            unescaped_start = i + 1;
+                            QuoteEscaped
+                        } else {
+                            Quoted
+                        }
                     }
-                }
-                '"' => {
-                    end = i;
-                    OnWhitespace
-                }
-                _ => Dquoted,
-            },
-            DquoteEscaped => Dquoted,
-        };
+                    '\'' => {
+                        end = i;
+                        OnWhitespace
+                    }
+                    _ => Quoted,
+                },
+                QuoteEscaped => Quoted,
+                Dquoted => match c {
+                    '\\' => {
+                        if cfg!(unix) {
+                            escaped.push_str(&input[unescaped_start..i]);
+                            unescaped_start = i + 1;
+                            DquoteEscaped
+                        } else {
+                            Dquoted
+                        }
+                    }
+                    '"' => {
+                        end = i;
+                        OnWhitespace
+                    }
+                    _ => Dquoted,
+                },
+                DquoteEscaped => Dquoted,
+            };
 
-        if i >= input.len() - 1 && end == 0 {
-            end = i + 1;
-        }
+            if i >= input.len() - 1 && end == 0 {
+                end = i + 1;
+            }
 
-        if end > 0 {
-            let esc_trim = escaped.trim();
-            let inp = &input[start..end];
+            if end > 0 {
+                let esc_trim = escaped.trim();
+                let inp = &input[unescaped_start..end];
 
-            if !(esc_trim.is_empty() && inp.trim().is_empty()) {
-                if esc_trim.is_empty() {
-                    args.push(inp.into());
-                } else {
-                    args.push([escaped, inp.into()].concat().into());
-                    escaped = "".to_string();
+                if !(esc_trim.is_empty() && inp.trim().is_empty()) {
+                    if esc_trim.is_empty() {
+                        words.push(inp.into());
+                        parts.push(inp);
+                    } else {
+                        words.push([escaped, inp.into()].concat().into());
+                        parts.push(&input[part_start..end]);
+                        escaped = "".to_string();
+                    }
                 }
+                unescaped_start = i + 1;
+                part_start = i + 1;
+                end = 0;
             }
-            start = i + 1;
-            end = 0;
         }
-    }
-    args
-}
 
-/// Checks that the input ends with an ascii whitespace character which is
-/// not escaped.
-///
-/// # Examples
-///
-/// ```rust
-/// use helix_core::shellwords::ends_with_whitespace;
-/// assert_eq!(ends_with_whitespace(" "), true);
-/// assert_eq!(ends_with_whitespace(":open "), true);
-/// assert_eq!(ends_with_whitespace(":open foo.txt "), true);
-/// assert_eq!(ends_with_whitespace(":open"), false);
-/// #[cfg(unix)]
-/// assert_eq!(ends_with_whitespace(":open a\\ "), false);
-/// #[cfg(unix)]
-/// assert_eq!(ends_with_whitespace(":open a\\ b.txt"), false);
-/// ```
-pub fn ends_with_whitespace(input: &str) -> bool {
-    use State::*;
+        debug_assert!(words.len() == parts.len());
 
-    // Fast-lane: the input must end with a whitespace character
-    // regardless of quoting.
-    if !input.ends_with(|c: char| c.is_ascii_whitespace()) {
-        return false;
+        Self {
+            state,
+            words,
+            parts,
+        }
     }
+}
 
-    let mut state = Unquoted;
+impl<'a> Shellwords<'a> {
+    /// Checks that the input ends with a whitespace character which is not escaped.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use helix_core::shellwords::Shellwords;
+    /// assert_eq!(Shellwords::from(" ").ends_with_whitespace(), true);
+    /// assert_eq!(Shellwords::from(":open ").ends_with_whitespace(), true);
+    /// assert_eq!(Shellwords::from(":open foo.txt ").ends_with_whitespace(), true);
+    /// assert_eq!(Shellwords::from(":open").ends_with_whitespace(), false);
+    /// #[cfg(unix)]
+    /// assert_eq!(Shellwords::from(":open a\\ ").ends_with_whitespace(), false);
+    /// #[cfg(unix)]
+    /// assert_eq!(Shellwords::from(":open a\\ b.txt").ends_with_whitespace(), false);
+    /// ```
+    pub fn ends_with_whitespace(&self) -> bool {
+        matches!(self.state, State::OnWhitespace)
+    }
 
-    for c in input.chars() {
-        state = match state {
-            OnWhitespace => match c {
-                '"' => Dquoted,
-                '\'' => Quoted,
-                '\\' if cfg!(unix) => UnquotedEscaped,
-                '\\' => OnWhitespace,
-                c if c.is_ascii_whitespace() => OnWhitespace,
-                _ => Unquoted,
-            },
-            Unquoted => match c {
-                '\\' if cfg!(unix) => UnquotedEscaped,
-                '\\' => Unquoted,
-                c if c.is_ascii_whitespace() => OnWhitespace,
-                _ => Unquoted,
-            },
-            UnquotedEscaped => Unquoted,
-            Quoted => match c {
-                '\\' if cfg!(unix) => QuoteEscaped,
-                '\\' => Quoted,
-                '\'' => OnWhitespace,
-                _ => Quoted,
-            },
-            QuoteEscaped => Quoted,
-            Dquoted => match c {
-                '\\' if cfg!(unix) => DquoteEscaped,
-                '\\' => Dquoted,
-                '"' => OnWhitespace,
-                _ => Dquoted,
-            },
-            DquoteEscaped => Dquoted,
-        }
+    /// Returns the list of shellwords calculated from the input string.
+    pub fn words(&self) -> &[Cow<'a, str>] {
+        &self.words
     }
 
-    matches!(state, OnWhitespace)
+    /// Returns a list of strings which correspond to [`Self::words`] but represent the original
+    /// text in the input string - including escape characters - without separating whitespace.
+    pub fn parts(&self) -> &[&'a str] {
+        &self.parts
+    }
 }
 
 #[cfg(test)]
@@ -212,7 +203,8 @@ mod test {
     #[cfg(windows)]
     fn test_normal() {
         let input = r#":o single_word twó wörds \three\ \"with\ escaping\\"#;
-        let result = shellwords(input);
+        let shellwords = Shellwords::from(input);
+        let result = shellwords.words().to_vec();
         let expected = vec![
             Cow::from(":o"),
             Cow::from("single_word"),
@@ -230,7 +222,8 @@ mod test {
     #[cfg(unix)]
     fn test_normal() {
         let input = r#":o single_word twó wörds \three\ \"with\ escaping\\"#;
-        let result = shellwords(input);
+        let shellwords = Shellwords::from(input);
+        let result = shellwords.words().to_vec();
         let expected = vec![
             Cow::from(":o"),
             Cow::from("single_word"),
@@ -247,7 +240,8 @@ mod test {
     fn test_quoted() {
         let quoted =
             r#":o 'single_word' 'twó wörds' '' ' ''\three\' \"with\ escaping\\' 'quote incomplete"#;
-        let result = shellwords(quoted);
+        let shellwords = Shellwords::from(quoted);
+        let result = shellwords.words().to_vec();
         let expected = vec![
             Cow::from(":o"),
             Cow::from("single_word"),
@@ -262,7 +256,8 @@ mod test {
     #[cfg(unix)]
     fn test_dquoted() {
         let dquoted = r#":o "single_word" "twó wörds" "" "  ""\three\' \"with\ escaping\\" "dquote incomplete"#;
-        let result = shellwords(dquoted);
+        let shellwords = Shellwords::from(dquoted);
+        let result = shellwords.words().to_vec();
         let expected = vec![
             Cow::from(":o"),
             Cow::from("single_word"),
@@ -277,7 +272,8 @@ mod test {
     #[cfg(unix)]
     fn test_mixed() {
         let dquoted = r#":o single_word 'twó wörds' "\three\' \"with\ escaping\\""no space before"'and after' $#%^@ "%^&(%^" ')(*&^%''a\\\\\b' '"#;
-        let result = shellwords(dquoted);
+        let shellwords = Shellwords::from(dquoted);
+        let result = shellwords.words().to_vec();
         let expected = vec![
             Cow::from(":o"),
             Cow::from("single_word"),
@@ -298,7 +294,8 @@ mod test {
     fn test_lists() {
         let input =
             r#":set statusline.center ["file-type","file-encoding"] '["list", "in", "qoutes"]'"#;
-        let result = shellwords(input);
+        let shellwords = Shellwords::from(input);
+        let result = shellwords.words().to_vec();
         let expected = vec![
             Cow::from(":set"),
             Cow::from("statusline.center"),
@@ -322,4 +319,18 @@ mod test {
         assert_eq!(escape("foobar".into()), Cow::Borrowed("foobar"));
         assert_eq!(escape("foo bar".into()), Cow::Borrowed("\"foo bar\""));
     }
+
+    #[test]
+    #[cfg(unix)]
+    fn test_parts() {
+        assert_eq!(Shellwords::from(":o a").parts(), &[":o", "a"]);
+        assert_eq!(Shellwords::from(":o a\\ ").parts(), &[":o", "a\\ "]);
+    }
+
+    #[test]
+    #[cfg(windows)]
+    fn test_parts() {
+        assert_eq!(Shellwords::from(":o a").parts(), &[":o", "a"]);
+        assert_eq!(Shellwords::from(":o a\\ ").parts(), &[":o", "a\\"]);
+    }
 }
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index c6810f05..4bbb2082 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -2253,7 +2253,10 @@ pub static TYPABLE_COMMAND_MAP: Lazy<HashMap<&'static str, &'static TypableComma
             .collect()
     });
 
+#[allow(clippy::unnecessary_unwrap)]
 pub(super) fn command_mode(cx: &mut Context) {
+    use shellwords::Shellwords;
+
     let mut prompt = Prompt::new(
         ":".into(),
         Some(':'),
@@ -2261,10 +2264,10 @@ pub(super) fn command_mode(cx: &mut Context) {
             static FUZZY_MATCHER: Lazy<fuzzy_matcher::skim::SkimMatcherV2> =
                 Lazy::new(fuzzy_matcher::skim::SkimMatcherV2::default);
 
-            let parts = shellwords::shellwords(input);
-            let ends_with_whitespace = shellwords::ends_with_whitespace(input);
+            let shellwords = Shellwords::from(input);
+            let words = shellwords.words();
 
-            if parts.is_empty() || (parts.len() == 1 && !ends_with_whitespace) {
+            if words.is_empty() || (words.len() == 1 && !shellwords.ends_with_whitespace()) {
                 // If the command has not been finished yet, complete commands.
                 let mut matches: Vec<_> = typed::TYPABLE_COMMAND_LIST
                     .iter()
@@ -2283,19 +2286,20 @@ pub(super) fn command_mode(cx: &mut Context) {
             } else {
                 // Otherwise, use the command's completer and the last shellword
                 // as completion input.
-                let part = if parts.len() == 1 {
-                    &Cow::Borrowed("")
+                let (part, part_len) = if words.len() == 1 || shellwords.ends_with_whitespace() {
+                    (&Cow::Borrowed(""), 0)
                 } else {
-                    parts.last().unwrap()
+                    (
+                        words.last().unwrap(),
+                        shellwords.parts().last().unwrap().len(),
+                    )
                 };
 
                 if let Some(typed::TypableCommand {
                     completer: Some(completer),
                     ..
-                }) = typed::TYPABLE_COMMAND_MAP.get(&parts[0] as &str)
+                }) = typed::TYPABLE_COMMAND_MAP.get(&words[0] as &str)
                 {
-                    let part_len = shellwords::escape(part.clone()).len();
-
                     completer(editor, part)
                         .into_iter()
                         .map(|(range, file)| {
@@ -2328,7 +2332,8 @@ pub(super) fn command_mode(cx: &mut Context) {
 
             // Handle typable commands
             if let Some(cmd) = typed::TYPABLE_COMMAND_MAP.get(parts[0]) {
-                let args = shellwords::shellwords(input);
+                let shellwords = Shellwords::from(input);
+                let args = shellwords.words();
 
                 if let Err(e) = (cmd.fun)(cx, &args[1..], event) {
                     cx.editor.set_error(format!("{}", e));

From 94346356e7657011adf0012651ec031b98d87411 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 16 Nov 2022 19:03:02 -0600
Subject: [PATCH 505/884] Use TreeCursor to pretty-print :tree-sitter-subtree
 (#4606)

The current `:tree-sitter-subtree` has a bug for field-names when the
field name belongs to an unnamed child node. Take this ruby example:

    def self.method_name
      true
    end

The subtree given by tree-sitter-cli is:

    (singleton_method [2, 0] - [4, 3]
      object: (self [2, 4] - [2, 8])
      name: (identifier [2, 9] - [2, 20])
      body: (body_statement [3, 2] - [3, 6]
        (true [3, 2] - [3, 6])))

But the `:tree-sitter-subtree` output was

    (singleton_method
      object: (self)
      body: (identifier)
      (body_statement (true)))

The `singleton_method` rule defines the `name` and `body` fields in an
unnamed helper rule `_method_rest` and the old implementation of
`pretty_print_tree_impl` would pass the `field_name` down from the
named `singleton_method` node.

To fix it we switch to the [TreeCursor] API which is recommended by
the tree-sitter docs for traversing the tree. `TreeCursor::field_name`
accurately determines the field name for the current cursor position
even when the node is unnamed.

[TreeCursor]: https://docs.rs/tree-sitter/0.20.9/tree_sitter/struct.TreeCursor.html
---
 helix-core/src/syntax.rs | 101 +++++++++++++++++++++++++++------------
 1 file changed, 71 insertions(+), 30 deletions(-)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index b320fcda..93bd7fe9 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -1283,7 +1283,7 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 use std::{iter, mem, ops, str, usize};
 use tree_sitter::{
     Language as Grammar, Node, Parser, Point, Query, QueryCaptures, QueryCursor, QueryError,
-    QueryMatch, Range, TextProvider, Tree,
+    QueryMatch, Range, TextProvider, Tree, TreeCursor,
 };
 
 const CANCELLATION_CHECK_INTERVAL: usize = 100;
@@ -2153,57 +2153,68 @@ impl<I: Iterator<Item = HighlightEvent>> Iterator for Merge<I> {
     }
 }
 
+fn node_is_visible(node: &Node) -> bool {
+    node.is_missing() || (node.is_named() && node.language().node_kind_is_visible(node.kind_id()))
+}
+
 pub fn pretty_print_tree<W: fmt::Write>(fmt: &mut W, node: Node) -> fmt::Result {
-    pretty_print_tree_impl(fmt, node, true, None, 0)
+    if node.child_count() == 0 {
+        if node_is_visible(&node) {
+            write!(fmt, "({})", node.kind())
+        } else {
+            write!(fmt, "\"{}\"", node.kind())
+        }
+    } else {
+        pretty_print_tree_impl(fmt, &mut node.walk(), 0)
+    }
 }
 
 fn pretty_print_tree_impl<W: fmt::Write>(
     fmt: &mut W,
-    node: Node,
-    is_root: bool,
-    field_name: Option<&str>,
+    cursor: &mut TreeCursor,
     depth: usize,
 ) -> fmt::Result {
-    fn is_visible(node: Node) -> bool {
-        node.is_missing()
-            || (node.is_named() && node.language().node_kind_is_visible(node.kind_id()))
-    }
+    let node = cursor.node();
+    let visible = node_is_visible(&node);
 
-    if is_visible(node) {
+    if visible {
         let indentation_columns = depth * 2;
         write!(fmt, "{:indentation_columns$}", "")?;
 
-        if let Some(field_name) = field_name {
+        if let Some(field_name) = cursor.field_name() {
             write!(fmt, "{}: ", field_name)?;
         }
 
         write!(fmt, "({}", node.kind())?;
-    } else if is_root {
-        write!(fmt, "(\"{}\")", node.kind())?;
     }
 
-    for child_idx in 0..node.child_count() {
-        if let Some(child) = node.child(child_idx) {
-            if is_visible(child) {
+    // Handle children.
+    if cursor.goto_first_child() {
+        loop {
+            if node_is_visible(&cursor.node()) {
                 fmt.write_char('\n')?;
             }
 
-            pretty_print_tree_impl(
-                fmt,
-                child,
-                false,
-                node.field_name_for_child(child_idx as u32),
-                depth + 1,
-            )?;
+            pretty_print_tree_impl(fmt, cursor, depth + 1)?;
+
+            if !cursor.goto_next_sibling() {
+                break;
+            }
         }
+
+        let moved = cursor.goto_parent();
+        // The parent of the first child must exist, and must be `node`.
+        debug_assert!(moved);
+        debug_assert!(cursor.node() == node);
     }
 
-    if is_visible(node) {
-        write!(fmt, ")")?;
+    if visible {
+        fmt.write_char(')')?;
     }
 
     Ok(())
 }
+
 #[cfg(test)]
 mod test {
     use super::*;
@@ -2376,11 +2387,17 @@ mod test {
     }
 
     #[track_caller]
-    fn assert_pretty_print(source: &str, expected: &str, start: usize, end: usize) {
+    fn assert_pretty_print(
+        language_name: &str,
+        source: &str,
+        expected: &str,
+        start: usize,
+        end: usize,
+    ) {
         let source = Rope::from_str(source);
 
         let loader = Loader::new(Configuration { language: vec![] });
-        let language = get_language("rust").unwrap();
+        let language = get_language(language_name).unwrap();
 
         let config = HighlightConfiguration::new(language, "", "", "").unwrap();
         let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader));
@@ -2400,13 +2417,14 @@ mod test {
     #[test]
     fn test_pretty_print() {
         let source = r#"/// Hello"#;
-        assert_pretty_print(source, "(line_comment)", 0, source.len());
+        assert_pretty_print("rust", source, "(line_comment)", 0, source.len());
 
         // A large tree should be indented with fields:
         let source = r#"fn main() {
             println!("Hello, World!");
         }"#;
         assert_pretty_print(
+            "rust",
             source,
             concat!(
                 "(function_item\n",
@@ -2425,11 +2443,34 @@ mod test {
 
         // Selecting a token should print just that token:
         let source = r#"fn main() {}"#;
-        assert_pretty_print(source, r#"("fn")"#, 0, 1);
+        assert_pretty_print("rust", source, r#""fn""#, 0, 1);
 
         // Error nodes are printed as errors:
         let source = r#"}{"#;
-        assert_pretty_print(source, "(ERROR)", 0, source.len());
+        assert_pretty_print("rust", source, "(ERROR)", 0, source.len());
+
+        // Fields broken under unnamed nodes are determined correctly.
+        // In the following source, `object` belongs to the `singleton_method`
+        // rule but `name` and `body` belong to an unnamed helper `_method_rest`.
+        // This can cause a bug with a pretty-printing implementation that
+        // uses `Node::field_name_for_child` to determine field names but is
+        // fixed when using `TreeCursor::field_name`.
+        let source = "def self.method_name
+          true
+        end";
+        assert_pretty_print(
+            "ruby",
+            source,
+            concat!(
+                "(singleton_method\n",
+                "  object: (self)\n",
+                "  name: (identifier)\n",
+                "  body: (body_statement\n",
+                "    (true)))"
+            ),
+            0,
+            source.len(),
+        );
     }
 
     #[test]

From 7483c762229516298c4a2d9398b9418dbc57198b Mon Sep 17 00:00:00 2001
From: kristopherbullinger
 <38427362+kristopherbullinger@users.noreply.github.com>
Date: Wed, 16 Nov 2022 20:06:50 -0500
Subject: [PATCH 506/884] update `x_offset` calculation in
 Buffer::set_string_truncated (#3839)

when `truncate_start` is `true`, the `x_offset` is now properly updated
according to the width of the content or the truncated length.
---
 helix-tui/src/buffer.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/helix-tui/src/buffer.rs b/helix-tui/src/buffer.rs
index 5169196a..9b93c405 100644
--- a/helix-tui/src/buffer.rs
+++ b/helix-tui/src/buffer.rs
@@ -360,14 +360,14 @@ impl Buffer {
             let mut start_index = self.index_of(x, y);
             let mut index = self.index_of(max_offset as u16, y);
 
-            let total_width = string.width();
-            let truncated = total_width > width;
+            let content_width = string.width();
+            let truncated = content_width > width;
             if ellipsis && truncated {
                 self.content[start_index].set_symbol("…");
                 start_index += 1;
             }
             if !truncated {
-                index -= width - total_width;
+                index -= width - content_width;
             }
             for (byte_offset, s) in graphemes.rev() {
                 let width = s.width();
@@ -384,6 +384,7 @@ impl Buffer {
                     self.content[i].reset();
                 }
                 index -= width;
+                x_offset += width;
             }
         }
         (x_offset as u16, y)

From 322e957ea1947108d10699f217b75b831df2a2c0 Mon Sep 17 00:00:00 2001
From: ChrHorn <christoph-horn@hotmail.de>
Date: Thu, 17 Nov 2022 02:16:03 +0100
Subject: [PATCH 507/884] Remove prefix filtering from autocomplete menu
 (#4578)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR #4134 switched the autocomplete menu from alphabetical to fuzzy
sorting. This commit removes the still existing filtering by prefix and
should enable full fuzzy sorting of the autocomplete menu.

closes #3084, #1807

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
---
 helix-term/src/commands.rs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 2f2427ec..4e3f0767 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3950,7 +3950,6 @@ pub fn completion(cx: &mut Context) {
     iter.reverse();
     let offset = iter.take_while(|ch| chars::char_is_word(*ch)).count();
     let start_offset = cursor.saturating_sub(offset);
-    let prefix = text.slice(start_offset..cursor).to_string();
 
     cx.callback(
         future,
@@ -3960,7 +3959,7 @@ pub fn completion(cx: &mut Context) {
                 return;
             }
 
-            let mut items = match response {
+            let items = match response {
                 Some(lsp::CompletionResponse::Array(items)) => items,
                 // TODO: do something with is_incomplete
                 Some(lsp::CompletionResponse::List(lsp::CompletionList {
@@ -3970,15 +3969,6 @@ pub fn completion(cx: &mut Context) {
                 None => Vec::new(),
             };
 
-            if !prefix.is_empty() {
-                items.retain(|item| {
-                    item.filter_text
-                        .as_ref()
-                        .unwrap_or(&item.label)
-                        .starts_with(&prefix)
-                });
-            }
-
             if items.is_empty() {
                 // editor.set_error("No completion available");
                 return;

From 433ccef3fc69db132722537b221a54dcf65e2ac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Fri, 18 Nov 2022 09:52:05 +0900
Subject: [PATCH 508/884] Make nil the preferred language server over rnix-lsp

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 6c2a4c59..927c5a0e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -495,7 +495,7 @@ file-types = ["nix"]
 shebangs = []
 roots = []
 comment-token = "#"
-language-server = { command = "rnix-lsp" }
+language-server = { command = "nil" }
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]

From 767b179839e83bcdf25f36631f417f07c86f821c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Fri, 18 Nov 2022 10:53:08 +0900
Subject: [PATCH 509/884] Update lang-support doc

---
 book/src/generated/lang-support.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 1c2ffdc6..9187fbfb 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -78,7 +78,7 @@
 | meson | ✓ |  | ✓ |  |
 | mint |  |  |  | `mint` |
 | nickel | ✓ |  | ✓ | `nls` |
-| nix | ✓ |  |  | `rnix-lsp` |
+| nix | ✓ |  |  | `nil` |
 | nu | ✓ |  |  |  |
 | ocaml | ✓ |  | ✓ | `ocamllsp` |
 | ocaml-interface | ✓ |  |  | `ocamllsp` |

From 9a4e6fdf2573cca5e14e16b8b3b8bdeb0fc6eb23 Mon Sep 17 00:00:00 2001
From: "Felipe S. S. Schneider"
 <37125+schneiderfelipe@users.noreply.github.com>
Date: Thu, 17 Nov 2022 23:22:49 -0300
Subject: [PATCH 510/884] Add support for color modes with Monokai Pro (#4789)

---
 runtime/themes/monokai_pro.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtime/themes/monokai_pro.toml b/runtime/themes/monokai_pro.toml
index 39fe6993..a5cbfdcf 100644
--- a/runtime/themes/monokai_pro.toml
+++ b/runtime/themes/monokai_pro.toml
@@ -18,6 +18,9 @@
 # status bars, panels, modals, autocompletion
 "ui.statusline" = { fg = "base8", bg = "base4" }
 "ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" }
+"ui.statusline.normal" = { fg = "base4", bg = "blue" }
+"ui.statusline.insert" = { fg = "base4", bg = "green" }
+"ui.statusline.select" = { fg = "base4", bg = "purple" }
 "ui.popup" = { bg = "base3" }
 "ui.window" = { bg = "base3" }
 "ui.help" = { fg = "base8", bg = "base3" }

From 1569d2000ba9622f23f658e60af173c2a6b8c88b Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Fri, 18 Nov 2022 02:46:03 +0000
Subject: [PATCH 511/884] Select surrounding characters when using
 match/surround (m) mode (#4752)

Co-authored-by: Austen Adler <agadler@austenadler.com>
---
 helix-term/src/commands.rs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 4e3f0767..b00e02b9 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4530,8 +4530,13 @@ fn surround_add(cx: &mut Context) {
         let (view, doc) = current!(cx.editor);
         let selection = doc.selection(view.id);
         let (open, close) = surround::get_pair(ch);
+        // The number of chars in get_pair
+        let surround_len = 2;
 
         let mut changes = Vec::with_capacity(selection.len() * 2);
+        let mut ranges = SmallVec::with_capacity(selection.len());
+        let mut offs = 0;
+
         for range in selection.iter() {
             let mut o = Tendril::new();
             o.push(open);
@@ -4539,9 +4544,19 @@ fn surround_add(cx: &mut Context) {
             c.push(close);
             changes.push((range.from(), range.from(), Some(o)));
             changes.push((range.to(), range.to(), Some(c)));
+
+            // Add 2 characters to the range to select them
+            ranges.push(
+                Range::new(offs + range.from(), offs + range.to() + surround_len)
+                    .with_direction(range.direction()),
+            );
+
+            // Add 2 characters to the offset for the next ranges
+            offs += surround_len;
         }
 
-        let transaction = Transaction::change(doc.text(), changes.into_iter());
+        let transaction = Transaction::change(doc.text(), changes.into_iter())
+            .with_selection(Selection::new(ranges, selection.primary_index()));
         apply_transaction(&transaction, doc, view);
     })
 }

From 19694877aac4562f3ebd0d814e46a7f7deb1522c Mon Sep 17 00:00:00 2001
From: wes adams <wes-adams@users.noreply.github.com>
Date: Thu, 17 Nov 2022 21:53:49 -0500
Subject: [PATCH 512/884] When buffer closes, focus on parent buffer (#4766)

---
 helix-view/src/tree.rs | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/helix-view/src/tree.rs b/helix-view/src/tree.rs
index 40484024..469e913d 100644
--- a/helix-view/src/tree.rs
+++ b/helix-view/src/tree.rs
@@ -219,7 +219,7 @@ impl Tree {
 
         if self.focus == index {
             // focus on something else
-            self.focus = self.next();
+            self.focus = self.prev();
         }
 
         stack.push(index);
@@ -521,6 +521,26 @@ impl Tree {
         Some(child_id)
     }
 
+    pub fn prev(&self) -> ViewId {
+        // This function is very dumb, but that's because we don't store any parent links.
+        // (we'd be able to go parent.prev_sibling() recursively until we find something)
+        // For now that's okay though, since it's unlikely you'll be able to open a large enough
+        // number of splits to notice.
+
+        let mut views = self
+            .traverse()
+            .rev()
+            .skip_while(|&(id, _view)| id != self.focus)
+            .skip(1); // Skip focused value
+        if let Some((id, _)) = views.next() {
+            id
+        } else {
+            // extremely crude, take the last item
+            let (key, _) = self.traverse().rev().next().unwrap();
+            key
+        }
+    }
+
     pub fn next(&self) -> ViewId {
         // This function is very dumb, but that's because we don't store any parent links.
         // (we'd be able to go parent.next_sibling() recursively until we find something)
@@ -661,6 +681,23 @@ impl<'a> Iterator for Traverse<'a> {
     }
 }
 
+impl<'a> DoubleEndedIterator for Traverse<'a> {
+    fn next_back(&mut self) -> Option<Self::Item> {
+        loop {
+            let key = self.stack.pop()?;
+
+            let node = &self.tree.nodes[key];
+
+            match &node.content {
+                Content::View(view) => return Some((key, view)),
+                Content::Container(container) => {
+                    self.stack.extend(container.children.iter());
+                }
+            }
+        }
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;

From 58e7e1c5e3754cbfe9a6a9e9843c05ef1055b85f Mon Sep 17 00:00:00 2001
From: Rohit K Viswanath <kvrohit@gmail.com>
Date: Fri, 18 Nov 2022 20:03:55 +0530
Subject: [PATCH 513/884] Theme: Mellow (#4770)

---
 runtime/themes/mellow.toml | 138 +++++++++++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)
 create mode 100644 runtime/themes/mellow.toml

diff --git a/runtime/themes/mellow.toml b/runtime/themes/mellow.toml
new file mode 100644
index 00000000..675cd916
--- /dev/null
+++ b/runtime/themes/mellow.toml
@@ -0,0 +1,138 @@
+# Author : Rohit K Viswanath <kvrohit@gmail.com>
+# Theme: Mellow
+
+"attribute" = { fg = "blue", modifiers = ["italic"] }
+
+"keyword" = "blue"
+"keyword.control.conditional" = { fg = "blue", modifiers = ["italic"] }
+"keyword.directive" = "magenta" # -- preprocessor comments (#if in C)
+
+"namespace" = { fg = "cyan", modifiers = ["italic"] }
+
+"punctuation" = "gray06"
+"punctuation.delimiter" = "gray06"
+
+"operator" = "yellow"
+"special" = "yellow"
+
+"variable" = "fg"
+"variable.builtin" = "bright_blue"
+"variable.parameter" = "cyan"
+"variable.other.member" = "white"
+
+"type" = "bright_blue"
+"type.builtin" = "magenta"
+"type.enum.variant" = "magenta"
+
+"constructor" = "yellow"
+
+"function" = "white"
+"function.macro" = "bright_cyan"
+"function.builtin" = "bright_blue"
+
+"tag" = "cyan"
+"comment" = { fg = "gray05", modifiers = ["italic"] }
+
+"string" = "green"
+"string.regexp" = "green"
+"string.special" = "yellow"
+
+"constant" = "cyan"
+"constant.builtin" = "yellow"
+"constant.numeric" = "magenta"
+"constant.character.escape" = "cyan"
+
+# used for lifetimes
+"label" = "yellow"
+
+"markup.heading.marker" = { fg = "gray06" }
+"markup.heading" = { fg = "bright_blue", modifiers = ["bold"] }
+"markup.list" = "gray06"
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.link.url" = { fg = "green", modifiers = ["underlined"] }
+"markup.link.text" = { fg = "blue", modifiers = ["italic"] }
+"markup.raw" = "yellow"
+
+"diff.plus" = "bright_green"
+"diff.minus" = "bright_red"
+"diff.delta" = "bright_blue"
+
+"ui.background" = { bg = "bg" }
+"ui.background.separator" = { fg = "fg" }
+
+"ui.linenr" = { fg = "gray04" }
+"ui.linenr.selected" = { fg = "fg" }
+
+"ui.statusline" = { fg = "fg", bg = "gray01" }
+"ui.statusline.inactive" = { fg = "fg", bg = "gray01", modifiers = ["dim"] }
+"ui.statusline.normal" = { fg = "bg", bg = "cyan", modifiers = ["bold"] }
+"ui.statusline.insert" = { fg = "bg", bg = "blue", modifiers = ["bold"] }
+"ui.statusline.select" = { fg = "bg", bg = "magenta", modifiers = ["bold"] }
+
+"ui.popup" = { bg = "gray01" }
+"ui.window" = { fg = "gray02" }
+"ui.help" = { bg = "gray01", fg = "white" }
+
+"ui.text" = { fg = "fg" }
+"ui.text.focus" = { fg = "fg" }
+
+"ui.virtual" = { fg = "gray02" }
+"ui.virtual.indent-guide" = { fg = "gray02" }
+
+"ui.selection" = { bg = "gray03" }
+"ui.selection.primary" = { bg = "gray03" }
+
+"ui.cursor" = { bg = "gray04" }
+"ui.cursor.match" = { fg = "yellow", modifiers = ["bold", "underlined"] }
+"ui.cursorline.primary" = { bg = "gray01" }
+
+"ui.highlight" = { bg = "gray02" }
+
+"ui.menu" = { fg = "white", bg = "gray01" }
+"ui.menu.selected" = { fg = "bright_white", bg = "gray03" }
+"ui.menu.scroll" = { fg = "gray04", bg = "gray01" }
+
+diagnostic = { modifiers = ["underlined"] }
+
+warning = "bright_yellow"
+error = "bright_red"
+info = "bright_blue"
+hint = "bright_cyan"
+
+[palette]
+bg = "#161617"
+fg = "#c9c7cd"
+bg_dark = "#131314"
+
+black = "#27272a"
+bright_black = "#353539"
+
+red = "#f5a191"
+bright_red = "#ffae9f"
+
+green = "#90b99f"
+bright_green = "#9dc6ac"
+
+yellow = "#e6b99d"
+bright_yellow = "#f0c5a9"
+
+blue = "#aca1cf"
+bright_blue = "#b9aeda"
+
+magenta = "#e29eca"
+bright_magenta = "#ecaad6"
+
+cyan = "#ea83a5"
+bright_cyan = "#f591b2"
+
+white = "#c1c0d4"
+bright_white = "#cac9dd"
+
+gray01 = "#1b1b1d"
+gray02 = "#2a2a2d"
+gray03 = "#3e3e43"
+gray04 = "#57575f"
+gray05 = "#757581"
+gray06 = "#9998a8"
+gray07 = "#c1c0d4"

From eada6d534e022b66e1c1d631670dc1ccbe922b9e Mon Sep 17 00:00:00 2001
From: Ollie Charles <ollie@ocharles.org.uk>
Date: Fri, 18 Nov 2022 14:36:40 +0000
Subject: [PATCH 514/884] Match `.hs-boot` files to Haskell (#4800)

Haskell source files are now either `.hs` (as before) or `.hs-boot`, which is a type of Haskell file that only contains type declarations (https://downloads.haskell.org/ghc/latest/docs/users_guide/separate_compilation.html#how-to-compile-mutually-recursive-modules)
---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 927c5a0e..c40b0d50 100644
--- a/languages.toml
+++ b/languages.toml
@@ -732,7 +732,7 @@ source = { git = "https://github.com/ikatyang/tree-sitter-yaml", rev = "0e36bed1
 name = "haskell"
 scope = "source.haskell"
 injection-regex = "haskell"
-file-types = ["hs"]
+file-types = ["hs", "hs-boot"]
 roots = ["Setup.hs", "stack.yaml", "*.cabal"]
 comment-token = "--"
 language-server = { command = "haskell-language-server-wrapper", args = ["--lsp"] }

From 89efb4f711d37ac59b4f5f985467647be76fb870 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Fri, 18 Nov 2022 12:27:46 -0600
Subject: [PATCH 515/884] lsp: Resolve completion item asynchronously on
 idle-timeout (#4781)

d7d0d5ffb79b6f2e09c6ab8af6e112c41e6f73e8 resolves completion items on
the idle-timeout event. The `Completion::resolve_completion_item`
function blocks on the LSP request though, which blocks the compositor
and in turn blocks the event loop. So until the language server returns
the resolved completion item, Helix is unable to respond to keypresses
or other LSP messages.

This is typically ok since the resolution request is fast but for some
language servers this can be problematic, and ideally we shouldn't be
blocking like this anyways.

When receiving a `completionItem/resolve` request, the Volar server
sends a `workspace/configuration` request to Helix and blocks itself
on the response, leading to a deadlock. Eventually the resolve request
times out within Helix but Helix is locked up and unresponsive in that
window.

This change resolves the completion item without blocking the
compositor.
---
 helix-lsp/src/client.rs         |  7 +++--
 helix-term/src/ui/completion.rs | 48 ++++++++++++++++++++++++++-------
 helix-term/src/ui/menu.rs       | 11 ++++++++
 3 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 50c4b87f..424cbabf 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -650,12 +650,11 @@ impl Client {
         self.call::<lsp::request::Completion>(params)
     }
 
-    pub async fn resolve_completion_item(
+    pub fn resolve_completion_item(
         &self,
         completion_item: lsp::CompletionItem,
-    ) -> Result<lsp::CompletionItem> {
-        self.request::<lsp::request::ResolveCompletionItem>(completion_item)
-            .await
+    ) -> impl Future<Output = Result<Value>> {
+        self.call::<lsp::request::ResolveCompletionItem>(completion_item)
     }
 
     pub fn text_document_signature_help(
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 229dcda1..4e6ee424 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -257,7 +257,7 @@ impl Completion {
         let future = language_server.resolve_completion_item(completion_item);
         let response = helix_lsp::block_on(future);
         match response {
-            Ok(completion_item) => Some(completion_item),
+            Ok(value) => serde_json::from_value(value).ok(),
             Err(err) => {
                 log::error!("execute LSP command: {}", err);
                 None
@@ -304,6 +304,12 @@ impl Completion {
         self.popup.contents().is_empty()
     }
 
+    fn replace_item(&mut self, old_item: lsp::CompletionItem, new_item: lsp::CompletionItem) {
+        self.popup.contents_mut().replace_option(old_item, new_item);
+    }
+
+    /// Asynchronously requests that the currently selection completion item is
+    /// resolved through LSP `completionItem/resolve`.
     pub fn ensure_item_resolved(&mut self, cx: &mut commands::Context) -> bool {
         // > If computing full completion items is expensive, servers can additionally provide a
         // > handler for the completion item resolve request. ...
@@ -313,16 +319,38 @@ impl Completion {
         // > 'completionItem/resolve' request is sent with the selected completion item as a parameter.
         // > The returned completion item should have the documentation property filled in.
         // https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_completion
-        match self.popup.contents_mut().selection_mut() {
-            Some(item) if item.documentation.is_none() => {
-                let doc = doc!(cx.editor);
-                if let Some(resolved_item) = Self::resolve_completion_item(doc, item.clone()) {
-                    *item = resolved_item;
+        let current_item = match self.popup.contents().selection() {
+            Some(item) if item.documentation.is_none() => item.clone(),
+            _ => return false,
+        };
+
+        let language_server = match doc!(cx.editor).language_server() {
+            Some(language_server) => language_server,
+            None => return false,
+        };
+
+        // This method should not block the compositor so we handle the response asynchronously.
+        let future = language_server.resolve_completion_item(current_item.clone());
+
+        cx.callback(
+            future,
+            move |_editor, compositor, response: Option<lsp::CompletionItem>| {
+                let resolved_item = match response {
+                    Some(item) => item,
+                    None => return,
+                };
+
+                if let Some(completion) = &mut compositor
+                    .find::<crate::ui::EditorView>()
+                    .unwrap()
+                    .completion
+                {
+                    completion.replace_item(current_item, resolved_item);
                 }
-                true
-            }
-            _ => false,
-        }
+            },
+        );
+
+        true
     }
 }
 
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index 961b7451..b9c1f9de 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -224,6 +224,17 @@ impl<T: Item> Menu<T> {
     }
 }
 
+impl<T: Item + PartialEq> Menu<T> {
+    pub fn replace_option(&mut self, old_option: T, new_option: T) {
+        for option in &mut self.options {
+            if old_option == *option {
+                *option = new_option;
+                break;
+            }
+        }
+    }
+}
+
 use super::PromptEvent as MenuEvent;
 
 impl<T: Item + 'static> Component for Menu<T> {

From 598bd8bf11b0f6ee6cf8b59c3415fa0d5d6cd1ff Mon Sep 17 00:00:00 2001
From: ath3 <45574139+ath3@users.noreply.github.com>
Date: Fri, 18 Nov 2022 21:13:13 +0100
Subject: [PATCH 516/884] Update tree-sitter-cmake (#4809)

---
 languages.toml                        | 2 +-
 runtime/queries/cmake/textobjects.scm | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/languages.toml b/languages.toml
index c40b0d50..47d77fee 100644
--- a/languages.toml
+++ b/languages.toml
@@ -831,7 +831,7 @@ injection-regex = "cmake"
 
 [[grammar]]
 name = "cmake"
-source = { git = "https://github.com/uyha/tree-sitter-cmake", rev = "f6616f1e417ee8b62daf251aa1daa5d73781c596" }
+source = { git = "https://github.com/uyha/tree-sitter-cmake", rev = "6e51463ef3052dd3b328322c22172eda093727ad" }
 
 [[language]]
 name = "make"
diff --git a/runtime/queries/cmake/textobjects.scm b/runtime/queries/cmake/textobjects.scm
index 1fa9ded5..049aa84a 100644
--- a/runtime/queries/cmake/textobjects.scm
+++ b/runtime/queries/cmake/textobjects.scm
@@ -1,4 +1,7 @@
-(macro_def) @function.around
+[
+  (macro_def)
+  (function_def)
+] @function.around
 
 (argument) @parameter.inside
 

From 8be2d1dcbfeff88f47b8bfb9685f2ab45a72efb5 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Fri, 18 Nov 2022 22:14:36 -0600
Subject: [PATCH 517/884] Handle language server termination (#4797)

This change handles a language server exiting. This was a UX sore-spot:
if a language server crashed, Helix did not recognize the exit and
continued to send requests to it. All requests would timeout since they
would not receive responses. This would also hold-up Helix closing
itself down since it would try to gracefully shutdown the server which
is implemented in the LSP spec as a request.

We could attempt to automatically restart the language server on crash.
I left this for future work since that change will need to be slightly
complicated: it will need to cover the case of a language server
repeatedly crashing.
---
 helix-lsp/src/lib.rs          |  7 +++++++
 helix-lsp/src/transport.rs    | 20 ++++++++++++++++++++
 helix-term/src/application.rs | 26 ++++++++++++++++++++++++++
 3 files changed, 53 insertions(+)

diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index feeedc96..5de76c6c 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -282,6 +282,8 @@ impl MethodCall {
 pub enum Notification {
     // we inject this notification to signal the LSP is ready
     Initialized,
+    // and this notification to signal that the LSP exited
+    Exit,
     PublishDiagnostics(lsp::PublishDiagnosticsParams),
     ShowMessage(lsp::ShowMessageParams),
     LogMessage(lsp::LogMessageParams),
@@ -294,6 +296,7 @@ impl Notification {
 
         let notification = match method {
             lsp::notification::Initialized::METHOD => Self::Initialized,
+            lsp::notification::Exit::METHOD => Self::Exit,
             lsp::notification::PublishDiagnostics::METHOD => {
                 let params: lsp::PublishDiagnosticsParams = params.parse()?;
                 Self::PublishDiagnostics(params)
@@ -350,6 +353,10 @@ impl Registry {
             .map(|(_, client)| client.as_ref())
     }
 
+    pub fn remove_by_id(&mut self, id: usize) {
+        self.inner.retain(|_, (client_id, _)| client_id != &id)
+    }
+
     pub fn restart(
         &mut self,
         language_config: &LanguageConfiguration,
diff --git a/helix-lsp/src/transport.rs b/helix-lsp/src/transport.rs
index 8aaeae3d..68b3d15e 100644
--- a/helix-lsp/src/transport.rs
+++ b/helix-lsp/src/transport.rs
@@ -250,6 +250,26 @@ impl Transport {
                         }
                     };
                 }
+                Err(Error::StreamClosed) => {
+                    // Hack: inject a terminated notification so we trigger code that needs to happen after exit
+                    use lsp_types::notification::Notification as _;
+                    let notification =
+                        ServerMessage::Call(jsonrpc::Call::Notification(jsonrpc::Notification {
+                            jsonrpc: None,
+                            method: lsp_types::notification::Exit::METHOD.to_string(),
+                            params: jsonrpc::Params::None,
+                        }));
+                    match transport
+                        .process_server_message(&client_tx, notification)
+                        .await
+                    {
+                        Ok(_) => {}
+                        Err(err) => {
+                            error!("err: <- {:?}", err);
+                        }
+                    }
+                    break;
+                }
                 Err(err) => {
                     error!("err: <- {:?}", err);
                     break;
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 39a6532d..99d3af18 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -871,6 +871,32 @@ impl Application {
                     Notification::ProgressMessage(_params) => {
                         // do nothing
                     }
+                    Notification::Exit => {
+                        self.editor.set_status("Language server exited");
+
+                        // Clear any diagnostics for documents with this server open.
+                        let urls: Vec<_> = self
+                            .editor
+                            .documents_mut()
+                            .filter_map(|doc| {
+                                if doc.language_server().map(|server| server.id())
+                                    == Some(server_id)
+                                {
+                                    doc.set_diagnostics(Vec::new());
+                                    doc.url()
+                                } else {
+                                    None
+                                }
+                            })
+                            .collect();
+
+                        for url in urls {
+                            self.editor.diagnostics.remove(&url);
+                        }
+
+                        // Remove the language server from the registry.
+                        self.editor.language_servers.remove_by_id(server_id);
+                    }
                 }
             }
             Call::MethodCall(helix_lsp::jsonrpc::MethodCall {

From a640ab6b1f8aa3d968712acdd085feb48d81feb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Sat, 19 Nov 2022 15:41:03 +0900
Subject: [PATCH 518/884] Avoid repeatedly loading config

---
 helix-term/src/ui/editor.rs     | 17 +++++------------
 helix-term/src/ui/statusline.rs | 13 ++++++++-----
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index f2a588e3..1989e0f8 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -82,6 +82,7 @@ impl EditorView {
         let inner = view.inner_area(doc);
         let area = view.area;
         let theme = &editor.theme;
+        let config = editor.config();
 
         // DAP: Highlight current stack frame position
         let stack_frame = editor.debugger.as_ref().and_then(|debugger| {
@@ -117,10 +118,10 @@ impl EditorView {
             }
         }
 
-        if is_focused && editor.config().cursorline {
+        if is_focused && config.cursorline {
             Self::highlight_cursorline(doc, view, surface, theme);
         }
-        if is_focused && editor.config().cursorcolumn {
+        if is_focused && config.cursorcolumn {
             Self::highlight_cursorcolumn(doc, view, surface, theme);
         }
 
@@ -141,22 +142,14 @@ impl EditorView {
                     doc,
                     view,
                     theme,
-                    &editor.config().cursor_shape,
+                    &config.cursor_shape,
                 ),
             ))
         } else {
             Box::new(highlights)
         };
 
-        Self::render_text_highlights(
-            doc,
-            view.offset,
-            inner,
-            surface,
-            theme,
-            highlights,
-            &editor.config(),
-        );
+        Self::render_text_highlights(doc, view.offset, inner, surface, theme, highlights, &config);
         Self::render_gutter(editor, doc, view, view.area, surface, theme, is_focused);
         Self::render_rulers(editor, doc, view, inner, surface, theme);
 
diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index 6ea0570d..501faea3 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -69,7 +69,9 @@ pub fn render(context: &mut RenderContext, viewport: Rect, surface: &mut Surface
 
     // Left side of the status line.
 
-    let element_ids = &context.editor.config().statusline.left;
+    let config = context.editor.config();
+
+    let element_ids = &config.statusline.left;
     element_ids
         .iter()
         .map(|element_id| get_render_function(*element_id))
@@ -84,7 +86,7 @@ pub fn render(context: &mut RenderContext, viewport: Rect, surface: &mut Surface
 
     // Right side of the status line.
 
-    let element_ids = &context.editor.config().statusline.right;
+    let element_ids = &config.statusline.right;
     element_ids
         .iter()
         .map(|element_id| get_render_function(*element_id))
@@ -102,7 +104,7 @@ pub fn render(context: &mut RenderContext, viewport: Rect, surface: &mut Surface
 
     // Center of the status line.
 
-    let element_ids = &context.editor.config().statusline.center;
+    let element_ids = &config.statusline.center;
     element_ids
         .iter()
         .map(|element_id| get_render_function(*element_id))
@@ -160,7 +162,8 @@ where
     F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
 {
     let visible = context.focused;
-    let modenames = &context.editor.config().statusline.mode;
+    let config = context.editor.config();
+    let modenames = &config.statusline.mode;
     write(
         context,
         format!(
@@ -176,7 +179,7 @@ where
                 "   "
             }
         ),
-        if visible && context.editor.config().color_modes {
+        if visible && config.color_modes {
             match context.editor.mode() {
                 Mode::Insert => Some(context.editor.theme.get("ui.statusline.insert")),
                 Mode::Select => Some(context.editor.theme.get("ui.statusline.select")),

From 7e99087fa36fd49b350311ebdbc3b9338794746b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Sat, 19 Nov 2022 15:41:55 +0900
Subject: [PATCH 519/884] minor: render_diagnostics doesn't require &self
 either

---
 helix-term/src/ui/editor.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 1989e0f8..6c8ee2d9 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -169,7 +169,7 @@ impl EditorView {
             }
         }
 
-        self.render_diagnostics(doc, view, inner, surface, theme);
+        Self::render_diagnostics(doc, view, inner, surface, theme);
 
         let statusline_area = view
             .area
@@ -765,7 +765,6 @@ impl EditorView {
     }
 
     pub fn render_diagnostics(
-        &self,
         doc: &Document,
         view: &View,
         viewport: Rect,

From 0e23e4f882ec840bed0e2c1ef3723deb7a258801 Mon Sep 17 00:00:00 2001
From: Lennard Hofmann <lennard.hofmann@web.de>
Date: Sat, 19 Nov 2022 18:08:03 +0100
Subject: [PATCH 520/884] Make `r<tab>` and `f<tab>` work (#4817)

Previously, commands such as `r<tab>` (replace with tab) or `t<tab>`
(select till tab) had no effect. This is because `KeyCode::Tab` needs
special treatment (like `KeyCode::Enter`).
---
 helix-term/src/commands.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index b00e02b9..1b0c557e 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1131,6 +1131,10 @@ where
                 doc!(cx.editor).line_ending.as_str().chars().next().unwrap()
             }
 
+            KeyEvent {
+                code: KeyCode::Tab, ..
+            } => '\t',
+
             KeyEvent {
                 code: KeyCode::Char(ch),
                 ..
@@ -1277,6 +1281,9 @@ fn replace(cx: &mut Context) {
                 code: KeyCode::Enter,
                 ..
             } => Some(doc.line_ending.as_str()),
+            KeyEvent {
+                code: KeyCode::Tab, ..
+            } => Some("\t"),
             _ => None,
         };
 

From 46eb185d45c22f95de36b8467f323247cdb76fda Mon Sep 17 00:00:00 2001
From: Matthew Toohey <contact@mtoohey.com>
Date: Sat, 19 Nov 2022 20:54:47 -0500
Subject: [PATCH 521/884] build(nix): update nci (#4823)

---
 flake.lock | 71 ++++++++++++++----------------------------------------
 1 file changed, 18 insertions(+), 53 deletions(-)

diff --git a/flake.lock b/flake.lock
index 74206d2b..99f92fc5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,22 +1,5 @@
 {
   "nodes": {
-    "all-cabal-json": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1665552503,
-        "narHash": "sha256-r14RmRSwzv5c+bWKUDaze6pXM7nOsiz1H8nvFHJvufc=",
-        "owner": "nix-community",
-        "repo": "all-cabal-json",
-        "rev": "d7c0434eebffb305071404edcf9d5cd99703878e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "hackage",
-        "repo": "all-cabal-json",
-        "type": "github"
-      }
-    },
     "crane": {
       "flake": false,
       "locked": {
@@ -52,47 +35,45 @@
     "dream2nix": {
       "inputs": {
         "alejandra": [
-          "nci",
-          "nixpkgs"
+          "nci"
+        ],
+        "all-cabal-json": [
+          "nci"
         ],
-        "all-cabal-json": "all-cabal-json",
         "crane": "crane",
         "devshell": [
           "nci",
           "devshell"
         ],
         "flake-utils-pre-commit": [
-          "nci",
-          "nixpkgs"
+          "nci"
+        ],
+        "ghc-utils": [
+          "nci"
         ],
-        "ghc-utils": "ghc-utils",
         "gomod2nix": [
-          "nci",
-          "nixpkgs"
+          "nci"
         ],
         "mach-nix": [
-          "nci",
-          "nixpkgs"
+          "nci"
         ],
         "nixpkgs": [
           "nci",
           "nixpkgs"
         ],
         "poetry2nix": [
-          "nci",
-          "nixpkgs"
+          "nci"
         ],
         "pre-commit-hooks": [
-          "nci",
-          "nixpkgs"
+          "nci"
         ]
       },
       "locked": {
-        "lastModified": 1667429039,
-        "narHash": "sha256-Lu6da25JioHzerkLHAHSO9suCQFzJ/XBjkcGCIbasLM=",
+        "lastModified": 1668794409,
+        "narHash": "sha256-co+RtudWse5HozC69bbfvnAFkqocI/QesKpOBPv+J6A=",
         "owner": "nix-community",
         "repo": "dream2nix",
-        "rev": "5252794e58eedb02d607fa3187ffead7becc81b0",
+        "rev": "c17875d97f330ce1ed0c2e54ea964ce05e4c1d3c",
         "type": "github"
       },
       "original": {
@@ -116,22 +97,6 @@
         "type": "github"
       }
     },
-    "ghc-utils": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1662774800,
-        "narHash": "sha256-1Rd2eohGUw/s1tfvkepeYpg8kCEXiIot0RijapUjAkE=",
-        "ref": "refs/heads/master",
-        "rev": "bb3a2d3dc52ff0253fb9c2812bd7aa2da03e0fea",
-        "revCount": 1072,
-        "type": "git",
-        "url": "https://gitlab.haskell.org/bgamari/ghc-utils"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://gitlab.haskell.org/bgamari/ghc-utils"
-      }
-    },
     "nci": {
       "inputs": {
         "devshell": "devshell",
@@ -144,11 +109,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1667542401,
-        "narHash": "sha256-mdWjP5tjSf8n6FAtpSgL23kX4+eWBwLrSYo9iY3mA8Q=",
+        "lastModified": 1668871650,
+        "narHash": "sha256-jXNn1sTMDcJhx9L/tXejk00Lb+rHZzj1S0oxEB9omjw=",
         "owner": "yusdacra",
         "repo": "nix-cargo-integration",
-        "rev": "cd5e5cbd81c80dc219455dd3b1e0ddb55fae51ec",
+        "rev": "0121135dcd9d9a9c6bf1e89194b49c84bf4627ef",
         "type": "github"
       },
       "original": {

From 8dac863a5b5b7fac08022a14f031fcf3c479a298 Mon Sep 17 00:00:00 2001
From: Filipe Azevedo <filipe@azevedo.io>
Date: Sun, 20 Nov 2022 18:39:26 +0000
Subject: [PATCH 522/884] Add `:reload-all` command (#4663)

---
 book/src/generated/typable-cmd.md |  1 +
 helix-term/src/commands/typed.rs  | 51 +++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index b7496d33..6390ef85 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -44,6 +44,7 @@
 | `:show-directory`, `:pwd` | Show the current working directory. |
 | `:encoding` | Set encoding. Based on `https://encoding.spec.whatwg.org`. |
 | `:reload` | Discard changes and reload from the source file. |
+| `:reload-all` | Discard changes and reload all documents from the source files. |
 | `:update` | Write changes only if the file has been modified. |
 | `:lsp-workspace-command` | Open workspace command picker |
 | `:lsp-restart` | Restarts the Language Server that is in use by the current doc |
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 4bbb2082..b8f99ff3 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1034,6 +1034,50 @@ fn reload(
     })
 }
 
+fn reload_all(
+    cx: &mut compositor::Context,
+    _args: &[Cow<str>],
+    event: PromptEvent,
+) -> anyhow::Result<()> {
+    if event != PromptEvent::Validate {
+        return Ok(());
+    }
+
+    let scrolloff = cx.editor.config().scrolloff;
+    let view_id = view!(cx.editor).id;
+
+    let docs_view_ids: Vec<(DocumentId, Vec<ViewId>)> = cx
+        .editor
+        .documents_mut()
+        .map(|doc| {
+            let mut view_ids: Vec<_> = doc.selections().keys().cloned().collect();
+
+            if view_ids.is_empty() {
+                doc.ensure_view_init(view_id);
+                view_ids.push(view_id);
+            };
+
+            (doc.id(), view_ids)
+        })
+        .collect();
+
+    for (doc_id, view_ids) in docs_view_ids {
+        let doc = doc_mut!(cx.editor, &doc_id);
+
+        // Every doc is guaranteed to have at least 1 view at this point.
+        let view = view_mut!(cx.editor, view_ids[0]);
+        doc.reload(view)?;
+
+        for view_id in view_ids {
+            let view = view_mut!(cx.editor, view_id);
+
+            view.ensure_cursor_in_view(doc, scrolloff);
+        }
+    }
+
+    Ok(())
+}
+
 /// Update the [`Document`] if it has been modified.
 fn update(
     cx: &mut compositor::Context,
@@ -2051,6 +2095,13 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
             fun: reload,
             completer: None,
         },
+        TypableCommand {
+            name: "reload-all",
+            aliases: &[],
+            doc: "Discard changes and reload all documents from the source files.",
+            fun: reload_all,
+            completer: None,
+        },
         TypableCommand {
             name: "update",
             aliases: &[],

From 117239ea4501bc655d3efd36252c41b42cb6f281 Mon Sep 17 00:00:00 2001
From: Chickenkeeper <artofchrism@gmail.com>
Date: Sun, 20 Nov 2022 18:51:58 +0000
Subject: [PATCH 523/884] Fix broken html doctype highlighting (#4829)

---
 runtime/queries/html/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/queries/html/highlights.scm b/runtime/queries/html/highlights.scm
index fff015b5..99f39c95 100644
--- a/runtime/queries/html/highlights.scm
+++ b/runtime/queries/html/highlights.scm
@@ -14,6 +14,7 @@
   ">"
   "</"
   "/>"
+  "<!"
 ] @punctuation.bracket
 
 "=" @punctuation.delimiter

From 420e33a60064ad86e9f2f8dd29b3938318355673 Mon Sep 17 00:00:00 2001
From: Sora <s0la.luladust@gmail.com>
Date: Mon, 21 Nov 2022 01:36:19 +0100
Subject: [PATCH 524/884] Implement simple indents.scm for Elixir (#4821)

---
 book/src/generated/lang-support.md |  2 +-
 runtime/queries/elixir/indents.scm | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/elixir/indents.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 9187fbfb..59b60851 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -25,7 +25,7 @@
 | edoc | ✓ |  |  |  |
 | eex | ✓ |  |  |  |
 | ejs | ✓ |  |  |  |
-| elixir | ✓ | ✓ |  | `elixir-ls` |
+| elixir | ✓ | ✓ | ✓ | `elixir-ls` |
 | elm | ✓ |  |  | `elm-language-server` |
 | elvish | ✓ |  |  | `elvish` |
 | env | ✓ |  |  |  |
diff --git a/runtime/queries/elixir/indents.scm b/runtime/queries/elixir/indents.scm
new file mode 100644
index 00000000..102b1aad
--- /dev/null
+++ b/runtime/queries/elixir/indents.scm
@@ -0,0 +1,13 @@
+[
+  (after_block)
+  (anonymous_function)
+  (catch_block)
+  (do_block)
+  (else_block)
+  (rescue_block)
+  (stab_clause)
+] @indent
+
+[
+  "end"
+] @outdent

From 2f9ca3840a478fc58f411b6a4bc67019829ff72f Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Mon, 21 Nov 2022 03:58:35 +0200
Subject: [PATCH 525/884] Add preview for scratch buffers in buffer picker
 (#3454)

---
 helix-term/src/commands.rs     |   6 +-
 helix-term/src/commands/dap.rs |   4 +-
 helix-term/src/commands/lsp.rs |   2 +-
 helix-term/src/ui/mod.rs       |   2 +-
 helix-term/src/ui/picker.rs    | 129 +++++++++++++++++++++------------
 5 files changed, 88 insertions(+), 55 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 1b0c557e..25f00f98 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2005,7 +2005,7 @@ fn global_search(cx: &mut Context) {
                         align_view(doc, view, Align::Center);
                     },
                     |_editor, FileResult { path, line_num }| {
-                        Some((path.clone(), Some((*line_num, *line_num))))
+                        Some((path.clone().into(), Some((*line_num, *line_num))))
                     },
                 );
                 compositor.push(Box::new(overlayed(picker)));
@@ -2360,7 +2360,7 @@ fn buffer_picker(cx: &mut Context) {
                 .selection(view_id)
                 .primary()
                 .cursor_line(doc.text().slice(..));
-            Some((meta.path.clone()?, Some((line, line))))
+            Some((meta.id.into(), Some((line, line))))
         },
     );
     cx.push_layer(Box::new(overlayed(picker)));
@@ -2441,7 +2441,7 @@ fn jumplist_picker(cx: &mut Context) {
         |editor, meta| {
             let doc = &editor.documents.get(&meta.id)?;
             let line = meta.selection.primary().cursor_line(doc.text().slice(..));
-            Some((meta.path.clone()?, Some((line, line))))
+            Some((meta.path.clone()?.into(), Some((line, line))))
         },
     );
     cx.push_layer(Box::new(overlayed(picker)));
diff --git a/helix-term/src/commands/dap.rs b/helix-term/src/commands/dap.rs
index c27417e3..b182f28c 100644
--- a/helix-term/src/commands/dap.rs
+++ b/helix-term/src/commands/dap.rs
@@ -85,7 +85,7 @@ fn thread_picker(
                         frame.line.saturating_sub(1),
                         frame.end_line.unwrap_or(frame.line).saturating_sub(1),
                     ));
-                    Some((path, pos))
+                    Some((path.into(), pos))
                 },
             );
             compositor.push(Box::new(picker));
@@ -706,7 +706,7 @@ pub fn dap_switch_stack_frame(cx: &mut Context) {
                 .and_then(|source| source.path.clone())
                 .map(|path| {
                     (
-                        path,
+                        path.into(),
                         Some((
                             frame.line.saturating_sub(1),
                             frame.end_line.unwrap_or(frame.line).saturating_sub(1),
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 33d33440..dcabfab1 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -156,7 +156,7 @@ fn location_to_file_location(location: &lsp::Location) -> FileLocation {
         location.range.start.line as usize,
         location.range.end.line as usize,
     ));
-    (path, line)
+    (path.into(), line)
 }
 
 // TODO: share with symbol picker(symbol.location)
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index cca9e9bf..3416b319 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -230,7 +230,7 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
                 cx.editor.set_error(err);
             }
         },
-        |_editor, path| Some((path.clone(), None)),
+        |_editor, path| Some((path.clone().into(), None)),
     )
 }
 
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 54911924..5e9ca3d8 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -12,18 +12,14 @@ use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
 use tui::widgets::Widget;
 
 use std::{cmp::Ordering, time::Instant};
-use std::{
-    collections::HashMap,
-    io::Read,
-    path::{Path, PathBuf},
-};
+use std::{collections::HashMap, io::Read, path::PathBuf};
 
 use crate::ui::{Prompt, PromptEvent};
 use helix_core::{movement::Direction, Position};
 use helix_view::{
     editor::Action,
     graphics::{CursorKind, Margin, Modifier, Rect},
-    Document, Editor,
+    Document, DocumentId, Editor,
 };
 
 use super::menu::Item;
@@ -32,8 +28,36 @@ pub const MIN_AREA_WIDTH_FOR_PREVIEW: u16 = 72;
 /// Biggest file size to preview in bytes
 pub const MAX_FILE_SIZE_FOR_PREVIEW: u64 = 10 * 1024 * 1024;
 
+#[derive(PartialEq, Eq, Hash)]
+pub enum PathOrId {
+    Id(DocumentId),
+    Path(PathBuf),
+}
+
+impl PathOrId {
+    fn get_canonicalized(self) -> std::io::Result<Self> {
+        use PathOrId::*;
+        Ok(match self {
+            Path(path) => Path(helix_core::path::get_canonicalized_path(&path)?),
+            Id(id) => Id(id),
+        })
+    }
+}
+
+impl From<PathBuf> for PathOrId {
+    fn from(v: PathBuf) -> Self {
+        Self::Path(v)
+    }
+}
+
+impl From<DocumentId> for PathOrId {
+    fn from(v: DocumentId) -> Self {
+        Self::Id(v)
+    }
+}
+
 /// File path and range of lines (used to align and highlight lines)
-pub type FileLocation = (PathBuf, Option<(usize, usize)>);
+pub type FileLocation = (PathOrId, Option<(usize, usize)>);
 
 pub struct FilePicker<T: Item> {
     picker: Picker<T>,
@@ -112,62 +136,71 @@ impl<T: Item> FilePicker<T> {
         self.picker
             .selection()
             .and_then(|current| (self.file_fn)(editor, current))
-            .and_then(|(path, line)| {
-                helix_core::path::get_canonicalized_path(&path)
-                    .ok()
-                    .zip(Some(line))
-            })
+            .and_then(|(path_or_id, line)| path_or_id.get_canonicalized().ok().zip(Some(line)))
     }
 
     /// Get (cached) preview for a given path. If a document corresponding
     /// to the path is already open in the editor, it is used instead.
     fn get_preview<'picker, 'editor>(
         &'picker mut self,
-        path: &Path,
+        path_or_id: PathOrId,
         editor: &'editor Editor,
     ) -> Preview<'picker, 'editor> {
-        if let Some(doc) = editor.document_by_path(path) {
-            return Preview::EditorDocument(doc);
-        }
+        match path_or_id {
+            PathOrId::Path(path) => {
+                let path = &path;
+                if let Some(doc) = editor.document_by_path(path) {
+                    return Preview::EditorDocument(doc);
+                }
 
-        if self.preview_cache.contains_key(path) {
-            return Preview::Cached(&self.preview_cache[path]);
-        }
+                if self.preview_cache.contains_key(path) {
+                    return Preview::Cached(&self.preview_cache[path]);
+                }
 
-        let data = std::fs::File::open(path).and_then(|file| {
-            let metadata = file.metadata()?;
-            // Read up to 1kb to detect the content type
-            let n = file.take(1024).read_to_end(&mut self.read_buffer)?;
-            let content_type = content_inspector::inspect(&self.read_buffer[..n]);
-            self.read_buffer.clear();
-            Ok((metadata, content_type))
-        });
-        let preview = data
-            .map(
-                |(metadata, content_type)| match (metadata.len(), content_type) {
-                    (_, content_inspector::ContentType::BINARY) => CachedPreview::Binary,
-                    (size, _) if size > MAX_FILE_SIZE_FOR_PREVIEW => CachedPreview::LargeFile,
-                    _ => {
-                        // TODO: enable syntax highlighting; blocked by async rendering
-                        Document::open(path, None, None)
-                            .map(|doc| CachedPreview::Document(Box::new(doc)))
-                            .unwrap_or(CachedPreview::NotFound)
-                    }
-                },
-            )
-            .unwrap_or(CachedPreview::NotFound);
-        self.preview_cache.insert(path.to_owned(), preview);
-        Preview::Cached(&self.preview_cache[path])
+                let data = std::fs::File::open(path).and_then(|file| {
+                    let metadata = file.metadata()?;
+                    // Read up to 1kb to detect the content type
+                    let n = file.take(1024).read_to_end(&mut self.read_buffer)?;
+                    let content_type = content_inspector::inspect(&self.read_buffer[..n]);
+                    self.read_buffer.clear();
+                    Ok((metadata, content_type))
+                });
+                let preview = data
+                    .map(
+                        |(metadata, content_type)| match (metadata.len(), content_type) {
+                            (_, content_inspector::ContentType::BINARY) => CachedPreview::Binary,
+                            (size, _) if size > MAX_FILE_SIZE_FOR_PREVIEW => {
+                                CachedPreview::LargeFile
+                            }
+                            _ => {
+                                // TODO: enable syntax highlighting; blocked by async rendering
+                                Document::open(path, None, None)
+                                    .map(|doc| CachedPreview::Document(Box::new(doc)))
+                                    .unwrap_or(CachedPreview::NotFound)
+                            }
+                        },
+                    )
+                    .unwrap_or(CachedPreview::NotFound);
+                self.preview_cache.insert(path.to_owned(), preview);
+                Preview::Cached(&self.preview_cache[path])
+            }
+            PathOrId::Id(id) => {
+                let doc = editor.documents.get(&id).unwrap();
+                Preview::EditorDocument(doc)
+            }
+        }
     }
 
     fn handle_idle_timeout(&mut self, cx: &mut Context) -> EventResult {
         // Try to find a document in the cache
         let doc = self
             .current_file(cx.editor)
-            .and_then(|(path, _range)| self.preview_cache.get_mut(&path))
-            .and_then(|cache| match cache {
-                CachedPreview::Document(doc) => Some(doc),
-                _ => None,
+            .and_then(|(path, _range)| match path {
+                PathOrId::Id(doc_id) => Some(doc_mut!(cx.editor, &doc_id)),
+                PathOrId::Path(path) => match self.preview_cache.get_mut(&path) {
+                    Some(CachedPreview::Document(doc)) => Some(doc),
+                    _ => None,
+                },
             });
 
         // Then attempt to highlight it if it has no language set
@@ -224,7 +257,7 @@ impl<T: Item + 'static> Component for FilePicker<T> {
         block.render(preview_area, surface);
 
         if let Some((path, range)) = self.current_file(cx.editor) {
-            let preview = self.get_preview(&path, cx.editor);
+            let preview = self.get_preview(path, cx.editor);
             let doc = match preview.document() {
                 Some(doc) => doc,
                 None => {

From bbde897ac39991620a9b6e9e5c742ab3b97b1fbe Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 20 Nov 2022 20:49:44 -0600
Subject: [PATCH 526/884] Select new pasted text in normal mode only (#4824)

d6323b7cbc21a9d3ba29738c76581dad93f9f415 changed the behavior of paste
to select the newly inserted text. This is preferrable in normal mode
because it's useful to be able to act on the new text. This behavior
is worse for insert or select mode though:

* In insert mode, the cursor ends up on the last character of the newly
  selected text, so further typing inserts text before the last
  character.
* In select mode, the current selection is replaced with the new text
  selection which doesn't extend the current selection. With this
  change, the selection is extended to include the new text.

This aligns the behavior more closely with Kakoune, but it's
coincidental instead of intentional: Kakoune doesn't implement
bracketed paste (AFAIK) which causes this behavior in insert mode,
and Kakoune doesn't have a select mode.
---
 helix-term/src/commands.rs | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 25f00f98..bf822944 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3467,7 +3467,14 @@ enum Paste {
     Cursor,
 }
 
-fn paste_impl(values: &[String], doc: &mut Document, view: &mut View, action: Paste, count: usize) {
+fn paste_impl(
+    values: &[String],
+    doc: &mut Document,
+    view: &mut View,
+    action: Paste,
+    count: usize,
+    mode: Mode,
+) {
     if values.is_empty() {
         return;
     }
@@ -3499,7 +3506,7 @@ fn paste_impl(values: &[String], doc: &mut Document, view: &mut View, action: Pa
     let mut offset = 0;
     let mut ranges = SmallVec::with_capacity(selection.len());
 
-    let transaction = Transaction::change_by_selection(text, selection, |range| {
+    let mut transaction = Transaction::change_by_selection(text, selection, |range| {
         let pos = match (action, linewise) {
             // paste linewise before
             (Paste::Before, true) => text.line_to_char(text.char_to_line(range.from())),
@@ -3531,7 +3538,9 @@ fn paste_impl(values: &[String], doc: &mut Document, view: &mut View, action: Pa
         (pos, pos, value)
     });
 
-    let transaction = transaction.with_selection(Selection::new(ranges, selection.primary_index()));
+    if mode == Mode::Normal {
+        transaction = transaction.with_selection(Selection::new(ranges, selection.primary_index()));
+    }
 
     apply_transaction(&transaction, doc, view);
 }
@@ -3543,7 +3552,7 @@ pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {
         Mode::Normal => Paste::Before,
     };
     let (view, doc) = current!(cx.editor);
-    paste_impl(&[contents], doc, view, paste, count);
+    paste_impl(&[contents], doc, view, paste, count, cx.editor.mode);
 }
 
 fn paste_clipboard_impl(
@@ -3555,7 +3564,7 @@ fn paste_clipboard_impl(
     let (view, doc) = current!(editor);
     match editor.clipboard_provider.get_contents(clipboard_type) {
         Ok(contents) => {
-            paste_impl(&[contents], doc, view, action, count);
+            paste_impl(&[contents], doc, view, action, count, editor.mode);
             Ok(())
         }
         Err(e) => Err(e.context("Couldn't get system clipboard contents")),
@@ -3674,7 +3683,7 @@ fn paste(cx: &mut Context, pos: Paste) {
     let registers = &mut cx.editor.registers;
 
     if let Some(values) = registers.read(reg_name) {
-        paste_impl(values, doc, view, pos, count);
+        paste_impl(values, doc, view, pos, count, cx.editor.mode);
     }
 }
 

From 0b2bb061b95b60c51f018f541e622b731ddd14ef Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 21 Nov 2022 03:13:59 -0600
Subject: [PATCH 527/884] Bump TREE_SITTER_MATCH_LIMIT to 256 (#4830)

The limit of 64 breaks some highlighting in Erlang files with
complicated record definitions. Bumping to 256  seems to work on all
files I have seen.
---
 helix-core/src/syntax.rs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 93bd7fe9..b567a8ab 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -354,24 +354,25 @@ impl<'a> CapturedNode<'a> {
     }
 }
 
-/// The number of matches a TS cursor can at once to avoid performance problems for medium to large files.
-/// Set with `set_match_limit`.
-/// Using such a limit means that we lose valid captures in, so there is fundamentally a tradeoff here.
+/// The maximum number of in-progress matches a TS cursor can consider at once.
+/// This is set to a constant in order to avoid performance problems for medium to large files. Set with `set_match_limit`.
+/// Using such a limit means that we lose valid captures, so there is fundamentally a tradeoff here.
 ///
 ///
 /// Old tree sitter versions used a limit of 32 by default until this limit was removed in version `0.19.5` (must now be set manually).
 /// However, this causes performance issues for medium to large files.
 /// In helix, this problem caused treesitter motions to take multiple seconds to complete in medium-sized rust files (3k loc).
+///
+///
 /// Neovim also encountered this problem and reintroduced this limit after it was removed upstream
 /// (see <https://github.com/neovim/neovim/issues/14897> and <https://github.com/neovim/neovim/pull/14915>).
 /// The number used here is fundamentally a tradeoff between breaking some obscure edge cases and performance.
 ///
 ///
-/// A value of 64 was chosen because neovim uses that value.
-/// Neovim chose this value somewhat arbitrarily (<https://github.com/neovim/neovim/pull/18397>) adjusting it whenever issues occur in practice.
-/// However this value has been in use for a long time and due to the large userbase of neovim it is probably a good choice.
-/// If this limit causes problems for a grammar in the future, it could be increased.
-const TREE_SITTER_MATCH_LIMIT: u32 = 64;
+/// Neovim chose 64 for this value somewhat arbitrarily (<https://github.com/neovim/neovim/pull/18397>).
+/// 64 is too low for some languages though. In particular, it breaks some highlighting for record fields in Erlang record definitions.
+/// This number can be increased if new syntax highlight breakages are found, as long as the performance penalty is not too high.
+const TREE_SITTER_MATCH_LIMIT: u32 = 256;
 
 impl TextObjectQuery {
     /// Run the query on the given node and return sub nodes which match given

From 48e44720e4001e9d2feef7f4a24c1b10d43ad7df Mon Sep 17 00:00:00 2001
From: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
Date: Mon, 21 Nov 2022 18:06:43 +0300
Subject: [PATCH 528/884] build(nix): don't run tests in builds since CI runs
 them already, update inputs (#4834)

---
 flake.lock | 24 ++++++++++++------------
 flake.nix  |  3 ++-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/flake.lock b/flake.lock
index 99f92fc5..f097519e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -69,11 +69,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1668794409,
-        "narHash": "sha256-co+RtudWse5HozC69bbfvnAFkqocI/QesKpOBPv+J6A=",
+        "lastModified": 1668851003,
+        "narHash": "sha256-X7RCQQynbxStZR2m7HW38r/msMQwVl3afD6UXOCtvx4=",
         "owner": "nix-community",
         "repo": "dream2nix",
-        "rev": "c17875d97f330ce1ed0c2e54ea964ce05e4c1d3c",
+        "rev": "c77e8379d8fe01213ba072e40946cbfb7b58e628",
         "type": "github"
       },
       "original": {
@@ -109,11 +109,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1668871650,
-        "narHash": "sha256-jXNn1sTMDcJhx9L/tXejk00Lb+rHZzj1S0oxEB9omjw=",
+        "lastModified": 1669011203,
+        "narHash": "sha256-Lymj4HktNEFmVXtwI0Os7srDXHZbZW0Nzw3/+5Hf8ko=",
         "owner": "yusdacra",
         "repo": "nix-cargo-integration",
-        "rev": "0121135dcd9d9a9c6bf1e89194b49c84bf4627ef",
+        "rev": "c5133b91fc1d549087c91228bd213f2518728a4b",
         "type": "github"
       },
       "original": {
@@ -124,11 +124,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1667482890,
-        "narHash": "sha256-pua0jp87iwN7NBY5/ypx0s9L9CG49Ju/NI4wGwurHc4=",
+        "lastModified": 1668905981,
+        "narHash": "sha256-RBQa/+9Uk1eFTqIOXBSBezlEbA3v5OkgP+qptQs1OxY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a2a777538d971c6b01c6e54af89ddd6567c055e8",
+        "rev": "690ffff026b4e635b46f69002c0f4e81c65dfc2e",
         "type": "github"
       },
       "original": {
@@ -153,11 +153,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1667487142,
-        "narHash": "sha256-bVuzLs1ZVggJAbJmEDVO9G6p8BH3HRaolK70KXvnWnU=",
+        "lastModified": 1668998422,
+        "narHash": "sha256-G/BklIplCHZEeDIabaaxqgITdIXtMolRGlwxn9jG2/Q=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "cf668f737ac986c0a89e83b6b2e3c5ddbd8cf33b",
+        "rev": "68ab029c93f8f8eed4cf3ce9a89a9fd4504b2d6e",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index b1d3f01e..fe1c6b44 100644
--- a/flake.nix
+++ b/flake.nix
@@ -150,6 +150,7 @@
                 ["languages.toml" "theme.toml" "base16_theme.toml"]
               }
             '';
+            checkPhase = ":";
 
             meta.mainProgram = "hx";
           };
@@ -166,7 +167,7 @@
             packages
             // {
               helix-unwrapped = packages.helix.passthru.unwrapped;
-              helix-unwrapped-debug = packages.helix-debug.passthru.unwrapped;
+              helix-unwrapped-dev = packages.helix-dev.passthru.unwrapped;
             }
         )
         outputs.packages;

From 4ef6621c24833e24ab7361f121ba63729bd201cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Nov 2022 17:46:59 -0600
Subject: [PATCH 529/884] build(deps): bump serde_json from 1.0.87 to 1.0.88
 (#4845)

Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.87 to 1.0.88.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.87...v1.0.88)

---
updated-dependencies:
- dependency-name: serde_json
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3a967374..57fdede8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -959,9 +959,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.87"
+version = "1.0.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45"
+checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7"
 dependencies = [
  "itoa",
  "ryu",

From 4443885b38936bc995421509bc25b01f7192a36b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Nov 2022 17:47:45 -0600
Subject: [PATCH 530/884] build(deps): bump cc from 1.0.76 to 1.0.77 (#4844)

Bumps [cc](https://github.com/rust-lang/cc-rs) from 1.0.76 to 1.0.77.
- [Release notes](https://github.com/rust-lang/cc-rs/releases)
- [Commits](https://github.com/rust-lang/cc-rs/compare/1.0.76...1.0.77)

---
updated-dependencies:
- dependency-name: cc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 57fdede8..5833714d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -92,9 +92,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
 
 [[package]]
 name = "cc"
-version = "1.0.76"
+version = "1.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f"
+checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
 
 [[package]]
 name = "cfg-if"

From 8102c3224f8cbf4a8e679377fef6ea98ed337cba Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 21 Nov 2022 19:54:50 -0600
Subject: [PATCH 531/884] Limit the number of items in the jumplist (#4750)

Previously, jumplists could grow unchecked. Every transaction is
applied to jumplist selections to ensure that they are up to date
and within document bounds, so this would cause every edit to become
more expensive as jumplist lengths increased throughout a session.
Setting a maximum number of entries limits the cost.

Vim and Neovim limit their jumplists:

* https://github.com/vim/vim/blob/b298fe6cbae3b240b10dbd55d9c38d0cc8e033d3/src/structs.h#L141
* https://github.com/neovim/neovim/blob/e8cc489accc435076afb4fdf89778b64f0a48473/src/nvim/mark_defs.h#L57

Notably, Kakoune does not. In Kakoune, changes are applied to jumplist
entries lazily as you hit `<C-o>`/`<C-i>` though, so Kakoune doesn't
have the same growing cost concerns. Kakoune also does not have a
concept of a View which limits the cost further.

Vim and Neovim limit to 100. This seems unreasonably high to me so I've
set this to 30 to start. We can increase if this is problematically
low.
---
 helix-term/src/commands.rs |  1 -
 helix-view/src/view.rs     | 26 ++++++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index bf822944..f384612b 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2427,7 +2427,6 @@ fn jumplist_picker(cx: &mut Context) {
             .views()
             .flat_map(|(view, _)| {
                 view.jumps
-                    .get()
                     .iter()
                     .map(|(doc_id, selection)| new_meta(view, *doc_id, selection.clone()))
             })
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index 6da4df1f..8aa4760d 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -3,29 +3,35 @@ use helix_core::{
     pos_at_visual_coords, visual_coords_at_pos, Position, RopeSlice, Selection, Transaction,
 };
 
-use std::fmt;
+use std::{collections::VecDeque, fmt};
+
+const JUMP_LIST_CAPACITY: usize = 30;
 
 type Jump = (DocumentId, Selection);
 
 #[derive(Debug, Clone)]
 pub struct JumpList {
-    jumps: Vec<Jump>,
+    jumps: VecDeque<Jump>,
     current: usize,
 }
 
 impl JumpList {
     pub fn new(initial: Jump) -> Self {
-        Self {
-            jumps: vec![initial],
-            current: 0,
-        }
+        let mut jumps = VecDeque::with_capacity(JUMP_LIST_CAPACITY);
+        jumps.push_back(initial);
+        Self { jumps, current: 0 }
     }
 
     pub fn push(&mut self, jump: Jump) {
         self.jumps.truncate(self.current);
         // don't push duplicates
-        if self.jumps.last() != Some(&jump) {
-            self.jumps.push(jump);
+        if self.jumps.back() != Some(&jump) {
+            // If the jumplist is full, drop the oldest item.
+            while self.jumps.len() >= JUMP_LIST_CAPACITY {
+                self.jumps.pop_front();
+            }
+
+            self.jumps.push_back(jump);
             self.current = self.jumps.len();
         }
     }
@@ -57,8 +63,8 @@ impl JumpList {
         self.jumps.retain(|(other_id, _)| other_id != doc_id);
     }
 
-    pub fn get(&self) -> &[Jump] {
-        &self.jumps
+    pub fn iter(&self) -> impl Iterator<Item = &Jump> {
+        self.jumps.iter()
     }
 
     /// Applies a [`Transaction`] of changes to the jumplist.

From 1db01caec7c91e270a23fd4f85955bb235ffbcb7 Mon Sep 17 00:00:00 2001
From: Bob <QiBaobin@users.noreply.github.com>
Date: Tue, 22 Nov 2022 09:55:46 +0800
Subject: [PATCH 532/884] remove duplicated shell calls (#3465)

---
 helix-term/src/commands.rs | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index f384612b..5b44775b 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4803,15 +4803,24 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
     let mut ranges = SmallVec::with_capacity(selection.len());
     let text = doc.text().slice(..);
 
+    let mut shell_output: Option<Tendril> = None;
     let mut offset = 0isize;
-
     for range in selection.ranges() {
-        let fragment = range.slice(text);
-        let (output, success) = match shell_impl(shell, cmd, pipe.then(|| fragment.into())) {
-            Ok(result) => result,
-            Err(err) => {
-                cx.editor.set_error(err.to_string());
-                return;
+        let (output, success) = if let Some(output) = shell_output.as_ref() {
+            (output.clone(), true)
+        } else {
+            let fragment = range.slice(text);
+            match shell_impl(shell, cmd, pipe.then(|| fragment.into())) {
+                Ok(result) => {
+                    if !pipe {
+                        shell_output = Some(result.0.clone());
+                    }
+                    result
+                }
+                Err(err) => {
+                    cx.editor.set_error(err.to_string());
+                    return;
+                }
             }
         };
 

From 9059c65a5385f6d3cc0bc7f6e3f835ae542635a5 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 21 Nov 2022 20:52:23 -0600
Subject: [PATCH 533/884] lsp: Check server provider capabilities (#3554)

Language Servers may signal that they do not support a method in
the initialization result (server capabilities). We can check these
when making LSP requests and hint in the status line when a method
is not supported by the server. This can also prevent crashes in
servers which assume that clients do not send requests for methods
which are disabled in the server capabilities.

There is an existing pattern the LSP client module where a method
returns `Option<impl Future<Output = Result<_>>>` with `None` signaling
no support in the server. This change extends this pattern to the rest
of the client functions. And we log an error to the statusline for
manually triggered LSP calls which return `None`.
---
 helix-lsp/src/client.rs         | 229 +++++++++++++++++++++++---------
 helix-term/src/commands.rs      |  29 ++--
 helix-term/src/commands/lsp.rs  | 115 +++++++++++++---
 helix-term/src/ui/completion.rs |  17 +--
 4 files changed, 293 insertions(+), 97 deletions(-)

diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 424cbabf..2c2c7c88 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -4,7 +4,6 @@ use crate::{
     Call, Error, OffsetEncoding, Result,
 };
 
-use anyhow::anyhow;
 use helix_core::{find_root, ChangeSet, Rope};
 use lsp_types as lsp;
 use serde::Deserialize;
@@ -546,16 +545,17 @@ impl Client {
         new_text: &Rope,
         changes: &ChangeSet,
     ) -> Option<impl Future<Output = Result<()>>> {
-        // figure out what kind of sync the server supports
-
         let capabilities = self.capabilities.get().unwrap();
 
+        // Return early if the server does not support document sync.
         let sync_capabilities = match capabilities.text_document_sync {
-            Some(lsp::TextDocumentSyncCapability::Kind(kind))
-            | Some(lsp::TextDocumentSyncCapability::Options(lsp::TextDocumentSyncOptions {
-                change: Some(kind),
-                ..
-            })) => kind,
+            Some(
+                lsp::TextDocumentSyncCapability::Kind(kind)
+                | lsp::TextDocumentSyncCapability::Options(lsp::TextDocumentSyncOptions {
+                    change: Some(kind),
+                    ..
+                }),
+            ) => kind,
             // None | SyncOptions { changes: None }
             _ => return None,
         };
@@ -631,8 +631,12 @@ impl Client {
         text_document: lsp::TextDocumentIdentifier,
         position: lsp::Position,
         work_done_token: Option<lsp::ProgressToken>,
-    ) -> impl Future<Output = Result<Value>> {
-        // ) -> Result<Vec<lsp::CompletionItem>> {
+    ) -> Option<impl Future<Output = Result<Value>>> {
+        let capabilities = self.capabilities.get().unwrap();
+
+        // Return early if the server does not support completion.
+        capabilities.completion_provider.as_ref()?;
+
         let params = lsp::CompletionParams {
             text_document_position: lsp::TextDocumentPositionParams {
                 text_document,
@@ -647,14 +651,25 @@ impl Client {
             // lsp::CompletionContext { trigger_kind: , trigger_character: Some(), }
         };
 
-        self.call::<lsp::request::Completion>(params)
+        Some(self.call::<lsp::request::Completion>(params))
     }
 
     pub fn resolve_completion_item(
         &self,
         completion_item: lsp::CompletionItem,
-    ) -> impl Future<Output = Result<Value>> {
-        self.call::<lsp::request::ResolveCompletionItem>(completion_item)
+    ) -> Option<impl Future<Output = Result<Value>>> {
+        let capabilities = self.capabilities.get().unwrap();
+
+        // Return early if the server does not support resolving completion items.
+        match capabilities.completion_provider {
+            Some(lsp::CompletionOptions {
+                resolve_provider: Some(true),
+                ..
+            }) => (),
+            _ => return None,
+        }
+
+        Some(self.call::<lsp::request::ResolveCompletionItem>(completion_item))
     }
 
     pub fn text_document_signature_help(
@@ -665,7 +680,7 @@ impl Client {
     ) -> Option<impl Future<Output = Result<Value>>> {
         let capabilities = self.capabilities.get().unwrap();
 
-        // Return early if signature help is not supported
+        // Return early if the server does not support signature help.
         capabilities.signature_help_provider.as_ref()?;
 
         let params = lsp::SignatureHelpParams {
@@ -686,7 +701,18 @@ impl Client {
         text_document: lsp::TextDocumentIdentifier,
         position: lsp::Position,
         work_done_token: Option<lsp::ProgressToken>,
-    ) -> impl Future<Output = Result<Value>> {
+    ) -> Option<impl Future<Output = Result<Value>>> {
+        let capabilities = self.capabilities.get().unwrap();
+
+        // Return early if the server does not support hover.
+        match capabilities.hover_provider {
+            Some(
+                lsp::HoverProviderCapability::Simple(true)
+                | lsp::HoverProviderCapability::Options(_),
+            ) => (),
+            _ => return None,
+        }
+
         let params = lsp::HoverParams {
             text_document_position_params: lsp::TextDocumentPositionParams {
                 text_document,
@@ -696,7 +722,7 @@ impl Client {
             // lsp::SignatureHelpContext
         };
 
-        self.call::<lsp::request::HoverRequest>(params)
+        Some(self.call::<lsp::request::HoverRequest>(params))
     }
 
     // formatting
@@ -709,13 +735,11 @@ impl Client {
     ) -> Option<impl Future<Output = Result<Vec<lsp::TextEdit>>>> {
         let capabilities = self.capabilities.get().unwrap();
 
-        // check if we're able to format
+        // Return early if the server does not support formatting.
         match capabilities.document_formatting_provider {
-            Some(lsp::OneOf::Left(true)) | Some(lsp::OneOf::Right(_)) => (),
-            // None | Some(false)
+            Some(lsp::OneOf::Left(true) | lsp::OneOf::Right(_)) => (),
             _ => return None,
         };
-        // TODO: return err::unavailable so we can fall back to tree sitter formatting
 
         // merge FormattingOptions with 'config.format'
         let config_format = self
@@ -750,22 +774,20 @@ impl Client {
         })
     }
 
-    pub async fn text_document_range_formatting(
+    pub fn text_document_range_formatting(
         &self,
         text_document: lsp::TextDocumentIdentifier,
         range: lsp::Range,
         options: lsp::FormattingOptions,
         work_done_token: Option<lsp::ProgressToken>,
-    ) -> anyhow::Result<Vec<lsp::TextEdit>> {
+    ) -> Option<impl Future<Output = Result<Vec<lsp::TextEdit>>>> {
         let capabilities = self.capabilities.get().unwrap();
 
-        // check if we're able to format
+        // Return early if the server does not support range formatting.
         match capabilities.document_range_formatting_provider {
-            Some(lsp::OneOf::Left(true)) | Some(lsp::OneOf::Right(_)) => (),
-            // None | Some(false)
-            _ => return Ok(Vec::new()),
+            Some(lsp::OneOf::Left(true) | lsp::OneOf::Right(_)) => (),
+            _ => return None,
         };
-        // TODO: return err::unavailable so we can fall back to tree sitter formatting
 
         let params = lsp::DocumentRangeFormattingParams {
             text_document,
@@ -774,11 +796,13 @@ impl Client {
             work_done_progress_params: lsp::WorkDoneProgressParams { work_done_token },
         };
 
-        let response = self
-            .request::<lsp::request::RangeFormatting>(params)
-            .await?;
+        let request = self.call::<lsp::request::RangeFormatting>(params);
 
-        Ok(response.unwrap_or_default())
+        Some(async move {
+            let json = request.await?;
+            let response: Option<Vec<lsp::TextEdit>> = serde_json::from_value(json)?;
+            Ok(response.unwrap_or_default())
+        })
     }
 
     pub fn text_document_document_highlight(
@@ -786,7 +810,15 @@ impl Client {
         text_document: lsp::TextDocumentIdentifier,
         position: lsp::Position,
         work_done_token: Option<lsp::ProgressToken>,
-    ) -> impl Future<Output = Result<Value>> {
+    ) -> Option<impl Future<Output = Result<Value>>> {
+        let capabilities = self.capabilities.get().unwrap();
+
+        // Return early if the server does not support document highlight.
+        match capabilities.document_highlight_provider {
+            Some(lsp::OneOf::Left(true) | lsp::OneOf::Right(_)) => (),
+            _ => return None,
+        }
+
         let params = lsp::DocumentHighlightParams {
             text_document_position_params: lsp::TextDocumentPositionParams {
                 text_document,
@@ -798,7 +830,7 @@ impl Client {
             },
         };
 
-        self.call::<lsp::request::DocumentHighlightRequest>(params)
+        Some(self.call::<lsp::request::DocumentHighlightRequest>(params))
     }
 
     fn goto_request<
@@ -831,8 +863,20 @@ impl Client {
         text_document: lsp::TextDocumentIdentifier,
         position: lsp::Position,
         work_done_token: Option<lsp::ProgressToken>,
-    ) -> impl Future<Output = Result<Value>> {
-        self.goto_request::<lsp::request::GotoDefinition>(text_document, position, work_done_token)
+    ) -> Option<impl Future<Output = Result<Value>>> {
+        let capabilities = self.capabilities.get().unwrap();
+
+        // Return early if the server does not support goto-definition.
+        match capabilities.definition_provider {
+            Some(lsp::OneOf::Left(true) | lsp::OneOf::Right(_)) => (),
+            _ => return None,
+        }
+
+        Some(self.goto_request::<lsp::request::GotoDefinition>(
+            text_document,
+            position,
+            work_done_token,
+        ))
     }
 
     pub fn goto_type_definition(
@@ -840,12 +884,23 @@ impl Client {
         text_document: lsp::TextDocumentIdentifier,
         position: lsp::Position,
         work_done_token: Option<lsp::ProgressToken>,
-    ) -> impl Future<Output = Result<Value>> {
-        self.goto_request::<lsp::request::GotoTypeDefinition>(
+    ) -> Option<impl Future<Output = Result<Value>>> {
+        let capabilities = self.capabilities.get().unwrap();
+
+        // Return early if the server does not support goto-type-definition.
+        match capabilities.type_definition_provider {
+            Some(
+                lsp::TypeDefinitionProviderCapability::Simple(true)
+                | lsp::TypeDefinitionProviderCapability::Options(_),
+            ) => (),
+            _ => return None,
+        }
+
+        Some(self.goto_request::<lsp::request::GotoTypeDefinition>(
             text_document,
             position,
             work_done_token,
-        )
+        ))
     }
 
     pub fn goto_implementation(
@@ -853,12 +908,23 @@ impl Client {
         text_document: lsp::TextDocumentIdentifier,
         position: lsp::Position,
         work_done_token: Option<lsp::ProgressToken>,
-    ) -> impl Future<Output = Result<Value>> {
-        self.goto_request::<lsp::request::GotoImplementation>(
+    ) -> Option<impl Future<Output = Result<Value>>> {
+        let capabilities = self.capabilities.get().unwrap();
+
+        // Return early if the server does not support goto-definition.
+        match capabilities.implementation_provider {
+            Some(
+                lsp::ImplementationProviderCapability::Simple(true)
+                | lsp::ImplementationProviderCapability::Options(_),
+            ) => (),
+            _ => return None,
+        }
+
+        Some(self.goto_request::<lsp::request::GotoImplementation>(
             text_document,
             position,
             work_done_token,
-        )
+        ))
     }
 
     pub fn goto_reference(
@@ -866,7 +932,15 @@ impl Client {
         text_document: lsp::TextDocumentIdentifier,
         position: lsp::Position,
         work_done_token: Option<lsp::ProgressToken>,
-    ) -> impl Future<Output = Result<Value>> {
+    ) -> Option<impl Future<Output = Result<Value>>> {
+        let capabilities = self.capabilities.get().unwrap();
+
+        // Return early if the server does not support goto-reference.
+        match capabilities.references_provider {
+            Some(lsp::OneOf::Left(true) | lsp::OneOf::Right(_)) => (),
+            _ => return None,
+        }
+
         let params = lsp::ReferenceParams {
             text_document_position: lsp::TextDocumentPositionParams {
                 text_document,
@@ -881,31 +955,47 @@ impl Client {
             },
         };
 
-        self.call::<lsp::request::References>(params)
+        Some(self.call::<lsp::request::References>(params))
     }
 
     pub fn document_symbols(
         &self,
         text_document: lsp::TextDocumentIdentifier,
-    ) -> impl Future<Output = Result<Value>> {
+    ) -> Option<impl Future<Output = Result<Value>>> {
+        let capabilities = self.capabilities.get().unwrap();
+
+        // Return early if the server does not support document symbols.
+        match capabilities.document_symbol_provider {
+            Some(lsp::OneOf::Left(true) | lsp::OneOf::Right(_)) => (),
+            _ => return None,
+        }
+
         let params = lsp::DocumentSymbolParams {
             text_document,
             work_done_progress_params: lsp::WorkDoneProgressParams::default(),
             partial_result_params: lsp::PartialResultParams::default(),
         };
 
-        self.call::<lsp::request::DocumentSymbolRequest>(params)
+        Some(self.call::<lsp::request::DocumentSymbolRequest>(params))
     }
 
     // empty string to get all symbols
-    pub fn workspace_symbols(&self, query: String) -> impl Future<Output = Result<Value>> {
+    pub fn workspace_symbols(&self, query: String) -> Option<impl Future<Output = Result<Value>>> {
+        let capabilities = self.capabilities.get().unwrap();
+
+        // Return early if the server does not support workspace symbols.
+        match capabilities.workspace_symbol_provider {
+            Some(lsp::OneOf::Left(true) | lsp::OneOf::Right(_)) => (),
+            _ => return None,
+        }
+
         let params = lsp::WorkspaceSymbolParams {
             query,
             work_done_progress_params: lsp::WorkDoneProgressParams::default(),
             partial_result_params: lsp::PartialResultParams::default(),
         };
 
-        self.call::<lsp::request::WorkspaceSymbol>(params)
+        Some(self.call::<lsp::request::WorkspaceSymbol>(params))
     }
 
     pub fn code_actions(
@@ -913,7 +1003,18 @@ impl Client {
         text_document: lsp::TextDocumentIdentifier,
         range: lsp::Range,
         context: lsp::CodeActionContext,
-    ) -> impl Future<Output = Result<Value>> {
+    ) -> Option<impl Future<Output = Result<Value>>> {
+        let capabilities = self.capabilities.get().unwrap();
+
+        // Return early if the server does not support code actions.
+        match capabilities.code_action_provider {
+            Some(
+                lsp::CodeActionProviderCapability::Simple(true)
+                | lsp::CodeActionProviderCapability::Options(_),
+            ) => (),
+            _ => return None,
+        }
+
         let params = lsp::CodeActionParams {
             text_document,
             range,
@@ -922,26 +1023,22 @@ impl Client {
             partial_result_params: lsp::PartialResultParams::default(),
         };
 
-        self.call::<lsp::request::CodeActionRequest>(params)
+        Some(self.call::<lsp::request::CodeActionRequest>(params))
     }
 
-    pub async fn rename_symbol(
+    pub fn rename_symbol(
         &self,
         text_document: lsp::TextDocumentIdentifier,
         position: lsp::Position,
         new_name: String,
-    ) -> anyhow::Result<lsp::WorkspaceEdit> {
+    ) -> Option<impl Future<Output = Result<lsp::WorkspaceEdit>>> {
         let capabilities = self.capabilities.get().unwrap();
 
-        // check if we're able to rename
+        // Return early if the language server does not support renaming.
         match capabilities.rename_provider {
             Some(lsp::OneOf::Left(true)) | Some(lsp::OneOf::Right(_)) => (),
             // None | Some(false)
-            _ => {
-                log::warn!("rename_symbol failed: The server does not support rename");
-                let err = "The server does not support rename";
-                return Err(anyhow!(err));
-            }
+            _ => return None,
         };
 
         let params = lsp::RenameParams {
@@ -955,11 +1052,21 @@ impl Client {
             },
         };
 
-        let response = self.request::<lsp::request::Rename>(params).await?;
-        Ok(response.unwrap_or_default())
+        let request = self.call::<lsp::request::Rename>(params);
+
+        Some(async move {
+            let json = request.await?;
+            let response: Option<lsp::WorkspaceEdit> = serde_json::from_value(json)?;
+            Ok(response.unwrap_or_default())
+        })
     }
 
-    pub fn command(&self, command: lsp::Command) -> impl Future<Output = Result<Value>> {
+    pub fn command(&self, command: lsp::Command) -> Option<impl Future<Output = Result<Value>>> {
+        let capabilities = self.capabilities.get().unwrap();
+
+        // Return early if the language server does not support executing commands.
+        capabilities.execute_command_provider.as_ref()?;
+
         let params = lsp::ExecuteCommandParams {
             command: command.command,
             arguments: command.arguments.unwrap_or_default(),
@@ -968,6 +1075,6 @@ impl Client {
             },
         };
 
-        self.call::<lsp::request::ExecuteCommand>(params)
+        Some(self.call::<lsp::request::ExecuteCommand>(params))
     }
 }
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 5b44775b..8af5a7e3 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3801,15 +3801,21 @@ fn format_selections(cx: &mut Context) {
 
     let range = ranges[0];
 
-    let edits = tokio::task::block_in_place(|| {
-        helix_lsp::block_on(language_server.text_document_range_formatting(
-            doc.identifier(),
-            range,
-            lsp::FormattingOptions::default(),
-            None,
-        ))
-    })
-    .unwrap_or_default();
+    let request = match language_server.text_document_range_formatting(
+        doc.identifier(),
+        range,
+        lsp::FormattingOptions::default(),
+        None,
+    ) {
+        Some(future) => future,
+        None => {
+            cx.editor
+                .set_error("Language server does not support range formatting");
+            return;
+        }
+    };
+
+    let edits = tokio::task::block_in_place(|| helix_lsp::block_on(request)).unwrap_or_default();
 
     let transaction = helix_lsp::util::generate_transaction_from_edits(
         doc.text(),
@@ -3953,7 +3959,10 @@ pub fn completion(cx: &mut Context) {
 
     let pos = pos_to_lsp_pos(doc.text(), cursor, offset_encoding);
 
-    let future = language_server.completion(doc.identifier(), pos, None);
+    let future = match language_server.completion(doc.identifier(), pos, None) {
+        Some(future) => future,
+        None => return,
+    };
 
     let trigger_offset = cursor;
 
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index dcabfab1..8faf1d08 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -333,7 +333,14 @@ pub fn symbol_picker(cx: &mut Context) {
     let current_url = doc.url();
     let offset_encoding = language_server.offset_encoding();
 
-    let future = language_server.document_symbols(doc.identifier());
+    let future = match language_server.document_symbols(doc.identifier()) {
+        Some(future) => future,
+        None => {
+            cx.editor
+                .set_error("Language server does not support document symbols");
+            return;
+        }
+    };
 
     cx.callback(
         future,
@@ -365,7 +372,14 @@ pub fn workspace_symbol_picker(cx: &mut Context) {
     let current_url = doc.url();
     let language_server = language_server!(cx.editor, doc);
     let offset_encoding = language_server.offset_encoding();
-    let future = language_server.workspace_symbols("".to_string());
+    let future = match language_server.workspace_symbols("".to_string()) {
+        Some(future) => future,
+        None => {
+            cx.editor
+                .set_error("Language server does not support workspace symbols");
+            return;
+        }
+    };
 
     cx.callback(
         future,
@@ -493,7 +507,7 @@ pub fn code_action(cx: &mut Context) {
 
     let range = range_to_lsp_range(doc.text(), selection_range, offset_encoding);
 
-    let future = language_server.code_actions(
+    let future = match language_server.code_actions(
         doc.identifier(),
         range,
         // Filter and convert overlapping diagnostics
@@ -509,7 +523,14 @@ pub fn code_action(cx: &mut Context) {
                 .collect(),
             only: None,
         },
-    );
+    ) {
+        Some(future) => future,
+        None => {
+            cx.editor
+                .set_error("Language server does not support code actions");
+            return;
+        }
+    };
 
     cx.callback(
         future,
@@ -617,9 +638,16 @@ pub fn execute_lsp_command(editor: &mut Editor, cmd: lsp::Command) {
 
     // the command is executed on the server and communicated back
     // to the client asynchronously using workspace edits
-    let command_future = language_server.command(cmd);
+    let future = match language_server.command(cmd) {
+        Some(future) => future,
+        None => {
+            editor.set_error("Language server does not support executing commands");
+            return;
+        }
+    };
+
     tokio::spawn(async move {
-        let res = command_future.await;
+        let res = future.await;
 
         if let Err(e) = res {
             log::error!("execute LSP command: {}", e);
@@ -853,7 +881,14 @@ pub fn goto_definition(cx: &mut Context) {
 
     let pos = doc.position(view.id, offset_encoding);
 
-    let future = language_server.goto_definition(doc.identifier(), pos, None);
+    let future = match language_server.goto_definition(doc.identifier(), pos, None) {
+        Some(future) => future,
+        None => {
+            cx.editor
+                .set_error("Language server does not support goto-definition");
+            return;
+        }
+    };
 
     cx.callback(
         future,
@@ -871,7 +906,14 @@ pub fn goto_type_definition(cx: &mut Context) {
 
     let pos = doc.position(view.id, offset_encoding);
 
-    let future = language_server.goto_type_definition(doc.identifier(), pos, None);
+    let future = match language_server.goto_type_definition(doc.identifier(), pos, None) {
+        Some(future) => future,
+        None => {
+            cx.editor
+                .set_error("Language server does not support goto-type-definition");
+            return;
+        }
+    };
 
     cx.callback(
         future,
@@ -889,7 +931,14 @@ pub fn goto_implementation(cx: &mut Context) {
 
     let pos = doc.position(view.id, offset_encoding);
 
-    let future = language_server.goto_implementation(doc.identifier(), pos, None);
+    let future = match language_server.goto_implementation(doc.identifier(), pos, None) {
+        Some(future) => future,
+        None => {
+            cx.editor
+                .set_error("Language server does not support goto-implementation");
+            return;
+        }
+    };
 
     cx.callback(
         future,
@@ -907,7 +956,14 @@ pub fn goto_reference(cx: &mut Context) {
 
     let pos = doc.position(view.id, offset_encoding);
 
-    let future = language_server.goto_reference(doc.identifier(), pos, None);
+    let future = match language_server.goto_reference(doc.identifier(), pos, None) {
+        Some(future) => future,
+        None => {
+            cx.editor
+                .set_error("Language server does not support goto-reference");
+            return;
+        }
+    };
 
     cx.callback(
         future,
@@ -950,7 +1006,13 @@ pub fn signature_help_impl(cx: &mut Context, invoked: SignatureHelpInvoked) {
 
     let future = match language_server.text_document_signature_help(doc.identifier(), pos, None) {
         Some(f) => f,
-        None => return,
+        None => {
+            if was_manually_invoked {
+                cx.editor
+                    .set_error("Language server does not support signature-help");
+            }
+            return;
+        }
     };
 
     cx.callback(
@@ -1051,7 +1113,14 @@ pub fn hover(cx: &mut Context) {
 
     let pos = doc.position(view.id, offset_encoding);
 
-    let future = language_server.text_document_hover(doc.identifier(), pos, None);
+    let future = match language_server.text_document_hover(doc.identifier(), pos, None) {
+        Some(future) => future,
+        None => {
+            cx.editor
+                .set_error("Language server does not support hover");
+            return;
+        }
+    };
 
     cx.callback(
         future,
@@ -1121,8 +1190,16 @@ pub fn rename_symbol(cx: &mut Context) {
 
             let pos = doc.position(view.id, offset_encoding);
 
-            let task = language_server.rename_symbol(doc.identifier(), pos, input.to_string());
-            match block_on(task) {
+            let future =
+                match language_server.rename_symbol(doc.identifier(), pos, input.to_string()) {
+                    Some(future) => future,
+                    None => {
+                        cx.editor
+                            .set_error("Language server does not support symbol renaming");
+                        return;
+                    }
+                };
+            match block_on(future) {
                 Ok(edits) => apply_workspace_edit(cx.editor, offset_encoding, &edits),
                 Err(err) => cx.editor.set_error(err.to_string()),
             }
@@ -1137,7 +1214,15 @@ pub fn select_references_to_symbol_under_cursor(cx: &mut Context) {
 
     let pos = doc.position(view.id, offset_encoding);
 
-    let future = language_server.text_document_document_highlight(doc.identifier(), pos, None);
+    let future = match language_server.text_document_document_highlight(doc.identifier(), pos, None)
+    {
+        Some(future) => future,
+        None => {
+            cx.editor
+                .set_error("Language server does not support document highlight");
+            return;
+        }
+    };
 
     cx.callback(
         future,
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 4e6ee424..ebb4fb46 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -245,21 +245,13 @@ impl Completion {
         completion_item: lsp::CompletionItem,
     ) -> Option<CompletionItem> {
         let language_server = doc.language_server()?;
-        let completion_resolve_provider = language_server
-            .capabilities()
-            .completion_provider
-            .as_ref()?
-            .resolve_provider;
-        if completion_resolve_provider != Some(true) {
-            return None;
-        }
 
-        let future = language_server.resolve_completion_item(completion_item);
+        let future = language_server.resolve_completion_item(completion_item)?;
         let response = helix_lsp::block_on(future);
         match response {
             Ok(value) => serde_json::from_value(value).ok(),
             Err(err) => {
-                log::error!("execute LSP command: {}", err);
+                log::error!("Failed to resolve completion item: {}", err);
                 None
             }
         }
@@ -330,7 +322,10 @@ impl Completion {
         };
 
         // This method should not block the compositor so we handle the response asynchronously.
-        let future = language_server.resolve_completion_item(current_item.clone());
+        let future = match language_server.resolve_completion_item(current_item.clone()) {
+            Some(future) => future,
+            None => return false,
+        };
 
         cx.callback(
             future,

From f538b697597dccdd2492606858f0976c7cf7e4d2 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Tue, 22 Nov 2022 03:54:22 +0100
Subject: [PATCH 534/884] significantly improve treesitter performance while
 editing large files (#4716)

* significantly improve treesitter performance while editing large files

* Apply stylistic suggestions from code review

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* use PartialEq and Hash instead of a freestanding function

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 Cargo.lock               |  27 ++++++++-
 helix-core/Cargo.toml    |   2 +
 helix-core/src/syntax.rs | 117 ++++++++++++++++++++++++++-------------
 3 files changed, 106 insertions(+), 40 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5833714d..a2b2ffd8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13,6 +13,18 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "ahash"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107"
+dependencies = [
+ "cfg-if",
+ "getrandom",
+ "once_cell",
+ "version_check",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "0.7.18"
@@ -400,18 +412,29 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash",
+ "ahash 0.7.6",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038"
+dependencies = [
+ "ahash 0.8.2",
 ]
 
 [[package]]
 name = "helix-core"
 version = "0.6.0"
 dependencies = [
+ "ahash 0.8.2",
  "arc-swap",
  "bitflags",
  "chrono",
  "encoding_rs",
  "etcetera",
+ "hashbrown 0.13.1",
  "helix-loader",
  "log",
  "once_cell",
@@ -1288,7 +1311,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137"
 dependencies = [
- "hashbrown",
+ "hashbrown 0.12.3",
  "regex",
 ]
 
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 45272f98..eb886c90 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -30,6 +30,8 @@ once_cell = "1.16"
 arc-swap = "1"
 regex = "1"
 bitflags = "1.3"
+ahash = "0.8.2"
+hashbrown = { version = "0.13.1", features = ["raw"] }
 
 log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index b567a8ab..8dc34a3e 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -7,8 +7,10 @@ use crate::{
     Rope, RopeSlice, Tendril,
 };
 
+use ahash::RandomState;
 use arc_swap::{ArcSwap, Guard};
 use bitflags::bitflags;
+use hashbrown::raw::RawTable;
 use slotmap::{DefaultKey as LayerId, HopSlotMap};
 
 use std::{
@@ -16,7 +18,8 @@ use std::{
     cell::RefCell,
     collections::{HashMap, VecDeque},
     fmt,
-    mem::replace,
+    hash::{Hash, Hasher},
+    mem::{replace, transmute},
     path::Path,
     str::FromStr,
     sync::Arc,
@@ -770,30 +773,38 @@ impl Syntax {
         // Convert the changeset into tree sitter edits.
         let edits = generate_edits(old_source, changeset);
 
+        // This table allows inverse indexing of `layers`.
+        // That is by hashing a `Layer` you can find
+        // the `LayerId` of an existing equivalent `Layer` in `layers`.
+        //
+        // It is used to determine if a new layer exists for an injection
+        // or if an existing layer needs to be updated.
+        let mut layers_table = RawTable::with_capacity(self.layers.len());
+        let layers_hasher = RandomState::new();
         // Use the edits to update all layers markers
-        if !edits.is_empty() {
-            fn point_add(a: Point, b: Point) -> Point {
-                if b.row > 0 {
-                    Point::new(a.row.saturating_add(b.row), b.column)
-                } else {
-                    Point::new(0, a.column.saturating_add(b.column))
-                }
+        fn point_add(a: Point, b: Point) -> Point {
+            if b.row > 0 {
+                Point::new(a.row.saturating_add(b.row), b.column)
+            } else {
+                Point::new(0, a.column.saturating_add(b.column))
             }
-            fn point_sub(a: Point, b: Point) -> Point {
-                if a.row > b.row {
-                    Point::new(a.row.saturating_sub(b.row), a.column)
-                } else {
-                    Point::new(0, a.column.saturating_sub(b.column))
-                }
+        }
+        fn point_sub(a: Point, b: Point) -> Point {
+            if a.row > b.row {
+                Point::new(a.row.saturating_sub(b.row), a.column)
+            } else {
+                Point::new(0, a.column.saturating_sub(b.column))
             }
+        }
 
-            for layer in self.layers.values_mut() {
-                // The root layer always covers the whole range (0..usize::MAX)
-                if layer.depth == 0 {
-                    layer.flags = LayerUpdateFlags::MODIFIED;
-                    continue;
-                }
+        for (layer_id, layer) in self.layers.iter_mut() {
+            // The root layer always covers the whole range (0..usize::MAX)
+            if layer.depth == 0 {
+                layer.flags = LayerUpdateFlags::MODIFIED;
+                continue;
+            }
 
+            if !edits.is_empty() {
                 for range in &mut layer.ranges {
                     // Roughly based on https://github.com/tree-sitter/tree-sitter/blob/ddeaa0c7f534268b35b4f6cb39b52df082754413/lib/src/subtree.c#L691-L720
                     for edit in edits.iter().rev() {
@@ -858,6 +869,12 @@ impl Syntax {
                     }
                 }
             }
+
+            let hash = layers_hasher.hash_one(layer);
+            // Safety: insert_no_grow is unsafe because it assumes that the table
+            // has enough capacity to hold additional elements.
+            // This is always the case as we reserved enough capacity above.
+            unsafe { layers_table.insert_no_grow(hash, layer_id) };
         }
 
         PARSER.with(|ts_parser| {
@@ -982,27 +999,23 @@ impl Syntax {
                 let depth = layer.depth + 1;
                 // TODO: can't inline this since matches borrows self.layers
                 for (config, ranges) in injections {
-                    // Find an existing layer
-                    let layer = self
-                        .layers
-                        .iter_mut()
-                        .find(|(_, layer)| {
-                            layer.depth == depth && // TODO: track parent id instead
-                            layer.config.language == config.language && layer.ranges == ranges
+                    let new_layer = LanguageLayer {
+                        tree: None,
+                        config,
+                        depth,
+                        ranges,
+                        flags: LayerUpdateFlags::empty(),
+                    };
+
+                    // Find an identical existing layer
+                    let layer = layers_table
+                        .get(layers_hasher.hash_one(&new_layer), |&it| {
+                            self.layers[it] == new_layer
                         })
-                        .map(|(id, _layer)| id);
+                        .copied();
 
                     // ...or insert a new one.
-                    let layer_id = layer.unwrap_or_else(|| {
-                        self.layers.insert(LanguageLayer {
-                            tree: None,
-                            config,
-                            depth,
-                            ranges,
-                            // set the modified flag to ensure the layer is parsed
-                            flags: LayerUpdateFlags::empty(),
-                        })
-                    });
+                    let layer_id = layer.unwrap_or_else(|| self.layers.insert(new_layer));
 
                     queue.push_back(layer_id);
                 }
@@ -1139,6 +1152,34 @@ pub struct LanguageLayer {
     flags: LayerUpdateFlags,
 }
 
+/// This PartialEq implementation only checks if that
+/// two layers are theoretically identical (meaning they highlight the same text range with the same language).
+/// It does not check whether the layers have the same internal treesitter
+/// state.
+impl PartialEq for LanguageLayer {
+    fn eq(&self, other: &Self) -> bool {
+        self.depth == other.depth
+            && self.config.language == other.config.language
+            && self.ranges == other.ranges
+    }
+}
+
+/// Hash implementation belongs to PartialEq implementation above.
+/// See its documentation for details.
+impl Hash for LanguageLayer {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.depth.hash(state);
+        // The transmute is necessary here because tree_sitter::Language does not derive Hash at the moment.
+        // However it does use #[repr] transparent so the transmute here is safe
+        // as `Language` (which `Grammar` is an alias for) is just a newtype wrapper around a (thin) pointer.
+        // This is also compatible with the PartialEq implementation of language
+        // as that is just a pointer comparison.
+        let language: *const () = unsafe { transmute(self.config.language) };
+        language.hash(state);
+        self.ranges.hash(state);
+    }
+}
+
 impl LanguageLayer {
     pub fn tree(&self) -> &Tree {
         // TODO: no unwrap

From 33ae498e9f23f8f39a41abf8d79c09fc6964c2ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 22 Nov 2022 18:05:29 +0900
Subject: [PATCH 535/884] ci: Remove a bunch of actions-rs/cargo uses

---
 .github/workflows/build.yml   | 38 ++++++++---------------------------
 .github/workflows/release.yml |  5 +----
 2 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 15734361..e6b319f9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,9 +31,7 @@ jobs:
       - uses: Swatinem/rust-cache@v1
 
       - name: Run cargo check
-        uses: actions-rs/cargo@v1
-        with:
-          command: check
+        run: cargo check
 
   test:
     name: Test Suite
@@ -61,15 +59,10 @@ jobs:
           restore-keys: ${{ runner.os }}-stable-v${{ env.CACHE_VERSION }}-tree-sitter-grammars-
 
       - name: Run cargo test
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --workspace
+        run: cargo test --workspace
 
       - name: Run cargo integration-test
-        uses: actions-rs/cargo@v1
-        with:
-          command: integration-test
+        run: cargo integration-test
 
     strategy:
       matrix:
@@ -92,22 +85,13 @@ jobs:
       - uses: Swatinem/rust-cache@v1
 
       - name: Run cargo fmt
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
+        run: cargo fmt --all -- --check
 
       - name: Run cargo clippy
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --workspace --all-targets -- -D warnings
+        run: cargo clippy --workspace --all-targets -- -D warnings
 
       - name: Run cargo doc
-        uses: actions-rs/cargo@v1
-        with:
-          command: doc
-          args: --no-deps --workspace --document-private-items
+        run: cargo doc --no-deps --workspace --document-private-items
         env:
           RUSTDOCFLAGS: -D warnings
 
@@ -127,10 +111,7 @@ jobs:
       - uses: Swatinem/rust-cache@v1
 
       - name: Generate docs
-        uses: actions-rs/cargo@v1
-        with:
-          command: xtask
-          args: docgen
+        run: cargo xtask docgen
 
       - name: Check uncommitted documentation changes
         run: |
@@ -155,7 +136,4 @@ jobs:
       - uses: Swatinem/rust-cache@v1
 
       - name: Generate docs
-        uses: actions-rs/cargo@v1
-        with:
-          command: xtask
-          args: query-check
+        run: cargo xtask query-check
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e7aca89b..8e805de2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,10 +34,7 @@ jobs:
       - uses: Swatinem/rust-cache@v1
 
       - name: Fetch tree-sitter grammars
-        uses: actions-rs/cargo@v1
-        with:
-          command: run
-          args: --package=helix-loader --bin=hx-loader
+        run: cargo run --package=helix-loader --bin=hx-loader
 
       - name: Bundle grammars
         run: tar cJf grammars.tar.xz -C runtime/grammars/sources .

From 6aa345a6ce905a0f65e3526f93c3a46a777eaa39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 22 Nov 2022 18:05:42 +0900
Subject: [PATCH 536/884] ci: Simplify tag name fetching (set-output is
 deprecated)

---
 .github/workflows/release.yml | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8e805de2..7e184ff6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -218,16 +218,6 @@ jobs:
 
       - uses: actions/download-artifact@v3
 
-      - name: Calculate tag name
-        run: |
-          name=dev
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            name=${GITHUB_REF:10}
-          fi
-          echo ::set-output name=val::$name
-          echo TAG=$name >> $GITHUB_ENV
-        id: tagname
-
       - name: Build archive
         shell: bash
         run: |
@@ -247,7 +237,7 @@ jobs:
               if [[ $platform =~ "windows" ]]; then
                   exe=".exe"
               fi
-              pkgname=helix-$TAG-$platform
+              pkgname=helix-$GITHUB_REF_NAME-$platform
               mkdir $pkgname
               cp $source/LICENSE $source/README.md $pkgname
               mkdir $pkgname/contrib
@@ -267,7 +257,7 @@ jobs:
               fi
           done
 
-          tar cJf dist/helix-$TAG-source.tar.xz -C $source .
+          tar cJf dist/helix-$GITHUB_REF_NAME-source.tar.xz -C $source .
           mv dist $source/
 
       - name: Upload binaries to release
@@ -277,7 +267,7 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: dist/*
           file_glob: true
-          tag: ${{ steps.tagname.outputs.val }}
+          tag: ${{ github.ref_name }}
           overwrite: true
       
       - name: Upload binaries as artifact

From 5ad3befe9a802fc1b219355fb2cfd495aa5964d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Nov 2022 18:15:36 +0900
Subject: [PATCH 537/884] build(deps): bump Swatinem/rust-cache from 1 to 2
 (#4843)

Bumps [Swatinem/rust-cache](https://github.com/Swatinem/rust-cache) from 1 to 2.
- [Release notes](https://github.com/Swatinem/rust-cache/releases)
- [Changelog](https://github.com/Swatinem/rust-cache/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Swatinem/rust-cache/compare/v1...v2)

---
updated-dependencies:
- dependency-name: Swatinem/rust-cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/build.yml   | 10 +++++-----
 .github/workflows/release.yml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e6b319f9..526c7b3c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
           profile: minimal
           override: true
 
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
 
       - name: Run cargo check
         run: cargo check
@@ -49,7 +49,7 @@ jobs:
           profile: minimal
           override: true
 
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
 
       - name: Cache test tree-sitter grammar
         uses: actions/cache@v3
@@ -82,7 +82,7 @@ jobs:
           override: true
           components: rustfmt, clippy
 
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
 
       - name: Run cargo fmt
         run: cargo fmt --all -- --check
@@ -108,7 +108,7 @@ jobs:
           profile: minimal
           override: true
 
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
 
       - name: Generate docs
         run: cargo xtask docgen
@@ -133,7 +133,7 @@ jobs:
           profile: minimal
           override: true
 
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
 
       - name: Generate docs
         run: cargo xtask query-check
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7e184ff6..c242f089 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
           profile: minimal
           override: true
 
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
 
       - name: Fetch tree-sitter grammars
         run: cargo run --package=helix-loader --bin=hx-loader

From 642a961c032b2a7e7fa67bfc3da54588d0ae8c5b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Nov 2022 13:24:37 -0600
Subject: [PATCH 538/884] build(deps): bump tokio from 1.21.2 to 1.22.0 (#4846)

Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.21.2 to 1.22.0.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.21.2...tokio-1.22.0)

---
updated-dependencies:
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock           | 4 ++--
 helix-lsp/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a2b2ffd8..616c5317 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1219,9 +1219,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.21.2"
+version = "1.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099"
+checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3"
 dependencies = [
  "autocfg",
  "bytes",
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index ad432d96..41884e73 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -22,6 +22,6 @@ lsp-types = { version = "0.93", features = ["proposed"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-tokio = { version = "1.21", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
+tokio = { version = "1.22", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
 tokio-stream = "0.1.11"
 which = "4.2"

From 42e37a571e75aaf4feb1717dfebe8cf215e535dd Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 22 Nov 2022 21:28:49 -0600
Subject: [PATCH 539/884] Apply transactions to all views (#4733)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add a test case for updating jumplists across windows

* Apply transactions to all views on history changes

This ensures that jumplist selections follow changes in documents, even
when there are multiple views (for example a split where both windows
edit the same document).

* Leave TODOs for cleaning up View::apply

* Use Iterator::reduce to compose history transactions

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
---
 helix-core/src/history.rs       | 18 +++++++++++++++++-
 helix-term/src/ui/editor.rs     | 26 +++++++++++++++++++++++---
 helix-term/tests/test/splits.rs | 26 ++++++++++++++++++++++++++
 helix-view/src/lib.rs           |  8 +++-----
 helix-view/src/macros.rs        |  2 +-
 helix-view/src/view.rs          |  1 +
 6 files changed, 71 insertions(+), 10 deletions(-)

diff --git a/helix-core/src/history.rs b/helix-core/src/history.rs
index 51174c02..697f29b4 100644
--- a/helix-core/src/history.rs
+++ b/helix-core/src/history.rs
@@ -54,7 +54,7 @@ pub struct History {
 }
 
 /// A single point in history. See [History] for more information.
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 struct Revision {
     parent: usize,
     last_child: Option<NonZeroUsize>,
@@ -119,6 +119,22 @@ impl History {
         self.current == 0
     }
 
+    /// Returns the changes since the given revision composed into a transaction.
+    /// Returns None if there are no changes between the current and given revisions.
+    pub fn changes_since(&self, revision: usize) -> Option<Transaction> {
+        if self.at_root() || self.current >= revision {
+            return None;
+        }
+
+        // The bounds are checked in the if condition above:
+        // `revision` is known to be `< self.current`.
+        self.revisions[revision..self.current]
+            .iter()
+            .map(|revision| &revision.transaction)
+            .cloned()
+            .reduce(|acc, transaction| acc.compose(transaction))
+    }
+
     /// Undo the last edit.
     pub fn undo(&mut self) -> Option<&Transaction> {
         if self.at_root() {
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 6c8ee2d9..44f89b77 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1337,7 +1337,9 @@ impl Component for EditorView {
                 cx.editor.status_msg = None;
 
                 let mode = cx.editor.mode();
-                let (view, _) = current!(cx.editor);
+                let (view, doc) = current!(cx.editor);
+                let original_doc_id = doc.id();
+                let original_doc_revision = doc.get_current_revision();
                 let focus = view.id;
 
                 if let Some(on_next_key) = self.on_next_key.take() {
@@ -1413,13 +1415,31 @@ impl Component for EditorView {
                     let view = view_mut!(cx.editor, focus);
                     let doc = doc_mut!(cx.editor, &view.doc);
 
-                    view.ensure_cursor_in_view(doc, config.scrolloff);
-
                     // Store a history state if not in insert mode. This also takes care of
                     // committing changes when leaving insert mode.
                     if mode != Mode::Insert {
                         doc.append_changes_to_history(view.id);
                     }
+
+                    // If the current document has been changed, apply the changes to all views.
+                    // This ensures that selections in jumplists follow changes.
+                    if doc.id() == original_doc_id
+                        && doc.get_current_revision() > original_doc_revision
+                    {
+                        if let Some(transaction) =
+                            doc.history.get_mut().changes_since(original_doc_revision)
+                        {
+                            let doc = doc!(cx.editor, &original_doc_id);
+                            for (view, _focused) in cx.editor.tree.views_mut() {
+                                view.apply(&transaction, doc);
+                            }
+                        }
+                    }
+
+                    let view = view_mut!(cx.editor, focus);
+                    let doc = doc_mut!(cx.editor, &view.doc);
+
+                    view.ensure_cursor_in_view(doc, config.scrolloff);
                 }
 
                 EventResult::Consumed(callback)
diff --git a/helix-term/tests/test/splits.rs b/helix-term/tests/test/splits.rs
index 5807413a..a51de365 100644
--- a/helix-term/tests/test/splits.rs
+++ b/helix-term/tests/test/splits.rs
@@ -127,3 +127,29 @@ async fn test_split_write_quit_same_file() -> anyhow::Result<()> {
 
     Ok(())
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_changes_in_splits_apply_to_all_views() -> anyhow::Result<()> {
+    // See <https://github.com/helix-editor/helix/issues/4732>.
+    // Transactions must be applied to any view that has the changed document open.
+    // This sequence would panic since the jumplist entry would be modified in one
+    // window but not the other. Attempting to update the changelist in the other
+    // window would cause a panic since it would point outside of the document.
+
+    // The key sequence here:
+    // * <C-w>v       Create a vertical split of the current buffer.
+    //                Both views look at the same doc.
+    // * [<space>     Add a line ending to the beginning of the document.
+    //                The cursor is now at line 2 in window 2.
+    // * <C-s>        Save that selection to the jumplist in window 2.
+    // * <C-w>w       Switch to window 1.
+    // * kd           Delete line 1 in window 1.
+    // * <C-w>q       Close window 1, focusing window 2.
+    // * d            Delete line 1 in window 2.
+    //
+    // This panicked in the past because the jumplist entry on line 2 of window 2
+    // was not updated and after the `kd` step, pointed outside of the document.
+    test(("#[|]#", "<C-w>v[<space><C-s><C-w>wkd<C-w>qd", "#[|]#")).await?;
+
+    Ok(())
+}
diff --git a/helix-view/src/lib.rs b/helix-view/src/lib.rs
index 4c32b356..9cf36ae0 100644
--- a/helix-view/src/lib.rs
+++ b/helix-view/src/lib.rs
@@ -71,12 +71,10 @@ pub fn align_view(doc: &Document, view: &mut View, align: Align) {
 pub fn apply_transaction(
     transaction: &helix_core::Transaction,
     doc: &mut Document,
-    view: &mut View,
+    view: &View,
 ) -> bool {
-    // This is a short function but it's easy to call `Document::apply`
-    // without calling `View::apply` or in the wrong order. The transaction
-    // must be applied to the document before the view.
-    doc.apply(transaction, view.id) && view.apply(transaction, doc)
+    // TODO remove this helper function. Just call Document::apply everywhere directly.
+    doc.apply(transaction, view.id)
 }
 
 pub use document::Document;
diff --git a/helix-view/src/macros.rs b/helix-view/src/macros.rs
index 53ab4346..ee9cd411 100644
--- a/helix-view/src/macros.rs
+++ b/helix-view/src/macros.rs
@@ -67,7 +67,7 @@ macro_rules! view {
 #[macro_export]
 macro_rules! doc {
     ($editor:expr, $id:expr) => {{
-        $editor.documents[$id]
+        &$editor.documents[$id]
     }};
     ($editor:expr) => {{
         $crate::current_ref!($editor).1
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index 8aa4760d..c917a1ab 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -351,6 +351,7 @@ impl View {
     /// which applies a transaction to the [`Document`] and view together.
     pub fn apply(&mut self, transaction: &Transaction, doc: &Document) -> bool {
         self.jumps.apply(transaction, doc);
+        // TODO: remove the boolean return. This is unused.
         true
     }
 }

From 26ec1cf39a3c5f548f199918b0a84d614a5c6be7 Mon Sep 17 00:00:00 2001
From: alois31 <36605164+alois31@users.noreply.github.com>
Date: Wed, 23 Nov 2022 04:49:02 +0100
Subject: [PATCH 540/884] Add QML language support (#4842)

Fixes https://github.com/helix-editor/helix/issues/2771
---
 book/src/generated/lang-support.md |  1 +
 languages.toml                     | 13 +++++
 runtime/queries/qml/highlights.scm | 90 ++++++++++++++++++++++++++++++
 runtime/queries/qml/indents.scm    |  6 ++
 runtime/queries/qml/injections.scm | 16 ++++++
 5 files changed, 126 insertions(+)
 create mode 100644 runtime/queries/qml/highlights.scm
 create mode 100644 runtime/queries/qml/indents.scm
 create mode 100644 runtime/queries/qml/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 59b60851..ac955036 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -93,6 +93,7 @@
 | protobuf | ✓ |  | ✓ |  |
 | purescript | ✓ |  |  | `purescript-language-server` |
 | python | ✓ | ✓ | ✓ | `pylsp` |
+| qml | ✓ |  | ✓ | `qmlls` |
 | r | ✓ |  |  | `R` |
 | racket |  |  |  | `racket` |
 | regex | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 47d77fee..1e7dcbf7 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1980,3 +1980,16 @@ language-server = { command = "bicep-langserver" }
 [[grammar]]
 name = "bicep"
 source = { git = "https://github.com/the-mikedavis/tree-sitter-bicep", rev = "d8e097fcfa143854861ef737161163a09cc2916b" }
+
+[[language]]
+name = "qml"
+scope = "source.qml"
+file-types = ["qml"]
+roots = []
+language-server = { command = "qmlls" }
+indent = { tab-width = 4, unit = "    " }
+grammar = "qmljs"
+
+[[grammar]]
+name = "qmljs"
+source = { git = "https://github.com/yuja/tree-sitter-qmljs", rev = "0b2b25bcaa7d4925d5f0dda16f6a99c588a437f1" }
diff --git a/runtime/queries/qml/highlights.scm b/runtime/queries/qml/highlights.scm
new file mode 100644
index 00000000..11178fcd
--- /dev/null
+++ b/runtime/queries/qml/highlights.scm
@@ -0,0 +1,90 @@
+(comment) @comment
+
+(ui_import
+  source: _ @namespace
+  version: _? @constant
+  alias: _? @namespace)
+
+(ui_pragma
+  name: (identifier) @attribute
+  value: (identifier)? @constant)
+
+(ui_annotation
+  "@" @punctuation
+  type_name: _ @type)
+
+;;; Declarations
+
+(enum_declaration
+  name: (identifier) @type)
+
+(enum_assignment
+  name: (identifier) @constant
+  value: _ @constant)
+
+(enum_body
+  name: (identifier) @constant)
+
+(ui_inline_component
+  name: (identifier) @type)
+
+(ui_object_definition
+  type_name: _ @type)
+
+(ui_object_definition_binding
+  type_name: _ @type
+  name: _ @variable.other.member)
+
+(ui_property
+  type: _ @type
+  name: (identifier) @variable.other.member)
+
+(ui_signal
+  name: (identifier) @function)
+
+(ui_signal_parameter
+  name: (identifier) @variable.parameter
+  type: _ @type)
+
+(ui_signal_parameter
+  type: _ @type
+  name: (identifier) @variable.parameter);;; Properties and bindings
+
+;;; Bindings
+
+(ui_binding
+  name: _ @variable.other.member)
+
+;;; Other
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+] @punctuation.bracket
+
+(ui_list_property_type [
+  "<"
+  ">"
+] @punctuation.bracket)
+
+[
+  ","
+  "."
+  ":"
+] @punctuation.delimiter
+
+[
+  "as"
+  "component"
+  "default"
+  "enum"
+  "import"
+  "on"
+  "pragma"
+  "property"
+  "readonly"
+  "required"
+  "signal"
+] @keyword
diff --git a/runtime/queries/qml/indents.scm b/runtime/queries/qml/indents.scm
new file mode 100644
index 00000000..07492283
--- /dev/null
+++ b/runtime/queries/qml/indents.scm
@@ -0,0 +1,6 @@
+[
+  (enum_body)
+  (ui_object_initializer)
+] @indent
+
+"}" @outdent
diff --git a/runtime/queries/qml/injections.scm b/runtime/queries/qml/injections.scm
new file mode 100644
index 00000000..1ce987d3
--- /dev/null
+++ b/runtime/queries/qml/injections.scm
@@ -0,0 +1,16 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+([
+    (empty_statement)
+    (expression_statement)
+    (function_declaration)
+    (generator_function_declaration)
+    (statement_block)
+    (switch_statement)
+    (try_statement)
+    (variable_declaration)
+    (with_statement)
+  ] @injection.content
+  (#set! injection.include-children)
+  (#set! injection.language "javascript"))

From 590a628460c8fa8a4e101541d67289fa2fac95b5 Mon Sep 17 00:00:00 2001
From: Tshepang Mbambo <tshepang@gmail.com>
Date: Wed, 23 Nov 2022 05:51:17 +0200
Subject: [PATCH 541/884] tutor: Add missing quotes (#4832)

---
 runtime/tutor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/tutor b/runtime/tutor
index eb1d9885..957af640 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -845,11 +845,11 @@ lines.
  Type q to repeat the macro from register @ (the default).
 
  1. Move the cursor to the first line marked '-->' below.
-    Ensure your cursor is on the > of the arrow.
+    Ensure your cursor is on the '>' of the arrow.
  2. Type Q to start recording.
  3. Edit the line to look like the bottom one.
  4. Exit insert and Type Q again to stop recording.
- 5. Move to the line below and put your cursor on the > again.
+ 5. Move to the line below and put your cursor on '>' again.
  6. Type q to repeat the macro.
 
  --> ... sentence doesn't have it's first and last ... .

From 94eb3de7767c5d16344bec9634028f346cd867bb Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 23 Nov 2022 08:57:09 -0600
Subject: [PATCH 542/884] Add test case that panics on undo

This case panics since undo/redo call View::apply and here, the edit
that moves the jumplist selection out-of-bounds is not yet applied when
View::apply is called in undo/redo. View::apply should only be called
by the EditorView now.
---
 helix-term/tests/test/commands.rs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index 114bf222..27dbd9d7 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -283,3 +283,19 @@ async fn test_multi_selection_shell_commands() -> anyhow::Result<()> {
 
     Ok(())
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_undo_redo() -> anyhow::Result<()> {
+    // A jumplist selection is passed through an edit and then an undo and then a redo.
+    //
+    // * [<space>    Add a newline at line start. We're now on line 2.
+    // * <C-s>       Save the selection on line 2 in the jumplist.
+    // * kd          Delete line 1. The jumplist selection should be adjusted to the new line 1.
+    // * uU          Undo and redo the `kd` edit.
+    // * <C-o>       Jump back in the jumplist. This would panic if the jumplist were not being
+    //               updated correctly.
+    // * <C-i>       Jump forward to line 1.
+    test(("#[|]#", "[<space><C-s>kduU<C-o><C-i>", "#[|]#")).await?;
+
+    Ok(())
+}

From fd00f3a70eb626242bb2fcc9bddf2c4d94580a9a Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 23 Nov 2022 08:57:03 -0600
Subject: [PATCH 543/884] Don't apply transactions to Views in undo/redo

View::apply should only be called by EditorView after
42e37a571e75aaf4feb1717dfebe8cf215e535dd. This change removes the
duplicate calls within undo/redo which could cause a panic.
---
 helix-term/src/commands.rs       |  8 ++++----
 helix-term/src/commands/typed.rs |  4 ++--
 helix-view/src/document.rs       | 24 ++++++++++++------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 8af5a7e3..4eb9742f 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3302,7 +3302,7 @@ fn undo(cx: &mut Context) {
     let count = cx.count();
     let (view, doc) = current!(cx.editor);
     for _ in 0..count {
-        if !doc.undo(view) {
+        if !doc.undo(view.id) {
             cx.editor.set_status("Already at oldest change");
             break;
         }
@@ -3313,7 +3313,7 @@ fn redo(cx: &mut Context) {
     let count = cx.count();
     let (view, doc) = current!(cx.editor);
     for _ in 0..count {
-        if !doc.redo(view) {
+        if !doc.redo(view.id) {
             cx.editor.set_status("Already at newest change");
             break;
         }
@@ -3325,7 +3325,7 @@ fn earlier(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
     for _ in 0..count {
         // rather than doing in batch we do this so get error halfway
-        if !doc.earlier(view, UndoKind::Steps(1)) {
+        if !doc.earlier(view.id, UndoKind::Steps(1)) {
             cx.editor.set_status("Already at oldest change");
             break;
         }
@@ -3337,7 +3337,7 @@ fn later(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
     for _ in 0..count {
         // rather than doing in batch we do this so get error halfway
-        if !doc.later(view, UndoKind::Steps(1)) {
+        if !doc.later(view.id, UndoKind::Steps(1)) {
             cx.editor.set_status("Already at newest change");
             break;
         }
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index b8f99ff3..475f14d1 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -481,7 +481,7 @@ fn earlier(
     let uk = args.join(" ").parse::<UndoKind>().map_err(|s| anyhow!(s))?;
 
     let (view, doc) = current!(cx.editor);
-    let success = doc.earlier(view, uk);
+    let success = doc.earlier(view.id, uk);
     if !success {
         cx.editor.set_status("Already at oldest change");
     }
@@ -500,7 +500,7 @@ fn later(
 
     let uk = args.join(" ").parse::<UndoKind>().map_err(|s| anyhow!(s))?;
     let (view, doc) = current!(cx.editor);
-    let success = doc.later(view, uk);
+    let success = doc.later(view.id, uk);
     if !success {
         cx.editor.set_status("Already at newest change");
     }
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 08708528..0eb54f25 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -857,11 +857,11 @@ impl Document {
         success
     }
 
-    fn undo_redo_impl(&mut self, view: &mut View, undo: bool) -> bool {
+    fn undo_redo_impl(&mut self, view_id: ViewId, undo: bool) -> bool {
         let mut history = self.history.take();
         let txn = if undo { history.undo() } else { history.redo() };
         let success = if let Some(txn) = txn {
-            self.apply_impl(txn, view.id) && view.apply(txn, self)
+            self.apply_impl(txn, view_id)
         } else {
             false
         };
@@ -875,13 +875,13 @@ impl Document {
     }
 
     /// Undo the last modification to the [`Document`]. Returns whether the undo was successful.
-    pub fn undo(&mut self, view: &mut View) -> bool {
-        self.undo_redo_impl(view, true)
+    pub fn undo(&mut self, view_id: ViewId) -> bool {
+        self.undo_redo_impl(view_id, true)
     }
 
     /// Redo the last modification to the [`Document`]. Returns whether the redo was successful.
-    pub fn redo(&mut self, view: &mut View) -> bool {
-        self.undo_redo_impl(view, false)
+    pub fn redo(&mut self, view_id: ViewId) -> bool {
+        self.undo_redo_impl(view_id, false)
     }
 
     pub fn savepoint(&mut self) {
@@ -894,7 +894,7 @@ impl Document {
         }
     }
 
-    fn earlier_later_impl(&mut self, view: &mut View, uk: UndoKind, earlier: bool) -> bool {
+    fn earlier_later_impl(&mut self, view_id: ViewId, uk: UndoKind, earlier: bool) -> bool {
         let txns = if earlier {
             self.history.get_mut().earlier(uk)
         } else {
@@ -902,7 +902,7 @@ impl Document {
         };
         let mut success = false;
         for txn in txns {
-            if self.apply_impl(&txn, view.id) && view.apply(&txn, self) {
+            if self.apply_impl(&txn, view_id) {
                 success = true;
             }
         }
@@ -914,13 +914,13 @@ impl Document {
     }
 
     /// Undo modifications to the [`Document`] according to `uk`.
-    pub fn earlier(&mut self, view: &mut View, uk: UndoKind) -> bool {
-        self.earlier_later_impl(view, uk, true)
+    pub fn earlier(&mut self, view_id: ViewId, uk: UndoKind) -> bool {
+        self.earlier_later_impl(view_id, uk, true)
     }
 
     /// Redo modifications to the [`Document`] according to `uk`.
-    pub fn later(&mut self, view: &mut View, uk: UndoKind) -> bool {
-        self.earlier_later_impl(view, uk, false)
+    pub fn later(&mut self, view_id: ViewId, uk: UndoKind) -> bool {
+        self.earlier_later_impl(view_id, uk, false)
     }
 
     /// Commit pending changes to history

From 4a103db6228ba54e0f36bbebb95d25867458f473 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 23 Nov 2022 09:35:07 -0600
Subject: [PATCH 544/884] Apply inversions to Views on undo/redo

When using undo/redo, the history revision can be decremented. In that
case we should apply the inversions since the given revision in
History::changes_since. This prevents panics with jumplist operations
when a session uses undo/redo to move the jumplist selection outside
of the document.
---
 helix-core/src/history.rs         | 24 ++++++++++++++----------
 helix-term/src/ui/editor.rs       |  2 +-
 helix-term/tests/test/commands.rs |  9 +++++++++
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/helix-core/src/history.rs b/helix-core/src/history.rs
index 697f29b4..5f9fa71e 100644
--- a/helix-core/src/history.rs
+++ b/helix-core/src/history.rs
@@ -122,17 +122,21 @@ impl History {
     /// Returns the changes since the given revision composed into a transaction.
     /// Returns None if there are no changes between the current and given revisions.
     pub fn changes_since(&self, revision: usize) -> Option<Transaction> {
-        if self.at_root() || self.current >= revision {
-            return None;
-        }
+        use std::cmp::Ordering::*;
 
-        // The bounds are checked in the if condition above:
-        // `revision` is known to be `< self.current`.
-        self.revisions[revision..self.current]
-            .iter()
-            .map(|revision| &revision.transaction)
-            .cloned()
-            .reduce(|acc, transaction| acc.compose(transaction))
+        match revision.cmp(&self.current) {
+            Equal => None,
+            Greater => self.revisions[self.current + 1..=revision]
+                .iter()
+                .map(|revision| &revision.inversion)
+                .cloned()
+                .reduce(|acc, inversion| acc.compose(inversion)),
+            Less => self.revisions[revision + 1..=self.current]
+                .iter()
+                .map(|revision| &revision.transaction)
+                .cloned()
+                .reduce(|acc, transaction| acc.compose(transaction)),
+        }
     }
 
     /// Undo the last edit.
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 44f89b77..73712503 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1424,7 +1424,7 @@ impl Component for EditorView {
                     // If the current document has been changed, apply the changes to all views.
                     // This ensures that selections in jumplists follow changes.
                     if doc.id() == original_doc_id
-                        && doc.get_current_revision() > original_doc_revision
+                        && doc.get_current_revision() != original_doc_revision
                     {
                         if let Some(transaction) =
                             doc.history.get_mut().changes_since(original_doc_revision)
diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index 27dbd9d7..01295704 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -286,6 +286,15 @@ async fn test_multi_selection_shell_commands() -> anyhow::Result<()> {
 
 #[tokio::test(flavor = "multi_thread")]
 async fn test_undo_redo() -> anyhow::Result<()> {
+    // A jumplist selection is created at a point which is undone.
+    //
+    // * 2[<space>   Add two newlines at line start. We're now on line 3.
+    // * <C-s>       Save the selection on line 3 in the jumplist.
+    // * u           Undo the two newlines. We're now on line 1.
+    // * <C-o><C-i>  Jump forward an back again in the jumplist. This would panic
+    //               if the jumplist were not being updated correctly.
+    test(("#[|]#", "2[<space><C-s>u<C-o><C-i>", "#[|]#")).await?;
+
     // A jumplist selection is passed through an edit and then an undo and then a redo.
     //
     // * [<space>    Add a newline at line start. We're now on line 2.

From a3f321a531554b51160f3fe7e6da1c269030f3b6 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 23 Nov 2022 13:02:00 -0600
Subject: [PATCH 545/884] Follow parent links when calculating changes since a
 revision

The 'revisions' field on History can't be treated as linear: each
Revision in the revisions Vec has a parent link and an optional child
link. We can follow those to unroll the recent history.
---
 helix-core/src/history.rs         | 31 +++++++++++++++++++++----------
 helix-term/tests/test/commands.rs |  3 +++
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/helix-core/src/history.rs b/helix-core/src/history.rs
index 5f9fa71e..82509242 100644
--- a/helix-core/src/history.rs
+++ b/helix-core/src/history.rs
@@ -126,16 +126,27 @@ impl History {
 
         match revision.cmp(&self.current) {
             Equal => None,
-            Greater => self.revisions[self.current + 1..=revision]
-                .iter()
-                .map(|revision| &revision.inversion)
-                .cloned()
-                .reduce(|acc, inversion| acc.compose(inversion)),
-            Less => self.revisions[revision + 1..=self.current]
-                .iter()
-                .map(|revision| &revision.transaction)
-                .cloned()
-                .reduce(|acc, transaction| acc.compose(transaction)),
+            Less => {
+                let mut child = self.revisions[revision].last_child?.get();
+                let mut transaction = self.revisions[child].transaction.clone();
+                while child != self.current {
+                    child = self.revisions[child].last_child?.get();
+                    transaction = transaction.compose(self.revisions[child].transaction.clone());
+                }
+                Some(transaction)
+            }
+            Greater => {
+                let mut inversion = self.revisions[revision].inversion.clone();
+                let mut parent = self.revisions[revision].parent;
+                while parent != self.current {
+                    parent = self.revisions[parent].parent;
+                    if parent == 0 {
+                        return None;
+                    }
+                    inversion = inversion.compose(self.revisions[parent].inversion.clone());
+                }
+                Some(inversion)
+            }
         }
     }
 
diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index 01295704..95bd95b7 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -306,5 +306,8 @@ async fn test_undo_redo() -> anyhow::Result<()> {
     // * <C-i>       Jump forward to line 1.
     test(("#[|]#", "[<space><C-s>kduU<C-o><C-i>", "#[|]#")).await?;
 
+    // In this case we 'redo' manually to ensure that the transactions are composing correctly.
+    test(("#[|]#", "[<space>u[<space>u", "#[|]#")).await?;
+
     Ok(())
 }

From 452f7d071ceb57aad9da36473e6d2a0f0bedb462 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sat, 22 Oct 2022 12:51:20 -0500
Subject: [PATCH 546/884] Improve Edoc highlighting within Erlang

This highlights edoc within Erlang comments. The trick was to have
the Erlang grammar consume newlines and then give them to EDoc in the
injection to use so that line-wise elements could be parsed accurately.
---
 languages.toml                        |  4 ++--
 runtime/queries/edoc/highlights.scm   |  2 ++
 runtime/queries/edoc/injections.scm   |  4 ++--
 runtime/queries/erlang/highlights.scm | 10 ++++++----
 runtime/queries/erlang/injections.scm |  9 +++++++--
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/languages.toml b/languages.toml
index 1e7dcbf7..9007cc65 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1184,7 +1184,7 @@ language-server = { command = "erlang_ls" }
 
 [[grammar]]
 name = "erlang"
-source = { git = "https://github.com/the-mikedavis/tree-sitter-erlang", rev = "0e7d677d11a7379686c53c616825714ccb728059" }
+source = { git = "https://github.com/the-mikedavis/tree-sitter-erlang", rev = "ce0ed253d72c199ab93caba7542b6f62075339c4" }
 
 [[language]]
 name = "kotlin"
@@ -1574,7 +1574,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[grammar]]
 name = "edoc"
-source = { git = "https://github.com/the-mikedavis/tree-sitter-edoc", rev = "1691ec0aa7ad1ed9fa295590545f27e570d12d60" }
+source = { git = "https://github.com/the-mikedavis/tree-sitter-edoc", rev = "74774af7b45dd9cefbf9510328fc6ff2374afc50" }
 
 [[language]]
 name = "jsdoc"
diff --git a/runtime/queries/edoc/highlights.scm b/runtime/queries/edoc/highlights.scm
index 4267cb9e..5bab7992 100644
--- a/runtime/queries/edoc/highlights.scm
+++ b/runtime/queries/edoc/highlights.scm
@@ -48,3 +48,5 @@
   (language_identifier)
   (quote_content)
 ] @markup.raw.block
+
+(parameter) @variable.parameter
diff --git a/runtime/queries/edoc/injections.scm b/runtime/queries/edoc/injections.scm
index 9630995b..28c44b9f 100644
--- a/runtime/queries/edoc/injections.scm
+++ b/runtime/queries/edoc/injections.scm
@@ -16,5 +16,5 @@
    (tag) @_tag
    (argument) @injection.content)
  (#eq? @_tag "@type")
- (#set injection.language "erlang")
- (#set injection.include-children))
+ (#set! injection.language "erlang")
+ (#set! injection.include-children))
diff --git a/runtime/queries/erlang/highlights.scm b/runtime/queries/erlang/highlights.scm
index 58c8fb8a..050fb613 100644
--- a/runtime/queries/erlang/highlights.scm
+++ b/runtime/queries/erlang/highlights.scm
@@ -94,10 +94,6 @@
 (unary_operator operator: _ @operator)
 ["/" ":" "->"] @operator
 
-(tripledot) @comment.discard
-
-(comment) @comment
-
 ; Macros
 (macro
   "?"+ @constant
@@ -112,8 +108,14 @@
 ((variable) @comment.discard
  (#match? @comment.discard "^_"))
 
+(tripledot) @comment.discard
+
+[(comment) (line_comment) (shebang)] @comment
+
 ; Basic types
 (variable) @variable
+((atom) @constant.builtin.boolean
+ (#match? @constant.builtin.boolean "^(true|false)$"))
 (atom) @string.special.symbol
 (string) @string
 (character) @constant.character
diff --git a/runtime/queries/erlang/injections.scm b/runtime/queries/erlang/injections.scm
index 07858185..11cbd01e 100644
--- a/runtime/queries/erlang/injections.scm
+++ b/runtime/queries/erlang/injections.scm
@@ -1,2 +1,7 @@
-((comment_content) @injection.content
- (#set! injection.language "edoc"))
+((line_comment (comment_content) @injection.content)
+ (#set! injection.language "edoc")
+ (#set! injection.include-children)
+ (#set! injection.combined))
+
+((comment (comment_content) @injection.content)
+ (#set! injection.language "comment"))

From 5a1bed2b708f6874daa9f04b26b14b3106d2e447 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 2 Nov 2022 09:38:36 -0500
Subject: [PATCH 547/884] Add parameter highlights to Erlang

This doesn't work robustly (within pattern matches). Only regular
bindings are highlighted as parameters. In order to highlight all
parameters even in matches, we would need an arbitrary nesting operator
in queries which doesn't exist yet in tree-sitter.
---
 runtime/queries/erlang/highlights.scm | 34 ++++++++++++++++++++++++---
 runtime/queries/erlang/locals.scm     | 30 +++++++++++++++++++++++
 2 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 runtime/queries/erlang/locals.scm

diff --git a/runtime/queries/erlang/highlights.scm b/runtime/queries/erlang/highlights.scm
index 050fb613..3f4ef4cb 100644
--- a/runtime/queries/erlang/highlights.scm
+++ b/runtime/queries/erlang/highlights.scm
@@ -65,6 +65,37 @@
 (function_capture module: (atom) @namespace)
 (function_capture function: (atom) @function)
 
+; Ignored variables
+((variable) @comment.discard
+ (#match? @comment.discard "^_"))
+
+; Parameters
+; specs
+((attribute
+   name: (atom) @keyword
+   (stab_clause
+     pattern: (arguments (variable) @variable.parameter)
+     body: (variable)? @variable.parameter))
+ (#match? @keyword "(spec|callback)"))
+; functions
+(function_clause pattern: (arguments (variable) @variable.parameter))
+; anonymous functions
+(stab_clause pattern: (arguments (variable) @variable.parameter))
+; parametric types
+((attribute
+    name: (atom) @keyword
+    (arguments
+      (binary_operator
+        left: (call (arguments (variable) @variable.parameter))
+        operator: "::")))
+ (#match? @keyword "(type|opaque)"))
+; macros
+((attribute
+   name: (atom) @keyword
+   (arguments
+     (call (arguments (variable) @variable.parameter))))
+ (#eq? @keyword "define"))
+
 ; Records
 (record_content
   (binary_operator
@@ -105,9 +136,6 @@
   name: (_) @keyword.directive)
 
 ; Comments
-((variable) @comment.discard
- (#match? @comment.discard "^_"))
-
 (tripledot) @comment.discard
 
 [(comment) (line_comment) (shebang)] @comment
diff --git a/runtime/queries/erlang/locals.scm b/runtime/queries/erlang/locals.scm
new file mode 100644
index 00000000..7379926b
--- /dev/null
+++ b/runtime/queries/erlang/locals.scm
@@ -0,0 +1,30 @@
+; Specs and Callbacks
+(attribute
+  (stab_clause
+    pattern: (arguments (variable) @local.definition)
+    ; If a spec uses a variable as the return type (and later a `when` clause to type it):
+    body: (variable)? @local.definition)) @local.scope
+
+; parametric `-type`s
+((attribute
+    name: (atom) @_type
+    (arguments
+      (binary_operator
+        left: (call (arguments (variable) @local.definition))
+        operator: "::") @local.scope))
+ (#match? @_type "(type|opaque)"))
+
+; macros
+((attribute
+   name: (atom) @_define
+   (arguments
+     (call (arguments (variable) @local.definition)))) @local.scope
+ (#eq? @_define "define"))
+
+; `fun`s
+(anonymous_function (stab_clause pattern: (arguments (variable) @local.definition))) @local.scope
+
+; Ordinary functions
+(function_clause pattern: (arguments (variable) @local.definition)) @local.scope
+
+(variable) @local.reference

From cbc72e84d7a4c2a1ed5ec81bced3d280c69b4649 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 22 Nov 2022 21:28:17 -0600
Subject: [PATCH 548/884] Update tree-sitter-heex

tree-sitter-heex split out the ending_expression_value from the
partial_expression value which can help with indentation.
---
 languages.toml                      | 2 +-
 runtime/queries/heex/injections.scm | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/languages.toml b/languages.toml
index 9007cc65..f6a238f4 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1360,7 +1360,7 @@ config = { elixirLS.dialyzerEnabled = false }
 
 [[grammar]]
 name = "heex"
-source = { git = "https://github.com/phoenixframework/tree-sitter-heex", rev = "881f1c805f51485a26ecd7865d15c9ef8d606a78" }
+source = { git = "https://github.com/phoenixframework/tree-sitter-heex", rev = "2e1348c3cf2c9323e87c2744796cf3f3868aa82a" }
 
 [[language]]
 name = "sql"
diff --git a/runtime/queries/heex/injections.scm b/runtime/queries/heex/injections.scm
index d97e4b3e..159b6f0e 100644
--- a/runtime/queries/heex/injections.scm
+++ b/runtime/queries/heex/injections.scm
@@ -6,7 +6,11 @@
 ;     <%= if true do %>
 ;       <p>hello, tree-sitter!</p>
 ;     <% end %>
-((directive (partial_expression_value) @injection.content)
+((directive
+    [
+      (partial_expression_value)
+      (ending_expression_value)
+    ] @injection.content)
  (#set! injection.language "elixir")
  (#set! injection.include-children)
  (#set! injection.combined))

From ee06d4d337af7a46de294d88c00104b2ae836455 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 23 Nov 2022 16:27:26 -0600
Subject: [PATCH 549/884] Update tree-sitter-gleam

This update includes a handful of fixes, a new binary concatenation
operator (already highlighted by the `binary_operator` rule), and a
new `use` language construct. The nodes are backwards compatible but
this update introduces two new nodes for highlighting: `use` and `<-`.
---
 languages.toml                       | 2 +-
 runtime/queries/gleam/highlights.scm | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index f6a238f4..0d90c3f7 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1263,7 +1263,7 @@ language-server = { command = "gleam", args = ["lsp"] }
 
 [[grammar]]
 name = "gleam"
-source = { git = "https://github.com/gleam-lang/tree-sitter-gleam", rev = "d7861b2a4b4d594c58bb4f1be5f1f4ee4c67e5c3" }
+source = { git = "https://github.com/gleam-lang/tree-sitter-gleam", rev = "d6cbdf3477fcdb0b4d811518a356f9b5cd1795ed" }
 
 [[language]]
 name = "ron"
diff --git a/runtime/queries/gleam/highlights.scm b/runtime/queries/gleam/highlights.scm
index 8cff6b51..34b3ce65 100644
--- a/runtime/queries/gleam/highlights.scm
+++ b/runtime/queries/gleam/highlights.scm
@@ -80,6 +80,7 @@
   "todo"
   "try"
   "type"
+  "use"
 ] @keyword
 
 ; Punctuation
@@ -103,4 +104,5 @@
   "->"
   ".."
   "-"
+  "<-"
 ] @punctuation.delimiter

From 1d21683321b9f94161be14b4ec5b506ed1669c7f Mon Sep 17 00:00:00 2001
From: Jonathan LEI <me@xjonathan.dev>
Date: Thu, 24 Nov 2022 10:07:19 +0800
Subject: [PATCH 550/884] Exit select mode on surround commands (#4858)

---
 helix-term/src/commands.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 4eb9742f..659d353e 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4582,6 +4582,7 @@ fn surround_add(cx: &mut Context) {
         let transaction = Transaction::change(doc.text(), changes.into_iter())
             .with_selection(Selection::new(ranges, selection.primary_index()));
         apply_transaction(&transaction, doc, view);
+        exit_select_mode(cx);
     })
 }
 
@@ -4621,6 +4622,7 @@ fn surround_replace(cx: &mut Context) {
                 }),
             );
             apply_transaction(&transaction, doc, view);
+            exit_select_mode(cx);
         });
     })
 }
@@ -4648,6 +4650,7 @@ fn surround_delete(cx: &mut Context) {
         let transaction =
             Transaction::change(doc.text(), change_pos.into_iter().map(|p| (p, p + 1, None)));
         apply_transaction(&transaction, doc, view);
+        exit_select_mode(cx);
     })
 }
 

From e6dad960cf77a3a0fae92ee216d31c9dae59b0ec Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 23 Nov 2022 20:07:42 -0600
Subject: [PATCH 551/884] Drain pending requests on language server termination
 (#4852)

This prevents a freeze while shutting down when using `efm-langserver`.
`efm-langserver` exits immediately after seeing a shutdown request,
without responding to the request. We block awaiting the reply to the
shutdown request which will never come, so we time out.

This change responds to any pending requests with `Err` saying that the
stream has been closed.
---
 helix-lsp/src/transport.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/helix-lsp/src/transport.rs b/helix-lsp/src/transport.rs
index 68b3d15e..3e3e06ee 100644
--- a/helix-lsp/src/transport.rs
+++ b/helix-lsp/src/transport.rs
@@ -251,6 +251,16 @@ impl Transport {
                     };
                 }
                 Err(Error::StreamClosed) => {
+                    // Close any outstanding requests.
+                    for (id, tx) in transport.pending_requests.lock().await.drain() {
+                        match tx.send(Err(Error::StreamClosed)).await {
+                            Ok(_) => (),
+                            Err(_) => {
+                                error!("Could not close request on a closed channel (id={:?})", id)
+                            }
+                        }
+                    }
+
                     // Hack: inject a terminated notification so we trigger code that needs to happen after exit
                     use lsp_types::notification::Notification as _;
                     let notification =

From 2271c3aed9ccbecefa7b109f060bf5ab77c7c104 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 24 Nov 2022 20:40:48 -0600
Subject: [PATCH 552/884] Clear line on `<ret>` when line is all whitespace
 (#4854)

This matches the insert-mode behavior for Vim and Kakoune: if the
current line is empty except for whitespace, `<ret>` should insert a
line ending at the beginning of the line, moving any indentation to the
next line.
---
 helix-term/src/commands.rs | 89 +++++++++++++++++++++++---------------
 1 file changed, 54 insertions(+), 35 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 659d353e..5c6807f0 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3085,40 +3085,59 @@ pub mod insert {
             let curr = contents.get_char(pos).unwrap_or(' ');
 
             let current_line = text.char_to_line(pos);
-            let indent = indent::indent_for_newline(
-                doc.language_config(),
-                doc.syntax(),
-                &doc.indent_style,
-                doc.tab_width(),
-                text,
-                current_line,
-                pos,
-                current_line,
-            );
-            let mut text = String::new();
-            // If we are between pairs (such as brackets), we want to
-            // insert an additional line which is indented one level
-            // more and place the cursor there
-            let on_auto_pair = doc
-                .auto_pairs(cx.editor)
-                .and_then(|pairs| pairs.get(prev))
-                .and_then(|pair| if pair.close == curr { Some(pair) } else { None })
-                .is_some();
-
-            let local_offs = if on_auto_pair {
-                let inner_indent = indent.clone() + doc.indent_style.as_str();
-                text.reserve_exact(2 + indent.len() + inner_indent.len());
-                text.push_str(doc.line_ending.as_str());
-                text.push_str(&inner_indent);
-                let local_offs = text.chars().count();
-                text.push_str(doc.line_ending.as_str());
-                text.push_str(&indent);
-                local_offs
+            let line_is_only_whitespace = text
+                .line(current_line)
+                .chars()
+                .all(|char| char.is_ascii_whitespace());
+
+            let mut new_text = String::new();
+
+            // If the current line is all whitespace, insert a line ending at the beginning of
+            // the current line. This makes the current line empty and the new line contain the
+            // indentation of the old line.
+            let (from, to, local_offs) = if line_is_only_whitespace {
+                let line_start = text.line_to_char(current_line);
+                new_text.push_str(doc.line_ending.as_str());
+
+                (line_start, line_start, new_text.chars().count())
             } else {
-                text.reserve_exact(1 + indent.len());
-                text.push_str(doc.line_ending.as_str());
-                text.push_str(&indent);
-                text.chars().count()
+                let indent = indent::indent_for_newline(
+                    doc.language_config(),
+                    doc.syntax(),
+                    &doc.indent_style,
+                    doc.tab_width(),
+                    text,
+                    current_line,
+                    pos,
+                    current_line,
+                );
+
+                // If we are between pairs (such as brackets), we want to
+                // insert an additional line which is indented one level
+                // more and place the cursor there
+                let on_auto_pair = doc
+                    .auto_pairs(cx.editor)
+                    .and_then(|pairs| pairs.get(prev))
+                    .and_then(|pair| if pair.close == curr { Some(pair) } else { None })
+                    .is_some();
+
+                let local_offs = if on_auto_pair {
+                    let inner_indent = indent.clone() + doc.indent_style.as_str();
+                    new_text.reserve_exact(2 + indent.len() + inner_indent.len());
+                    new_text.push_str(doc.line_ending.as_str());
+                    new_text.push_str(&inner_indent);
+                    let local_offs = new_text.chars().count();
+                    new_text.push_str(doc.line_ending.as_str());
+                    new_text.push_str(&indent);
+                    local_offs
+                } else {
+                    new_text.reserve_exact(1 + indent.len());
+                    new_text.push_str(doc.line_ending.as_str());
+                    new_text.push_str(&indent);
+                    new_text.chars().count()
+                };
+
+                (pos, pos, local_offs)
             };
 
             let new_range = if doc.restore_cursor {
@@ -3139,9 +3158,9 @@ pub mod insert {
             // range.replace(|range| range.is_empty(), head); -> fn extend if cond true, new head pos
             // can be used with cx.mode to do replace or extend on most changes
             ranges.push(new_range);
-            global_offs += text.chars().count();
+            global_offs += new_text.chars().count();
 
-            (pos, pos, Some(text.into()))
+            (from, to, Some(new_text.into()))
         });
 
         transaction = transaction.with_selection(Selection::new(ranges, selection.primary_index()));

From 6cdc5673721a69d2eb6de17a5c229f3151f0dfad Mon Sep 17 00:00:00 2001
From: Jan Scheer <jhscheer@users.noreply.github.com>
Date: Sat, 26 Nov 2022 02:41:37 +0100
Subject: [PATCH 553/884] add theme nightfox (#4769)

This theme is an adaptation of
github.com/EdenEast/nightfox.nvim
---
 runtime/themes/nightfox.toml | 182 +++++++++++++++++++++++++++++++++++
 1 file changed, 182 insertions(+)
 create mode 100644 runtime/themes/nightfox.toml

diff --git a/runtime/themes/nightfox.toml b/runtime/themes/nightfox.toml
new file mode 100644
index 00000000..131cab19
--- /dev/null
+++ b/runtime/themes/nightfox.toml
@@ -0,0 +1,182 @@
+# Author: github.com/jhscheer
+#
+# This theme is an adaptation of
+# github.com/EdenEast/nightfox.nvim
+
+
+# INTERFACE
+# These scopes are used for theming the editor interface.
+
+"ui.background" = { bg = "bg1" } # Default background color.
+"ui.window" = { fg = "bg0" } # Window border between splits.
+"ui.gutter" = { fg = "fg3" } # Left gutter for diagnostics and breakpoints.
+
+"ui.text" = { fg = "fg1" } # Default text color.
+"ui.text.focus" = { bg = "sel1", fg = "fg1" } # Selection highlight in buffer-picker or file-picker.
+"ui.text.info" = { fg = "fg2", bg = "sel0" } # Info popup contents (space mode menu).
+
+"ui.cursor" = { bg = "fg3", fg = "bg1" } # Fallback cursor colour, non-primary cursors when there are multiple (shift-c).
+"ui.cursor.primary" = { bg = "fg1", fg = "bg1" } # The primary cursor when there are multiple (shift-c).
+"ui.cursor.match" = { fg = "yellow", modifiers = ["bold"] } # The matching parentheses of that under the cursor.
+
+"ui.selection" = { bg = "bg3" } # All currently selected text.
+"ui.selection.primary" = { bg = "bg4" } # The primary selection when there are multiple.
+"ui.cursorline.primary" = { bg = "bg3" } # The line of the primary cursor (if cursorline is enabled)
+# "ui.cursorline.secondary" = { } #	The lines of any other cursors (if cursorline is enabled)
+# "ui.cursorcolumn.primary" = { } #	The column of the primary cursor (if cursorcolumn is enabled)
+# "ui.cursorcolumn.secondary" = { } #	The columns of any other cursors (if cursorcolumn is enabled)
+
+"ui.linenr" = { fg = "fg3" } # Line numbers.
+"ui.linenr.selected" = { fg = "yellow", modifiers = ["bold"] } # Current line number.
+
+# "ui.virtual" = { } # Namespace for additions to the editing area.
+"ui.virtual.ruler" = { bg = "bg3" } # Vertical rulers (colored columns in editing area).
+"ui.virtual.whitespace" = { fg = "bg3" } # Whitespace markers in editing area.
+"ui.virtual.indent-guide" = { fg = "black" } # Vertical indent width guides
+
+"ui.statusline" = { fg = "fg2", bg = "bg0" } # Status line.
+"ui.statusline.inactive" = { fg = "fg3", bg = "bg0" } # Status line in unfocused windows.
+"ui.statusline.normal" = { bg = "blue", fg = "bg0", modifiers = ["bold"] } # Statusline mode during normal mode (only if editor.color-modes is enabled)
+"ui.statusline.insert" = { bg = "green", fg = "bg0", modifiers = ["bold"] } # Statusline mode during insert mode (only if editor.color-modes is enabled)
+"ui.statusline.select" = { bg = "magenta", fg = "bg0", modifiers = ["bold"] } # Statusline mode during select mode (only if editor.color-modes is enabled)
+
+"ui.help" = { bg = "sel0", fg = "fg1" } # Description box for commands.
+
+"ui.menu" = { bg = "sel0", fg = "fg1" } # Code and command completion menus.
+"ui.menu.selected" = { bg = "fg3" } # Selected autocomplete item.
+"ui.menu.scroll"	= { fg = "fg3" } # fg sets thumb color, bg sets track color of scrollbar.
+
+"ui.popup" = { bg = "bg0", fg = "fg1" } # Documentation popups (space-k).
+"ui.popup.info" = { bg = "sel0", fg = "fg1" } # Info popups box (space mode menu).
+
+"markup.raw" = { fg = "magenta" } # Code block in Markdown.
+"markup.raw.inline" = { fg = "orange" } # `Inline code block` in Markdown.
+"markup.heading" = { fg = "yellow", modifiers = ["bold"] }
+"markup.list" = { fg = "magenta", modifiers = ["bold"] }
+"markup.bold" = { fg = "orange", modifiers = ["bold"] }
+"markup.italic" = { fg = "pink" }
+"markup.link" = { fg = "yellow-bright", modifiers = ["bold"] }
+"markup.quote" = { fg = "blue" }
+
+
+# DIAGNOSTICS
+"warning" = { fg ="yellow", bg = "bg1" } # Diagnostics warning (gutter)
+"error" = { fg = "red", bg = "bg1" } # Diagnostics error (gutter)
+"info" = { fg = "blue", bg = "bg1" } # Diagnostics info (gutter)
+"hint" = { fg = "green", bg = "bg1" } # Diagnostics hint (gutter)
+"diagnostic" = { modifiers = ["underlined"] } # Diagnostics fallback style (editing area)
+"diagnostic.error" = { fg = "red" } #	Diagnostics error (editing area)
+"diagnostic.warning" = { fg = "yellow" } #	Diagnostics warning (editing area)
+"diagnostic.info" = { fg = "blue" } #	Diagnostics info (editing area)
+"diagnostic.hint" = { fg = "green" } #	Diagnostics hint (editing area)
+
+
+# SYNTAX HIGHLIGHTING
+# These keys match tree-sitter scopes.
+
+"special" = { fg = "fg2" } # Special symbols e.g `?` in Rust, `...` in Hare.
+"attribute" = { fg = "yellow" } # Class attributes, html tag attributes.
+
+"type" = { fg = "yellow" } # Variable type, like integer or string, including program defined classes, structs etc..
+"type.builtin" = { fg = "cyan-bright" } # Primitive types of the language (string, int, float).
+"type.enum.variant" = { fg = "orange-bright" }
+
+"constructor" = { fg = "magenta" } # Constructor method for a class or struct.
+
+"constant" = { fg = "orange-bright" } # Constant value
+"constant.builtin" = { fg = "orange-bright" } # Special constants like `true`, `false`, `none`, etc.
+"constant.builtin.boolean" = { fg = "orange" } # True or False.
+"constant.character" = { fg = "green" } # Constant of character type.
+"constant.character.escape" = { fg = "yellow-bright", modifiers = ["bold"] } # escape codes like \n.
+"constant.numeric"  = { fg = "orange" } # constant integer or float value.
+
+"string" = { fg = "green" } # String literal.
+"string.regexp" = { fg = "yellow-bright" } # Regular expression literal.
+"string.special" = { fg = "yellow-bright", modifiers = ["bold"] } # Strings containing a path, URL, etc.
+"string.special.url" = { fg = "cyan", modifiers = ["bold"] } # String containing a web URL.
+
+"comment" = { fg = "comment" } # This is a comment.
+"comment.block.documentation" = { fg = "comment", modifiers = ["bold"] } # Doc comments, e.g '///' in rust.
+
+"variable" = { fg = "white" }  # Variable names.
+"variable.builtin" = { fg = "red" } # Language reserved variables: `this`, `self`, `super`, etc.
+"variable.parameter" = { fg = "cyan-bright" } # Function parameters.
+"variable.other.member" = { fg = "fg2" } # Fields of composite data types (e.g. structs, unions).
+
+"label" = { fg = "magenta-bright" } # lifetimes - Loop labels, among other things.
+
+"punctuation" = { fg = "fg2" } # Any punctuation symbol.
+# "punctuation.delimiter" = { fg = "fg2" } # Commas, colons or other delimiter depending on the language.
+# "punctuation.bracket" = { fg = "fg2" } # Parentheses, angle brackets, etc.
+# "punctuation.special" = { fg = "fg2" } # String interpolation brackets
+
+"keyword" = { fg = "magenta" } # Language reserved keywords.
+"keyword.control" = { fg = "pink" } # Control keywords.
+"keyword.control.conditional" = { fg = "magenta-bright" } # `if`, `else`, `elif`.
+"keyword.control.repeat" = { fg = "magenta-bright" } # `for`, `while`, `loop`.
+"keyword.control.import" = { fg = "pink-bright" } # `import`, `export` `use`.
+"keyword.control.return" = { fg = "magenta" } # `return` in most languages.
+"keyword.control.exception" = { fg = "magenta" } # `try`, `catch`, `raise`/`throw` and related.
+"keyword.operator" = { fg = "fg2", modifiers = ["bold"] } # 'or', 'and', 'in'.
+"keyword.directive" = { fg = "pink-bright" } # Preprocessor directives (#if in C...).
+"keyword.function" = { fg = "red" } # The keyword to define a funtion: 'def', 'fun', 'fn'.
+"keyword.storage" = { fg = "magenta" } # Keywords describing how things are stored
+"keyword.storage.type" = { fg = "magenta" } #  The type of something, class, function, var, let, etc.
+"keyword.storage.modifier" = { fg = "yellow" } # Storage modifiers like static, mut, const, ref, etc.
+
+"operator" = {  fg = "fg2" } # Logical, mathematical, and other operators.
+
+"function" = { fg = "blue-bright" }
+"function.builtin" = { fg = "red" }
+"function.macro" = { fg = "red" }
+# "function.special" = { fg = "blue-bright" } # Preprocessor function in C.
+# "function.method" = { fg = "blue-bright" } # Class / Struct methods.
+
+"tag" = { fg = "blue-bright" } # As in <body> for html, css tags.
+
+"namespace" = { fg = "cyan-bright" } # Namespace or module identifier.
+
+
+# Diff ==============================
+# Version control changes.
+
+"diff.plus" = "green-dim" # Additions.
+"diff.minus" = "red-dim" # Deletions.
+"diff.delta" = "blue-dim" # Modifications.
+"diff.delta.moved" = "cyan-dim" # Renamed or moved files.
+
+# color palette
+[palette]
+black          = "#393b44"
+red            = "#c94f6d"
+red-dim        = "#2f2837"
+green          = "#81b29a"
+green-dim      = "#26343c"
+yellow         = "#dbc074"
+yellow-bright  = "#e0c989"
+blue           = "#719cd6"
+blue-bright    = "#86abdc"
+blue-dim       = "#2f2837"
+magenta        = "#9d79d6"
+magenta-bright = "#baa1e2"
+cyan           = "#63cdcf"
+cyan-bright    = "#7ad4d6"
+cyan-dim       = "#253f4a"
+white          = "#dfdfe0"
+orange         = "#f4a261"
+orange-bright  = "#f6b079"
+pink           = "#d67ad2"
+pink-bright    = "#dc8ed9"
+comment        = "#738091"
+# spec
+bg0            = "#131a24" # Dark bg (status line and float)
+bg1            = "#192330" # Default bg
+bg2            = "#212e3f" # Lighter bg (colorcolm folds)
+bg3            = "#29394f" # Lighter bg (cursor line)
+bg4            = "#39506d" # Conceal, border fg
+fg0            = "#d6d6d7" # Lighter fg
+fg1            = "#cdcecf" # Default fg
+fg2            = "#aeafb0" # Darker fg (status line)
+fg3            = "#71839b" # Darker fg (line numbers, fold colums)
+sel0           = "#2b3b51" # Popup bg, visual selection bg
+sel1           = "#3c5372" # Popup sel bg, search bg

From f2a55331d01be76765b8b20d64dbc55e75be55ee Mon Sep 17 00:00:00 2001
From: Chickenkeeper <artofchrism@gmail.com>
Date: Sat, 26 Nov 2022 01:43:41 +0000
Subject: [PATCH 554/884] Bump tree-sitter-html version (#4881)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 0d90c3f7..8c3f19e4 100644
--- a/languages.toml
+++ b/languages.toml
@@ -454,7 +454,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "html"
-source = { git = "https://github.com/tree-sitter/tree-sitter-html", rev = "d93af487cc75120c89257195e6be46c999c6ba18" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-html", rev = "29f53d8f4f2335e61bf6418ab8958dac3282077a" }
 
 [[language]]
 name = "python"

From 4e52d4d6f456e082f29f585c7a03a3ef1cbf156e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= <matousdzivjak@gmail.com>
Date: Sat, 26 Nov 2022 02:52:34 +0100
Subject: [PATCH 555/884] feat(themes): improve fleetish (#4813)

Small adjustements to the fleetish theme to improve readability
in certain cases. Specifically:

- use darker background for menues as it (purely subjectively) loooks
  better
- use different color for `constant.buildin.boolean` and
  `keyword` to make statements such as `return true` read better
- use different colors for different markup link parts
- destructure the config where appliable
---
 runtime/themes/fleetish.toml | 165 ++++++++++++++++++-----------------
 1 file changed, 86 insertions(+), 79 deletions(-)

diff --git a/runtime/themes/fleetish.toml b/runtime/themes/fleetish.toml
index 74340cae..159daf87 100644
--- a/runtime/themes/fleetish.toml
+++ b/runtime/themes/fleetish.toml
@@ -1,101 +1,116 @@
 # Author: Kristoffer Flottorp <kr.fl@outlook.com>
 # A take on the JetBrains Fleet theme sprinkled with some creative freedom
 
-"type" = { fg = "yellow" } # .builtin
-"constructor" = { fg = "yellow" }
-"constant" = { fg = "cyan" }
+"type" = "light_blue"
+"type.builtin" = "orange"
+"constructor" = "yellow"
+"constant" = "cyan"
 # "constant.builtin" = {} # .boolean
-"constant.builtin.boolean" = { fg = "cyan" } # .boolean
-# "constant.character" = {} #.escape
-"constant.numeric" = { fg = "yellow" } # .integer / .float
-"string" = { fg = "pink" } # .regexp
-# "string.special" = {} #.path / .url / .symbol
-"string.special" = { modifiers = ["underlined"] } #.path / .url / .symbol
-"comment" = { fg = "dark_gray" } # .line
+"constant.builtin.boolean" = "yellow"
+"constant.character" = "yellow"
+"constant.characted.escape" = "light"
+"constant.numeric" = "yellow"
+"string" = "pink"
+"string.regexp" = "light"
+"string.special" = { fg = "yellow", modifiers = ["underlined"] } #.path / .url / .symbol
+"comment" = "light_gray" # .line
 # "comment.block" = {} # .documentation
-"variable" = { fg = "light" } # .builtin / .parameter
+"variable" = "light" # .builtin
+"variable.parameter" = "light"
 # "variable.other" = {} # .member
-"variable.other.member" = { fg = "purple" }
-"label" = { fg = "yellow" }
-# "punctuation" = {} # .delimiter / .bracket
-"keyword" = { fg = "cyan" } # .operator / .directive / .function
-# "keyword.control" = { fg = "orange" } # .conditional / .repeat / .import / .return / .exception
-"operator" = { fg = "light" }
-"function" = { fg = "blue" } # .builtin / .method / .macro / .special
-"function.macro" = { fg = "green" }
-"function.special" = { fg = "green" }
-"tag" = { fg = "green"}
-"special" = { fg = "green" }
-"namespace" = { fg = "light" }
-"markup" = { fg = "purple" } # .bold / .italic / .quote
-"markup.heading" = { fg = "light" } # .marker / .1 / .2 / .3 / .4 / .5 / .6
-"markup.heading.1" = { fg = "yellow" }
-"markup.heading.2" = { fg = "green" }
-"markup.heading.3" = { fg = "pink" }
-"markup.heading.4" = { fg = "purple" }
-"markup.heading.5" = { fg = "cyan" }
-"markup.heading.6" = { fg = "blue" }
-"markup.list" = { fg = "cyan" } # .unnumbered / .numbered
-"markup.link" = { fg = "green" } # .url / .label / .text
-"markup.raw" = { fg = "pink" } # .inline / .block
-# "diff" = {} # .plus / .minus
-"diff.plus" = { fg = "cyan" }
-"diff.minus" = { fg = "yellow" }
-"diff.delta" = { fg = "purple" } # .moved
+"variable.other.member" = "yellow"
+"label" = "yellow"
+"punctuation" = "light" # .delimiter / .bracket
+"keyword" = "cyan" # .operator / .directive / .function
+"keyword.control" = "yellow" # .conditional / .repeat / .import / .return / .exception
+"operator" = "light"
+"function" = "yellow"
+"function.macro" = "green"
+"function.builtin" = "green"
+"function.special" = "green"
+"function.method" = "light"
+"tag" = "green"
+"special" = "green"
+"namespace" = "light"
 
 # used in theming
 # "markup.normal" = {} # .completion / .hover
-# "markup.heading" = {} # .completion / .hover
 # "markup.raw.inline" = {} # .completion / .hover
+"markup" = "purple" # .quote
+"markup.bold" = { fg = "purple", modifiers = ["bold"] }
+"markup.italic" = { fg = "purple", modifiers = ["italic"] }
+"markup.heading" = "light" # .marker
+"markup.heading.1" = "yellow"
+"markup.heading.2" = "green"
+"markup.heading.3" = "pink"
+"markup.heading.4" = "purple"
+"markup.heading.5" = "cyan"
+"markup.heading.6" = "light_blue"
+"markup.list" = "cyan" # .unnumbered / .numbered
+"markup.link" = "green"
+"markup.link.url" = "pink"
+"markup.link.text" = "cyan"
+"markup.link.label" = "yellow"
+"markup.raw" = "pink" # .inline
+"markup.raw.block" = "orange"
+
+"diff.plus" = "cyan"
+"diff.minus" = "yellow"
+"diff.delta" = "purple"
 
 # ui specific
-"ui.background" = { bg = "darkest" } # .separator
+"ui.background" = { bg = "#0d0d0d" } # .separator
 "ui.cursor" = { bg = "dark_gray", modifiers = ["reversed"] } # .insert / .select / .match / .primary
 "ui.cursor.match" = { fg = "light", bg = "blue_accent" } # .insert / .select / .match / .primary
 "ui.cursorline" = { bg = "darker" }
-"ui.linenr" = { fg = "dark_gray" } # .selected
+"ui.linenr" = "dark_gray"
 "ui.linenr.selected" = { fg = "light_gray", bg = "darker" }
 "ui.statusline" = { fg = "light", bg = "darker" } # .inactive / .normal / .insert / .select
-"ui.statusline.inactive" = { fg = "dark", bg = "darker" } # .inactive / .normal / .insert / .select
-"ui.statusline.normal" = { fg = "lightest", bg = "darker"} # .inactive / .normal / .insert / .select
-"ui.statusline.insert" = { fg = "lightest", bg = "blue_accent" } # .inactive / .normal / .insert / .select
-"ui.statusline.select" = { fg = "lightest", bg = "orange_accent" } # .inactive / .normal / .insert / .select
-"ui.popup" = { fg = "light", bg = "dark" } # .info
+"ui.statusline.inactive" = { fg = "dark", bg = "darker" }
+"ui.statusline.normal" = { fg = "lightest", bg = "darker"}
+"ui.statusline.insert" = { fg = "lightest", bg = "blue_accent" }
+"ui.statusline.select" = { fg = "lightest", bg = "orange_accent" }
+"ui.popup" = { fg = "light", bg = "darkest" } # .info
 "ui.window" = { fg = "dark", bg = "darkest" }
-"ui.help" = { fg = "light", bg = "dark" }
-"ui.text" = { fg = "light" } # .focus / .info
-"ui.virtual" = { fg = "dark" } # .ruler / .whitespace
+"ui.help" = { fg = "light", bg = "darkest" }
+"ui.text" = "light" # .focus / .info
+"ui.virtual" = "dark" # .whitespace
 "ui.virtual.ruler" = { bg = "darker"}
-"ui.menu" = { fg = "light", bg = "dark" } # .selected
+"ui.menu" = { fg = "light", bg = "darker" } # .selected
 "ui.menu.selected" = { fg = "lightest", bg = "blue_accent" } # .selected
 "ui.selection" = { bg = "darker" } # .primary
 "ui.selection.primary" = { bg = "select" } # .primary
-"hint" = { fg = "blue_accent"}
-"info" = { fg = "yellow_accent" }
-"warning" = { fg = "orange_accent" }
-"error" = { fg = "diff_red_accent" }
-"diagnostic". underline = { style = "curl"  } 
+"hint" = "blue"
+"info" = "yellow_accent"
+"warning" = "orange_accent"
+"error" = "red"
+"diagnostic" = { modifiers = [] }
+"diagnostic.hint" = { underline = { color = "light", style = "curl" } }
+"diagnostic.info" = { underline = { color = "blue", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
 
 [palette]
-darkest = "#0F0F0F"
-darker = "#222222"
-dark = "#383838"
-select = "#102F5B"
+darkest = "#1e1e1e"
+darker = "#262626"
+dark = "#898989"
+select = "#102f5b"
 
-light = "#F0F0F0"
-lightest = "#FFFFFF"
+light = "#d6d6dd"
+lightest = "#ffffff"
 
-dark_gray = "#5B5B5B"
-light_gray = "#757575"
-purple = "#AC9CF9"
-blue = "#52A7F6" #"#94C1FA"
-pink = "#D898D8"
-green = "#AFCB85"
-cyan = "#78D0BD"
-orange = "#ECA775"
-yellow = "#E5C995"
+dark_gray = "#535353"
+light_gray = "#6d6d6d"
+purple = "#a390f0"
+light_blue = "#7dbeff"
+blue = "#52a7f6"
+pink = "#d898d8"
+green = "#afcb85"
+cyan = "#78d0bd"
+orange = "#efb080"
+yellow = "#e5c995"
+red = "#f44747"
 
-purple_accent = "#6363EE"
 blue_accent = "#2197F3"
 pink_accent = "#E44C7A"
 green_accent = "#00AF99"
@@ -104,11 +119,3 @@ yellow_accent = "#DEA407"
 
 # variables intended for future updates
 checkmark = "#44B254"
-
-diff_blue_accent = "#0079FF"
-diff_blue_bg = "#072037"
-diff_blue_fg = "#0079FF"
-
-diff_red_accent = "#EE113C"
-diff_red_bg = "#390B14"
-diff_red_fg = "#EC123B"

From 8529d756fad2eeea543b487e1ff5253857bc2e16 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Fri, 25 Nov 2022 20:52:22 -0600
Subject: [PATCH 556/884] Remove selections for closed views on all documents
 (#4888)

Previously we removed selections for a closed view on only the
currently focused document. A view might have selections in other
documents though, so the view needs to be removed from all documents.
---
 helix-view/src/editor.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 23e0a497..6eaa89aa 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1116,9 +1116,10 @@ impl Editor {
     }
 
     pub fn close(&mut self, id: ViewId) {
-        let (_view, doc) = current!(self);
-        // remove selection
-        doc.remove_view(id);
+        // Remove selections for the closed view on all documents.
+        for doc in self.documents_mut() {
+            doc.remove_view(id);
+        }
         self.tree.remove(id);
         self._refresh();
     }

From fc811726e0e74dd6597f1ebbbd095901b8a78a3e Mon Sep 17 00:00:00 2001
From: Lennard Hofmann <lennard.hofmann@web.de>
Date: Sat, 26 Nov 2022 17:17:10 +0100
Subject: [PATCH 557/884] Update tree-sitter-java and add Java textobjects
 (#4886)

---
 book/src/generated/lang-support.md   |  2 +-
 languages.toml                       |  2 +-
 runtime/queries/java/highlights.scm  | 19 +++++++++++++--
 runtime/queries/java/injections.scm  |  2 +-
 runtime/queries/java/textobjects.scm | 35 ++++++++++++++++++++++++++++
 5 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 runtime/queries/java/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index ac955036..487057e6 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -56,7 +56,7 @@
 | idris |  |  |  | `idris2-lsp` |
 | iex | ✓ |  |  |  |
 | ini | ✓ |  |  |  |
-| java | ✓ |  |  | `jdtls` |
+| java | ✓ | ✓ |  | `jdtls` |
 | javascript | ✓ | ✓ | ✓ | `typescript-language-server` |
 | jsdoc | ✓ |  |  |  |
 | json | ✓ |  | ✓ | `vscode-json-language-server` |
diff --git a/languages.toml b/languages.toml
index 8c3f19e4..d616ce9e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -617,7 +617,7 @@ indent = { tab-width = 4, unit = "    " }
 
 [[grammar]]
 name = "java"
-source = { git = "https://github.com/tree-sitter/tree-sitter-java", rev = "bd6186c24d5eb13b4623efac9d944dcc095c0dad" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-java", rev = "09d650def6cdf7f479f4b78f595e9ef5b58ce31e" }
 
 [[language]]
 name = "ledger"
diff --git a/runtime/queries/java/highlights.scm b/runtime/queries/java/highlights.scm
index 77902fce..f049b8d2 100644
--- a/runtime/queries/java/highlights.scm
+++ b/runtime/queries/java/highlights.scm
@@ -21,6 +21,8 @@
   name: (identifier) @type)
 (class_declaration
   name: (identifier) @type)
+(record_declaration
+  name: (identifier) @type)
 (enum_declaration
   name: (identifier) @type)
 
@@ -33,6 +35,8 @@
 
 (constructor_declaration
   name: (identifier) @type)
+(compact_constructor_declaration
+  name: (identifier) @type)
 
 (type_identifier) @type
 
@@ -59,6 +63,7 @@
   (hex_integer_literal)
   (decimal_integer_literal)
   (octal_integer_literal)
+  (binary_integer_literal)
 ] @constant.numeric.integer
 
 [
@@ -67,7 +72,11 @@
 ] @constant.numeric.float
 
 (character_literal) @constant.character
-(string_literal) @string
+
+[
+  (string_literal)
+  (text_block)
+] @string
 
 [
   (true)
@@ -75,7 +84,8 @@
   (null_literal)
 ] @constant.builtin
 
-(comment) @comment
+(line_comment) @comment
+(block_comment) @comment
 
 ; Keywords
 
@@ -104,15 +114,19 @@
   "module"
   "native"
   "new"
+  "non-sealed"
   "open"
   "opens"
   "package"
+  "permits"
   "private"
   "protected"
   "provides"
   "public"
   "requires"
+  "record"
   "return"
+  "sealed"
   "static"
   "strictfp"
   "switch"
@@ -127,4 +141,5 @@
   "volatile"
   "while"
   "with"
+  "yield"
 ] @keyword
diff --git a/runtime/queries/java/injections.scm b/runtime/queries/java/injections.scm
index 321c90ad..e4509a5f 100644
--- a/runtime/queries/java/injections.scm
+++ b/runtime/queries/java/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content
+([(line_comment) (block_comment)] @injection.content
  (#set! injection.language "comment"))
diff --git a/runtime/queries/java/textobjects.scm b/runtime/queries/java/textobjects.scm
new file mode 100644
index 00000000..a932c793
--- /dev/null
+++ b/runtime/queries/java/textobjects.scm
@@ -0,0 +1,35 @@
+(method_declaration
+  body: (_) @function.inside) @function.around
+
+(interface_declaration
+  body: (_) @class.inside) @class.around
+
+(class_declaration
+  body: (_) @class.inside) @class.around
+
+(record_declaration
+  body: (_) @class.inside) @class.around
+
+(enum_declaration
+  body: (_) @class.inside) @class.around
+
+(formal_parameters
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(type_parameters
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(type_arguments
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+(argument_list
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
+
+[
+  (line_comment)
+  (block_comment)
+] @comment.inside
+
+(line_comment)+ @comment.around
+
+(block_comment) @comment.around

From f0f295a6679655dccfab0c1e0e9bb4a87e351db5 Mon Sep 17 00:00:00 2001
From: Filipe Azevedo <filipe@azevedo.io>
Date: Sat, 26 Nov 2022 20:40:43 +0000
Subject: [PATCH 558/884] reload-all: Only update viewport when view focuses on
 the doc (#4901)

---
 helix-term/src/commands/typed.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 475f14d1..351692fd 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1070,8 +1070,9 @@ fn reload_all(
 
         for view_id in view_ids {
             let view = view_mut!(cx.editor, view_id);
-
-            view.ensure_cursor_in_view(doc, scrolloff);
+            if view.doc.eq(&doc_id) {
+                view.ensure_cursor_in_view(doc, scrolloff);
+            }
         }
     }
 

From 583c2a5456263865c8aaf8b260909bfe431db549 Mon Sep 17 00:00:00 2001
From: gavincrawford <94875769+gavincrawford@users.noreply.github.com>
Date: Sun, 27 Nov 2022 08:36:52 -0700
Subject: [PATCH 559/884] Fix Go variable indentation (#4906)

---
 runtime/queries/go/indents.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/queries/go/indents.scm b/runtime/queries/go/indents.scm
index d75417d9..8bfc7c3f 100644
--- a/runtime/queries/go/indents.scm
+++ b/runtime/queries/go/indents.scm
@@ -16,6 +16,7 @@
   (block)
   (type_switch_statement)
   (expression_switch_statement)
+  (var_declaration)
 ] @indent
 
 [

From bf908cc4a11b7567800b2e3d5b48b5b29a330911 Mon Sep 17 00:00:00 2001
From: Chickenkeeper <artofchrism@gmail.com>
Date: Mon, 28 Nov 2022 01:11:12 +0000
Subject: [PATCH 560/884] Update CSS syntax highlighting (#4882)

---
 languages.toml                     |   2 +-
 runtime/queries/css/highlights.scm | 115 +++++++++++++++++------------
 2 files changed, 69 insertions(+), 48 deletions(-)

diff --git a/languages.toml b/languages.toml
index d616ce9e..756315cd 100644
--- a/languages.toml
+++ b/languages.toml
@@ -426,7 +426,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "css"
-source = { git = "https://github.com/tree-sitter/tree-sitter-css", rev = "94e10230939e702b4fa3fa2cb5c3bc7173b95d07" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-css", rev = "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51" }
 
 [[language]]
 name = "scss"
diff --git a/runtime/queries/css/highlights.scm b/runtime/queries/css/highlights.scm
index 4dfc0c66..b5262e8f 100644
--- a/runtime/queries/css/highlights.scm
+++ b/runtime/queries/css/highlights.scm
@@ -1,64 +1,85 @@
 (comment) @comment
 
-(tag_name) @tag
-(nesting_selector) @tag
-(universal_selector) @tag
+[
+ (tag_name)
+ (nesting_selector)
+ (universal_selector)
+] @tag
 
-"~" @operator
-">" @operator
-"+" @operator
-"-" @operator
-"*" @operator
-"/" @operator
-"=" @operator
-"^=" @operator
-"|=" @operator
-"~=" @operator
-"$=" @operator
-"*=" @operator
+[
+ "~"
+ ">"
+ "+"
+ "-"
+ "*"
+ "/"
+ "="
+ "^="
+ "|="
+ "~="
+ "$="
+ "*="
+] @operator
 
-"and" @operator
-"or" @operator
-"not" @operator
-"only" @operator
-
-(attribute_selector (plain_value) @string)
-(pseudo_element_selector (tag_name) @attribute)
-(pseudo_class_selector (class_name) @attribute)
-
-(class_name) @variable.other.member
-(id_name) @variable.other.member
-(namespace_name) @variable.other.member
-(property_name) @variable.other.member
-(feature_name) @variable.other.member
-
-(attribute_name) @attribute
-
-(function_name) @function
+[
+ "and"
+ "not"
+ "only"
+ "or"
+] @keyword.operator
 
 ((property_name) @variable
  (#match? @variable "^--"))
 ((plain_value) @variable
  (#match? @variable "^--"))
 
-"@media" @keyword
-"@import" @keyword
-"@charset" @keyword
-"@namespace" @keyword
-"@supports" @keyword
-"@keyframes" @keyword
-(at_keyword) @keyword
-(to) @keyword
-(from) @keyword
-(important) @keyword
+(attribute_name) @attribute
+(class_name) @label
+(feature_name) @variable.other.member
+(function_name) @function
+(id_name) @label
+(namespace_name) @namespace
+(property_name) @variable.other.member
+
+[
+ "@charset"
+ "@import"
+ "@keyframes"
+ "@media"
+ "@namespace"
+ "@supports"
+ (at_keyword)
+ (from)
+ (important)
+ (to)
+] @keyword
+
+[
+ "#"
+ "."
+] @punctuation
 
 (string_value) @string
+((color_value) "#") @string.special
 (color_value) @string.special
 
 (integer_value) @constant.numeric.integer
 (float_value) @constant.numeric.float
-(unit) @type
 
-"#" @punctuation.delimiter
-"," @punctuation.delimiter
-":" @punctuation.delimiter
+[
+ ")"
+ "("
+ "["
+ "]"
+ "{"
+ "}"
+] @punctuation.bracket
+
+[
+ ","
+ ";"
+ ":"
+ "::"
+] @punctuation.delimiter
+
+(plain_value) @constant

From a549328ef29b9f0911b04e9517bf55962d32dea2 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Mon, 28 Nov 2022 02:51:26 +0100
Subject: [PATCH 561/884] bump ropey to 1.5.1-alpha

---
 Cargo.lock            | 4 ++--
 helix-core/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 616c5317..1d0ee4df 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -931,9 +931,9 @@ dependencies = [
 
 [[package]]
 name = "ropey"
-version = "1.5.0"
+version = "1.5.1-alpha"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd22239fafefc42138ca5da064f3c17726a80d2379d817a3521240e78dd0064"
+checksum = "917e62c0dee8926492dd13164b3cefaad2b0e03ab49f48c0d41635797a7409b3"
 dependencies = [
  "smallvec",
  "str_indices",
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index eb886c90..09665b91 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -17,7 +17,7 @@ integration = []
 [dependencies]
 helix-loader = { version = "0.6", path = "../helix-loader" }
 
-ropey = { version = "1.5", default-features = false, features = ["simd"] }
+ropey = { version = "1.5.1-alpha", default-features = false, features = ["simd"] }
 smallvec = "1.10"
 smartstring = "1.0.1"
 unicode-segmentation = "1.10"

From da355a3231174ac019b43a31958b73e818e6463f Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Mon, 28 Nov 2022 03:20:54 +0100
Subject: [PATCH 562/884] Significantly improve performance of `:reload`
 (#4457)

* bump ropey to 1.5.1-alpha

* significantly improve performance of :reload
---
 Cargo.lock                    | 259 ++++++++++++++++++++++++----------
 helix-core/Cargo.toml         |   2 +-
 helix-core/src/diff.rs        | 248 ++++++++++++++++++++++++++------
 helix-core/src/transaction.rs |   6 +-
 4 files changed, 389 insertions(+), 126 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1d0ee4df..05a0396f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -27,9 +27,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.18"
+version = "0.7.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
 dependencies = [
  "memchr",
 ]
@@ -80,9 +80,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.11.0"
+version = "3.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
+checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
 
 [[package]]
 name = "bytecount"
@@ -92,9 +92,9 @@ checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
 
 [[package]]
 name = "bytes"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
+checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
 
 [[package]]
 name = "cassowary"
@@ -148,6 +148,16 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "codespan-reporting"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+dependencies = [
+ "termcolor",
+ "unicode-width",
+]
+
 [[package]]
 name = "content_inspector"
 version = "0.2.4"
@@ -165,12 +175,11 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.11"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc"
+checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
 dependencies = [
  "cfg-if",
- "once_cell",
 ]
 
 [[package]]
@@ -199,6 +208,50 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "cxx"
+version = "1.0.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453"
+dependencies = [
+ "cc",
+ "cxxbridge-flags",
+ "cxxbridge-macro",
+ "link-cplusplus",
+]
+
+[[package]]
+name = "cxx-build"
+version = "1.0.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0"
+dependencies = [
+ "cc",
+ "codespan-reporting",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "scratch",
+ "syn",
+]
+
+[[package]]
+name = "cxxbridge-flags"
+version = "1.0.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71"
+
+[[package]]
+name = "cxxbridge-macro"
+version = "1.0.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "dirs-next"
 version = "2.0.0"
@@ -345,9 +398,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
 dependencies = [
  "cfg-if",
  "libc",
@@ -436,6 +489,7 @@ dependencies = [
  "etcetera",
  "hashbrown 0.13.1",
  "helix-loader",
+ "imara-diff",
  "log",
  "once_cell",
  "quickcheck",
@@ -443,7 +497,6 @@ dependencies = [
  "ropey",
  "serde",
  "serde_json",
- "similar",
  "slotmap",
  "smallvec",
  "smartstring",
@@ -594,18 +647,28 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.47"
+version = "0.1.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c495f162af0bf17656d0014a0eded5f3cd2f365fdd204548c2869db89359dc7"
+checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
+ "iana-time-zone-haiku",
  "js-sys",
- "once_cell",
  "wasm-bindgen",
  "winapi",
 ]
 
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+dependencies = [
+ "cxx",
+ "cxx-build",
+]
+
 [[package]]
 name = "idna"
 version = "0.3.0"
@@ -634,6 +697,16 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "imara-diff"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8"
+dependencies = [
+ "ahash 0.8.2",
+ "hashbrown 0.12.3",
+]
+
 [[package]]
 name = "indoc"
 version = "1.0.7"
@@ -651,15 +724,15 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
 
 [[package]]
 name = "js-sys"
-version = "0.3.59"
+version = "0.3.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2"
+checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -672,9 +745,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.132"
+version = "0.2.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
+checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
 
 [[package]]
 name = "libloading"
@@ -686,11 +759,20 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "link-cplusplus"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "lock_api"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390"
+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -726,18 +808,18 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "memmap2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95af15f345b17af2efc8ead6080fb8bc376f8cec1b35277b935637595fe77498"
+checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
+checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
 dependencies = [
  "libc",
  "log",
@@ -766,9 +848,9 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.13.1"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
+checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -792,9 +874,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
+checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
 dependencies = [
  "cfg-if",
  "libc",
@@ -823,9 +905,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.43"
+version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
 dependencies = [
  "unicode-ident",
 ]
@@ -870,9 +952,9 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
  "getrandom",
 ]
@@ -916,9 +998,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.27"
+version = "0.6.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
 
 [[package]]
 name = "remove_dir_all"
@@ -960,20 +1042,26 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
+[[package]]
+name = "scratch"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
+
 [[package]]
 name = "serde"
-version = "1.0.147"
+version = "1.0.148"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
+checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.147"
+version = "1.0.148"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
+checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -982,9 +1070,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.88"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7"
+checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
 dependencies = [
  "itoa",
  "ryu",
@@ -1044,12 +1132,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "similar"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf"
-
 [[package]]
 name = "slab"
 version = "0.4.7"
@@ -1121,9 +1203,9 @@ checksum = "9d9199fa80c817e074620be84374a520062ebac833f358d74b37060ce4a0f2c0"
 
 [[package]]
 name = "syn"
-version = "1.0.99"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
+checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1144,6 +1226,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "termcolor"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "termini"
 version = "0.1.4"
@@ -1301,9 +1392,9 @@ checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.3"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
 
 [[package]]
 name = "unicode-linebreak"
@@ -1317,9 +1408,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.21"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
 dependencies = [
  "tinyvec",
 ]
@@ -1373,9 +1464,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.82"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d"
+checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -1383,9 +1474,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.82"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f"
+checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
 dependencies = [
  "bumpalo",
  "log",
@@ -1398,9 +1489,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.82"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602"
+checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1408,9 +1499,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.82"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da"
+checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1421,9 +1512,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.82"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
+checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
 
 [[package]]
 name = "which"
@@ -1469,46 +1560,60 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-sys"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
 dependencies = [
+ "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
  "windows_i686_gnu",
  "windows_i686_msvc",
  "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
  "windows_x86_64_msvc",
 ]
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.36.1"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
 
 [[package]]
 name = "xtask"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 09665b91..31b6546f 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -38,7 +38,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 toml = "0.5"
 
-similar = "2.2"
+imara-diff = "0.1.0"
 
 encoding_rs = "0.8"
 
diff --git a/helix-core/src/diff.rs b/helix-core/src/diff.rs
index 6960c679..c754da30 100644
--- a/helix-core/src/diff.rs
+++ b/helix-core/src/diff.rs
@@ -1,58 +1,195 @@
-use crate::{Rope, Transaction};
+use std::ops::Range;
+use std::time::Instant;
 
-/// Compares `old` and `new` to generate a [`Transaction`] describing
-/// the steps required to get from `old` to `new`.
-pub fn compare_ropes(old: &Rope, new: &Rope) -> Transaction {
-    // `similar` only works on contiguous data, so a `Rope` has
-    // to be temporarily converted into a `String`.
-    let old_converted = old.to_string();
-    let new_converted = new.to_string();
-
-    // A timeout is set so after 1 seconds, the algorithm will start
-    // approximating. This is especially important for big `Rope`s or
-    // `Rope`s that are extremely dissimilar to each other.
-    let mut config = similar::TextDiff::configure();
-    config.timeout(std::time::Duration::from_secs(1));
-
-    let diff = config.diff_chars(&old_converted, &new_converted);
-
-    // The current position of the change needs to be tracked to
-    // construct the `Change`s.
-    let mut pos = 0;
-    Transaction::change(
-        old,
-        diff.ops()
+use imara_diff::intern::InternedInput;
+use imara_diff::Algorithm;
+use ropey::RopeSlice;
+
+use crate::{ChangeSet, Rope, Tendril, Transaction};
+
+/// A `imara_diff::Sink` that builds a `ChangeSet` for a character diff of a hunk
+struct CharChangeSetBuilder<'a> {
+    res: &'a mut ChangeSet,
+    hunk: &'a InternedInput<char>,
+    pos: u32,
+}
+
+impl imara_diff::Sink for CharChangeSetBuilder<'_> {
+    type Out = ();
+    fn process_change(&mut self, before: Range<u32>, after: Range<u32>) {
+        self.res.retain((before.start - self.pos) as usize);
+        self.res.delete(before.len());
+        self.pos = before.end;
+
+        let res = self.hunk.after[after.start as usize..after.end as usize]
+            .iter()
+            .map(|&token| self.hunk.interner[token])
+            .collect();
+
+        self.res.insert(res);
+    }
+
+    fn finish(self) -> Self::Out {
+        self.res.retain(self.hunk.before.len() - self.pos as usize);
+    }
+}
+
+struct LineChangeSetBuilder<'a> {
+    res: ChangeSet,
+    after: RopeSlice<'a>,
+    file: &'a InternedInput<RopeSlice<'a>>,
+    current_hunk: InternedInput<char>,
+    pos: u32,
+}
+
+impl imara_diff::Sink for LineChangeSetBuilder<'_> {
+    type Out = ChangeSet;
+
+    fn process_change(&mut self, before: Range<u32>, after: Range<u32>) {
+        let len = self.file.before[self.pos as usize..before.start as usize]
             .iter()
-            .map(|op| op.as_tag_tuple())
-            .filter_map(|(tag, old_range, new_range)| {
-                // `old_pos..pos` is equivalent to `start..end` for where
-                // the change should be applied.
-                let old_pos = pos;
-                pos += old_range.end - old_range.start;
-
-                match tag {
-                    // Semantically, inserts and replacements are the same thing.
-                    similar::DiffTag::Insert | similar::DiffTag::Replace => {
-                        // This is the text from the `new` rope that should be
-                        // inserted into `old`.
-                        let text: &str = {
-                            let start = new.char_to_byte(new_range.start);
-                            let end = new.char_to_byte(new_range.end);
-                            &new_converted[start..end]
-                        };
-                        Some((old_pos, pos, Some(text.into())))
+            .map(|&it| self.file.interner[it].len_chars())
+            .sum();
+        self.res.retain(len);
+        self.pos = before.end;
+
+        // do not perform diffs on large hunks
+        let len_before = before.end - before.start;
+        let len_after = after.end - after.start;
+
+        // Pure insertions/removals do not require a character diff.
+        // Very large changes are ignored because their character diff is expensive to compute
+        // TODO adjust heuristic to detect large changes?
+        if len_before == 0
+            || len_after == 0
+            || len_after > 5 * len_before
+            || 5 * len_after < len_before && len_before > 10
+            || len_before + len_after > 200
+        {
+            let remove = self.file.before[before.start as usize..before.end as usize]
+                .iter()
+                .map(|&it| self.file.interner[it].len_chars())
+                .sum();
+            self.res.delete(remove);
+            let mut fragment = Tendril::new();
+            if len_after > 500 {
+                // copying a rope line by line is slower then copying the entire
+                // rope. Use to_string for very large changes instead..
+                if self.file.after.len() == after.end as usize {
+                    if after.start == 0 {
+                        fragment = self.after.to_string().into();
+                    } else {
+                        let start = self.after.line_to_char(after.start as usize);
+                        fragment = self.after.slice(start..).to_string().into();
                     }
-                    similar::DiffTag::Delete => Some((old_pos, pos, None)),
-                    similar::DiffTag::Equal => None,
+                } else if after.start == 0 {
+                    let end = self.after.line_to_char(after.end as usize);
+                    fragment = self.after.slice(..end).to_string().into();
+                } else {
+                    let start = self.after.line_to_char(after.start as usize);
+                    let end = self.after.line_to_char(after.end as usize);
+                    fragment = self.after.slice(start..end).to_string().into();
                 }
-            }),
-    )
+            } else {
+                for &line in &self.file.after[after.start as usize..after.end as usize] {
+                    for chunk in self.file.interner[line].chunks() {
+                        fragment.push_str(chunk)
+                    }
+                }
+            };
+            self.res.insert(fragment);
+        } else {
+            // for reasonably small hunks, generating a ChangeSet from char diff can save memory
+            // TODO use a tokenizer (word diff?) for improved performance
+            let hunk_before = self.file.before[before.start as usize..before.end as usize]
+                .iter()
+                .flat_map(|&it| self.file.interner[it].chars());
+            let hunk_after = self.file.after[after.start as usize..after.end as usize]
+                .iter()
+                .flat_map(|&it| self.file.interner[it].chars());
+            self.current_hunk.update_before(hunk_before);
+            self.current_hunk.update_after(hunk_after);
+
+            // the histogram heuristic does not work as well
+            // for characters because the same characters often reoccur
+            // use myer diff instead
+            imara_diff::diff(
+                Algorithm::Myers,
+                &self.current_hunk,
+                CharChangeSetBuilder {
+                    res: &mut self.res,
+                    hunk: &self.current_hunk,
+                    pos: 0,
+                },
+            );
+
+            self.current_hunk.clear();
+        }
+    }
+
+    fn finish(mut self) -> Self::Out {
+        let len = self.file.before[self.pos as usize..]
+            .iter()
+            .map(|&it| self.file.interner[it].len_chars())
+            .sum();
+
+        self.res.retain(len);
+        self.res
+    }
+}
+
+struct RopeLines<'a>(RopeSlice<'a>);
+
+impl<'a> imara_diff::intern::TokenSource for RopeLines<'a> {
+    type Token = RopeSlice<'a>;
+    // TODO: improve performance of lines iterator (https://github.com/cessen/ropey/issues/25)
+    type Tokenizer = ropey::iter::Lines<'a>;
+
+    fn tokenize(&self) -> Self::Tokenizer {
+        self.0.lines()
+    }
+
+    fn estimate_tokens(&self) -> u32 {
+        // we can provide a perfect estimate which is very nice for performance
+        self.0.len_lines() as u32
+    }
+}
+
+/// Compares `old` and `new` to generate a [`Transaction`] describing
+/// the steps required to get from `old` to `new`.
+pub fn compare_ropes(before: &Rope, after: &Rope) -> Transaction {
+    let start = Instant::now();
+    let res = ChangeSet::with_capacity(32);
+    let after = after.slice(..);
+    let file = InternedInput::new(RopeLines(before.slice(..)), RopeLines(after));
+    let builder = LineChangeSetBuilder {
+        res,
+        file: &file,
+        after,
+        pos: 0,
+        current_hunk: InternedInput::default(),
+    };
+
+    let res = imara_diff::diff(Algorithm::Histogram, &file, builder).into();
+
+    log::debug!(
+        "rope diff took {}s",
+        Instant::now().duration_since(start).as_secs_f64()
+    );
+    res
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
 
+    fn test_identity(a: &str, b: &str) {
+        let mut old = Rope::from(a);
+        let new = Rope::from(b);
+        compare_ropes(&old, &new).apply(&mut old);
+        assert_eq!(old, new);
+    }
+
     quickcheck::quickcheck! {
         fn test_compare_ropes(a: String, b: String) -> bool {
             let mut old = Rope::from(a);
@@ -61,4 +198,25 @@ mod tests {
             old == new
         }
     }
+
+    #[test]
+    fn equal_files() {
+        test_identity("foo", "foo");
+    }
+
+    #[test]
+    fn trailing_newline() {
+        test_identity("foo\n", "foo");
+        test_identity("foo", "foo\n");
+    }
+
+    #[test]
+    fn new_file() {
+        test_identity("", "foo");
+    }
+
+    #[test]
+    fn deleted_file() {
+        test_identity("foo", "");
+    }
 }
diff --git a/helix-core/src/transaction.rs b/helix-core/src/transaction.rs
index 3fb39413..482fd6d9 100644
--- a/helix-core/src/transaction.rs
+++ b/helix-core/src/transaction.rs
@@ -56,7 +56,7 @@ impl ChangeSet {
     }
 
     // Changeset builder operations: delete/insert/retain
-    fn delete(&mut self, n: usize) {
+    pub(crate) fn delete(&mut self, n: usize) {
         use Operation::*;
         if n == 0 {
             return;
@@ -71,7 +71,7 @@ impl ChangeSet {
         }
     }
 
-    fn insert(&mut self, fragment: Tendril) {
+    pub(crate) fn insert(&mut self, fragment: Tendril) {
         use Operation::*;
 
         if fragment.is_empty() {
@@ -93,7 +93,7 @@ impl ChangeSet {
         self.changes.push(new_last);
     }
 
-    fn retain(&mut self, n: usize) {
+    pub(crate) fn retain(&mut self, n: usize) {
         use Operation::*;
         if n == 0 {
             return;

From 5c213f7de4df551284cf46631508b1b0d5244a5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20B=C3=BCnnig?= <github@epbuennig.me>
Date: Mon, 28 Nov 2022 16:19:16 +0100
Subject: [PATCH 563/884] fix(grammar): Add `block_comment` and
 `comment_environment` injection for latex comments (#4922)

---
 runtime/queries/latex/injections.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/runtime/queries/latex/injections.scm b/runtime/queries/latex/injections.scm
index d3fdb0ca..10137468 100644
--- a/runtime/queries/latex/injections.scm
+++ b/runtime/queries/latex/injections.scm
@@ -1,2 +1,6 @@
-((line_comment) @injection.content
- (#set! injection.language "comment"))
+([
+   (comment)
+   (line_comment)
+   (block_comment)
+   (comment_environment)
+ ] @injection.content (#set! injection.language "comment"))

From 04df9e444523ced5d3bedbe34e2f622d675cccb2 Mon Sep 17 00:00:00 2001
From: Kirawi <67773714+kirawi@users.noreply.github.com>
Date: Mon, 28 Nov 2022 20:07:47 -0500
Subject: [PATCH 564/884] delete outdated reference to cessen/ropey#25 (#4928)

---
 helix-core/src/diff.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/helix-core/src/diff.rs b/helix-core/src/diff.rs
index c754da30..a5d6d722 100644
--- a/helix-core/src/diff.rs
+++ b/helix-core/src/diff.rs
@@ -142,7 +142,6 @@ struct RopeLines<'a>(RopeSlice<'a>);
 
 impl<'a> imara_diff::intern::TokenSource for RopeLines<'a> {
     type Token = RopeSlice<'a>;
-    // TODO: improve performance of lines iterator (https://github.com/cessen/ropey/issues/25)
     type Tokenizer = ropey::iter::Lines<'a>;
 
     fn tokenize(&self) -> Self::Tokenizer {

From df5457a6e71b58a39e198642efd7be0c4963153d Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 27 Nov 2022 10:33:51 -0600
Subject: [PATCH 565/884] Remove eager application of transactions to all views

---
 helix-term/src/ui/editor.rs | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 73712503..6c8ee2d9 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1337,9 +1337,7 @@ impl Component for EditorView {
                 cx.editor.status_msg = None;
 
                 let mode = cx.editor.mode();
-                let (view, doc) = current!(cx.editor);
-                let original_doc_id = doc.id();
-                let original_doc_revision = doc.get_current_revision();
+                let (view, _) = current!(cx.editor);
                 let focus = view.id;
 
                 if let Some(on_next_key) = self.on_next_key.take() {
@@ -1415,31 +1413,13 @@ impl Component for EditorView {
                     let view = view_mut!(cx.editor, focus);
                     let doc = doc_mut!(cx.editor, &view.doc);
 
+                    view.ensure_cursor_in_view(doc, config.scrolloff);
+
                     // Store a history state if not in insert mode. This also takes care of
                     // committing changes when leaving insert mode.
                     if mode != Mode::Insert {
                         doc.append_changes_to_history(view.id);
                     }
-
-                    // If the current document has been changed, apply the changes to all views.
-                    // This ensures that selections in jumplists follow changes.
-                    if doc.id() == original_doc_id
-                        && doc.get_current_revision() != original_doc_revision
-                    {
-                        if let Some(transaction) =
-                            doc.history.get_mut().changes_since(original_doc_revision)
-                        {
-                            let doc = doc!(cx.editor, &original_doc_id);
-                            for (view, _focused) in cx.editor.tree.views_mut() {
-                                view.apply(&transaction, doc);
-                            }
-                        }
-                    }
-
-                    let view = view_mut!(cx.editor, focus);
-                    let doc = doc_mut!(cx.editor, &view.doc);
-
-                    view.ensure_cursor_in_view(doc, config.scrolloff);
                 }
 
                 EventResult::Consumed(callback)

From 4d1f5389f99013be99b9498fd3fee78eec6217f3 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 27 Nov 2022 10:46:42 -0600
Subject: [PATCH 566/884] Revert "Don't apply transactions to Views in
 undo/redo"

This reverts commit fd00f3a70eb626242bb2fcc9bddf2c4d94580a9a.
---
 helix-term/src/commands.rs       |  8 ++++----
 helix-term/src/commands/typed.rs |  4 ++--
 helix-view/src/document.rs       | 24 ++++++++++++------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 5c6807f0..0817ca73 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3321,7 +3321,7 @@ fn undo(cx: &mut Context) {
     let count = cx.count();
     let (view, doc) = current!(cx.editor);
     for _ in 0..count {
-        if !doc.undo(view.id) {
+        if !doc.undo(view) {
             cx.editor.set_status("Already at oldest change");
             break;
         }
@@ -3332,7 +3332,7 @@ fn redo(cx: &mut Context) {
     let count = cx.count();
     let (view, doc) = current!(cx.editor);
     for _ in 0..count {
-        if !doc.redo(view.id) {
+        if !doc.redo(view) {
             cx.editor.set_status("Already at newest change");
             break;
         }
@@ -3344,7 +3344,7 @@ fn earlier(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
     for _ in 0..count {
         // rather than doing in batch we do this so get error halfway
-        if !doc.earlier(view.id, UndoKind::Steps(1)) {
+        if !doc.earlier(view, UndoKind::Steps(1)) {
             cx.editor.set_status("Already at oldest change");
             break;
         }
@@ -3356,7 +3356,7 @@ fn later(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
     for _ in 0..count {
         // rather than doing in batch we do this so get error halfway
-        if !doc.later(view.id, UndoKind::Steps(1)) {
+        if !doc.later(view, UndoKind::Steps(1)) {
             cx.editor.set_status("Already at newest change");
             break;
         }
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 351692fd..89c310fa 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -481,7 +481,7 @@ fn earlier(
     let uk = args.join(" ").parse::<UndoKind>().map_err(|s| anyhow!(s))?;
 
     let (view, doc) = current!(cx.editor);
-    let success = doc.earlier(view.id, uk);
+    let success = doc.earlier(view, uk);
     if !success {
         cx.editor.set_status("Already at oldest change");
     }
@@ -500,7 +500,7 @@ fn later(
 
     let uk = args.join(" ").parse::<UndoKind>().map_err(|s| anyhow!(s))?;
     let (view, doc) = current!(cx.editor);
-    let success = doc.later(view.id, uk);
+    let success = doc.later(view, uk);
     if !success {
         cx.editor.set_status("Already at newest change");
     }
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 0eb54f25..08708528 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -857,11 +857,11 @@ impl Document {
         success
     }
 
-    fn undo_redo_impl(&mut self, view_id: ViewId, undo: bool) -> bool {
+    fn undo_redo_impl(&mut self, view: &mut View, undo: bool) -> bool {
         let mut history = self.history.take();
         let txn = if undo { history.undo() } else { history.redo() };
         let success = if let Some(txn) = txn {
-            self.apply_impl(txn, view_id)
+            self.apply_impl(txn, view.id) && view.apply(txn, self)
         } else {
             false
         };
@@ -875,13 +875,13 @@ impl Document {
     }
 
     /// Undo the last modification to the [`Document`]. Returns whether the undo was successful.
-    pub fn undo(&mut self, view_id: ViewId) -> bool {
-        self.undo_redo_impl(view_id, true)
+    pub fn undo(&mut self, view: &mut View) -> bool {
+        self.undo_redo_impl(view, true)
     }
 
     /// Redo the last modification to the [`Document`]. Returns whether the redo was successful.
-    pub fn redo(&mut self, view_id: ViewId) -> bool {
-        self.undo_redo_impl(view_id, false)
+    pub fn redo(&mut self, view: &mut View) -> bool {
+        self.undo_redo_impl(view, false)
     }
 
     pub fn savepoint(&mut self) {
@@ -894,7 +894,7 @@ impl Document {
         }
     }
 
-    fn earlier_later_impl(&mut self, view_id: ViewId, uk: UndoKind, earlier: bool) -> bool {
+    fn earlier_later_impl(&mut self, view: &mut View, uk: UndoKind, earlier: bool) -> bool {
         let txns = if earlier {
             self.history.get_mut().earlier(uk)
         } else {
@@ -902,7 +902,7 @@ impl Document {
         };
         let mut success = false;
         for txn in txns {
-            if self.apply_impl(&txn, view_id) {
+            if self.apply_impl(&txn, view.id) && view.apply(&txn, self) {
                 success = true;
             }
         }
@@ -914,13 +914,13 @@ impl Document {
     }
 
     /// Undo modifications to the [`Document`] according to `uk`.
-    pub fn earlier(&mut self, view_id: ViewId, uk: UndoKind) -> bool {
-        self.earlier_later_impl(view_id, uk, true)
+    pub fn earlier(&mut self, view: &mut View, uk: UndoKind) -> bool {
+        self.earlier_later_impl(view, uk, true)
     }
 
     /// Redo modifications to the [`Document`] according to `uk`.
-    pub fn later(&mut self, view_id: ViewId, uk: UndoKind) -> bool {
-        self.earlier_later_impl(view_id, uk, false)
+    pub fn later(&mut self, view: &mut View, uk: UndoKind) -> bool {
+        self.earlier_later_impl(view, uk, false)
     }
 
     /// Commit pending changes to history

From 056a19a003a290b7914c7b442ebd640b93eaba0c Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 27 Nov 2022 10:45:17 -0600
Subject: [PATCH 567/884] Sync changes between doc and view on switch

---
 helix-view/src/editor.rs |  7 ++++++-
 helix-view/src/view.rs   | 40 ++++++++++++++++++++++++++++++++++++----
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 6eaa89aa..e54c7497 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -959,7 +959,8 @@ impl Editor {
     fn _refresh(&mut self) {
         let config = self.config();
         for (view, _) in self.tree.views_mut() {
-            let doc = &self.documents[&view.doc];
+            let doc = doc_mut!(self, &view.doc);
+            view.sync_changes(doc);
             view.ensure_cursor_in_view(doc, config.scrolloff)
         }
     }
@@ -971,6 +972,7 @@ impl Editor {
 
         let doc = doc_mut!(self, &doc_id);
         doc.ensure_view_init(view.id);
+        view.sync_changes(doc);
 
         align_view(doc, view, Align::Center);
     }
@@ -1239,6 +1241,9 @@ impl Editor {
         // within view
         if prev_id != view_id {
             self.mode = Mode::Normal;
+            let view = view_mut!(self, view_id);
+            let doc = doc_mut!(self, &view.doc);
+            view.sync_changes(doc);
             self.ensure_cursor_in_view(view_id);
         }
     }
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index c917a1ab..845a5458 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -3,7 +3,10 @@ use helix_core::{
     pos_at_visual_coords, visual_coords_at_pos, Position, RopeSlice, Selection, Transaction,
 };
 
-use std::{collections::VecDeque, fmt};
+use std::{
+    collections::{HashMap, VecDeque},
+    fmt,
+};
 
 const JUMP_LIST_CAPACITY: usize = 30;
 
@@ -102,6 +105,11 @@ pub struct View {
     pub object_selections: Vec<Selection>,
     /// GutterTypes used to fetch Gutter (constructor) and width for rendering
     gutters: Vec<GutterType>,
+    /// A mapping between documents and the last history revision the view was updated at.
+    /// Changes between documents and views are synced lazily when switching windows. This
+    /// mapping keeps track of the last applied history revision so that only new changes
+    /// are applied.
+    doc_revisions: HashMap<DocumentId, usize>,
 }
 
 impl fmt::Debug for View {
@@ -126,6 +134,7 @@ impl View {
             last_modified_docs: [None, None],
             object_selections: Vec::new(),
             gutters: gutter_types,
+            doc_revisions: HashMap::new(),
         }
     }
 
@@ -349,10 +358,33 @@ impl View {
     /// Applies a [`Transaction`] to the view.
     /// Instead of calling this function directly, use [crate::apply_transaction]
     /// which applies a transaction to the [`Document`] and view together.
-    pub fn apply(&mut self, transaction: &Transaction, doc: &Document) -> bool {
+    pub fn apply(&mut self, transaction: &Transaction, doc: &mut Document) {
         self.jumps.apply(transaction, doc);
-        // TODO: remove the boolean return. This is unused.
-        true
+        self.doc_revisions
+            .insert(doc.id(), doc.get_current_revision());
+    }
+
+    pub fn sync_changes(&mut self, doc: &mut Document) {
+        let latest_revision = doc.get_current_revision();
+        let current_revision = *self
+            .doc_revisions
+            .entry(doc.id())
+            .or_insert(latest_revision);
+
+        if current_revision == latest_revision {
+            return;
+        }
+
+        log::debug!(
+            "Syncing view {:?} between {} and {}",
+            self.id,
+            current_revision,
+            latest_revision
+        );
+
+        if let Some(transaction) = doc.history.get_mut().changes_since(current_revision) {
+            self.apply(&transaction, doc);
+        }
     }
 }
 

From 53c28556436ffcf8ad5a68c40b53d9aa11669510 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 27 Nov 2022 12:47:51 -0600
Subject: [PATCH 568/884] Remove calls to View::apply in
 undo/redo/earlier/later

---
 helix-view/src/document.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 08708528..4b264b13 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -861,7 +861,7 @@ impl Document {
         let mut history = self.history.take();
         let txn = if undo { history.undo() } else { history.redo() };
         let success = if let Some(txn) = txn {
-            self.apply_impl(txn, view.id) && view.apply(txn, self)
+            self.apply_impl(txn, view.id)
         } else {
             false
         };
@@ -902,7 +902,7 @@ impl Document {
         };
         let mut success = false;
         for txn in txns {
-            if self.apply_impl(&txn, view.id) && view.apply(&txn, self) {
+            if self.apply_impl(&txn, view.id) {
                 success = true;
             }
         }

From 2709ce33324cf6d4612c61609f336cf5937b6cac Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 27 Nov 2022 12:48:14 -0600
Subject: [PATCH 569/884] Sync changes with view in undo/redo/earlier/later

---
 helix-view/src/document.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 4b264b13..17503553 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -870,6 +870,8 @@ impl Document {
         if success {
             // reset changeset to fix len
             self.changes = ChangeSet::new(self.text());
+            // Sync with changes with the jumplist selections.
+            view.sync_changes(self);
         }
         success
     }
@@ -909,6 +911,8 @@ impl Document {
         if success {
             // reset changeset to fix len
             self.changes = ChangeSet::new(self.text());
+            // Sync with changes with the jumplist selections.
+            view.sync_changes(self);
         }
         success
     }

From 9a9e462183cb60bff6450f17173e6b18eadbbfb2 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 27 Nov 2022 12:47:26 -0600
Subject: [PATCH 570/884] Call View::apply within
 Document::append_changes_to_history

---
 helix-term/src/commands.rs       | 8 ++++----
 helix-term/src/commands/lsp.rs   | 5 +++--
 helix-term/src/commands/typed.rs | 8 ++++----
 helix-term/src/ui/editor.rs      | 4 ++--
 helix-view/src/document.rs       | 9 ++++++---
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 0817ca73..a6f88362 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2564,7 +2564,7 @@ async fn make_format_callback(
         if let Ok(format) = format {
             if doc.version() == doc_version {
                 apply_transaction(&format, doc, view);
-                doc.append_changes_to_history(view.id);
+                doc.append_changes_to_history(view);
                 doc.detect_indent_and_line_ending();
                 view.ensure_cursor_in_view(doc, scrolloff);
             } else {
@@ -3365,7 +3365,7 @@ fn later(cx: &mut Context) {
 
 fn commit_undo_checkpoint(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
-    doc.append_changes_to_history(view.id);
+    doc.append_changes_to_history(view);
 }
 
 // Yank / Paste
@@ -3677,7 +3677,7 @@ fn replace_selections_with_clipboard_impl(
             });
 
             apply_transaction(&transaction, doc, view);
-            doc.append_changes_to_history(view.id);
+            doc.append_changes_to_history(view);
         }
         Err(e) => return Err(e.context("Couldn't get system clipboard contents")),
     }
@@ -4884,7 +4884,7 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
         let transaction = Transaction::change(doc.text(), changes.into_iter())
             .with_selection(Selection::new(ranges, selection.primary_index()));
         apply_transaction(&transaction, doc, view);
-        doc.append_changes_to_history(view.id);
+        doc.append_changes_to_history(view);
     }
 
     // after replace cursor may be out of bounds, do this to
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 8faf1d08..1f80de5f 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -760,8 +760,9 @@ pub fn apply_workspace_edit(
             text_edits,
             offset_encoding,
         );
-        apply_transaction(&transaction, doc, view_mut!(editor, view_id));
-        doc.append_changes_to_history(view_id);
+        let view = view_mut!(editor, view_id);
+        apply_transaction(&transaction, doc, view);
+        doc.append_changes_to_history(view);
     };
 
     if let Some(ref changes) = workspace_edit.changes {
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 89c310fa..2fa903a7 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -464,7 +464,7 @@ fn set_line_ending(
         }),
     );
     apply_transaction(&transaction, doc, view);
-    doc.append_changes_to_history(view.id);
+    doc.append_changes_to_history(view);
 
     Ok(())
 }
@@ -909,7 +909,7 @@ fn replace_selections_with_clipboard_impl(
             });
 
             apply_transaction(&transaction, doc, view);
-            doc.append_changes_to_history(view.id);
+            doc.append_changes_to_history(view);
             Ok(())
         }
         Err(e) => Err(e.context("Couldn't get system clipboard contents")),
@@ -1573,7 +1573,7 @@ fn sort_impl(
     );
 
     apply_transaction(&transaction, doc, view);
-    doc.append_changes_to_history(view.id);
+    doc.append_changes_to_history(view);
 
     Ok(())
 }
@@ -1617,7 +1617,7 @@ fn reflow(
     });
 
     apply_transaction(&transaction, doc, view);
-    doc.append_changes_to_history(view.id);
+    doc.append_changes_to_history(view);
     view.ensure_cursor_in_view(doc, scrolloff);
 
     Ok(())
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 6c8ee2d9..7bda74d2 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1319,7 +1319,7 @@ impl Component for EditorView {
                 // Store a history state if not in insert mode. Otherwise wait till we exit insert
                 // to include any edits to the paste in the history state.
                 if mode != Mode::Insert {
-                    doc.append_changes_to_history(view.id);
+                    doc.append_changes_to_history(view);
                 }
 
                 EventResult::Consumed(None)
@@ -1418,7 +1418,7 @@ impl Component for EditorView {
                     // Store a history state if not in insert mode. This also takes care of
                     // committing changes when leaving insert mode.
                     if mode != Mode::Insert {
-                        doc.append_changes_to_history(view.id);
+                        doc.append_changes_to_history(view);
                     }
                 }
 
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 17503553..ad47f838 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -641,7 +641,7 @@ impl Document {
         // of the encoding.
         let transaction = helix_core::diff::compare_ropes(self.text(), &rope);
         apply_transaction(&transaction, self, view);
-        self.append_changes_to_history(view.id);
+        self.append_changes_to_history(view);
         self.reset_modified();
 
         self.detect_indent_and_line_ending();
@@ -928,7 +928,7 @@ impl Document {
     }
 
     /// Commit pending changes to history
-    pub fn append_changes_to_history(&mut self, view_id: ViewId) {
+    pub fn append_changes_to_history(&mut self, view: &mut View) {
         if self.changes.is_empty() {
             return;
         }
@@ -938,7 +938,7 @@ impl Document {
         // Instead of doing this messy merge we could always commit, and based on transaction
         // annotations either add a new layer or compose into the previous one.
         let transaction =
-            Transaction::from(changes).with_selection(self.selection(view_id).clone());
+            Transaction::from(changes).with_selection(self.selection(view.id).clone());
 
         // HAXX: we need to reconstruct the state as it was before the changes..
         let old_state = self.old_state.take().expect("no old_state available");
@@ -946,6 +946,9 @@ impl Document {
         let mut history = self.history.take();
         history.commit_revision(&transaction, &old_state);
         self.history.set(history);
+
+        // Update jumplist entries in the view.
+        view.apply(&transaction, self);
     }
 
     pub fn id(&self) -> DocumentId {

From 9387dfafedfc7051e7682cfdbec09b5b91c76918 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 27 Nov 2022 12:46:36 -0600
Subject: [PATCH 571/884] Use lowest common ancestor search in
 History::changes_since

---
 helix-core/src/history.rs | 34 +++++++++-------------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/helix-core/src/history.rs b/helix-core/src/history.rs
index 82509242..b99e969f 100644
--- a/helix-core/src/history.rs
+++ b/helix-core/src/history.rs
@@ -122,32 +122,16 @@ impl History {
     /// Returns the changes since the given revision composed into a transaction.
     /// Returns None if there are no changes between the current and given revisions.
     pub fn changes_since(&self, revision: usize) -> Option<Transaction> {
-        use std::cmp::Ordering::*;
+        let lca = self.lowest_common_ancestor(revision, self.current);
+        let up = self.path_up(revision, lca);
+        let down = self.path_up(self.current, lca);
+        let up_txns = up
+            .iter()
+            .rev()
+            .map(|&n| self.revisions[n].inversion.clone());
+        let down_txns = down.iter().map(|&n| self.revisions[n].transaction.clone());
 
-        match revision.cmp(&self.current) {
-            Equal => None,
-            Less => {
-                let mut child = self.revisions[revision].last_child?.get();
-                let mut transaction = self.revisions[child].transaction.clone();
-                while child != self.current {
-                    child = self.revisions[child].last_child?.get();
-                    transaction = transaction.compose(self.revisions[child].transaction.clone());
-                }
-                Some(transaction)
-            }
-            Greater => {
-                let mut inversion = self.revisions[revision].inversion.clone();
-                let mut parent = self.revisions[revision].parent;
-                while parent != self.current {
-                    parent = self.revisions[parent].parent;
-                    if parent == 0 {
-                        return None;
-                    }
-                    inversion = inversion.compose(self.revisions[parent].inversion.clone());
-                }
-                Some(inversion)
-            }
-        }
+        up_txns.chain(down_txns).reduce(|acc, tx| tx.compose(acc))
     }
 
     /// Undo the last edit.

From 4802f26a232b2eed5f4af05a540a4735edd199ee Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 27 Nov 2022 13:47:52 -0600
Subject: [PATCH 572/884] Add a test case for undo/redo across splits

---
 helix-term/tests/test/splits.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/helix-term/tests/test/splits.rs b/helix-term/tests/test/splits.rs
index a51de365..a34a24b7 100644
--- a/helix-term/tests/test/splits.rs
+++ b/helix-term/tests/test/splits.rs
@@ -151,5 +151,15 @@ async fn test_changes_in_splits_apply_to_all_views() -> anyhow::Result<()> {
     // was not updated and after the `kd` step, pointed outside of the document.
     test(("#[|]#", "<C-w>v[<space><C-s><C-w>wkd<C-w>qd", "#[|]#")).await?;
 
+    // Transactions are applied to the views for windows lazily when they are focused.
+    // This case panics if the transactions and inversions are not applied in the
+    // correct order as we switch between windows.
+    test((
+        "#[|]#",
+        "[<space>[<space>[<space><C-w>vuuu<C-w>wUUU<C-w>quuu",
+        "#[|]#",
+    ))
+    .await?;
+
     Ok(())
 }

From 260341ed801a894141db2fd4e66c7159d06b665e Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 28 Nov 2022 09:36:41 -0600
Subject: [PATCH 573/884] Sync all document changes on view focus

---
 helix-view/src/editor.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index e54c7497..5a1ac6b1 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1241,10 +1241,13 @@ impl Editor {
         // within view
         if prev_id != view_id {
             self.mode = Mode::Normal;
-            let view = view_mut!(self, view_id);
-            let doc = doc_mut!(self, &view.doc);
-            view.sync_changes(doc);
             self.ensure_cursor_in_view(view_id);
+
+            // Update jumplist selections with new document changes.
+            for (view, _focused) in self.tree.views_mut() {
+                let doc = doc_mut!(self, &view.doc);
+                view.sync_changes(doc);
+            }
         }
     }
 

From 607c74efde40812caa6379a05fcb28f259ea2c8e Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 29 Nov 2022 10:15:55 -0600
Subject: [PATCH 574/884] Handle disambiguated keycodes (#4887)

Media keys are sent despite `DISAMBIGUATE_ESCAPE_CODES` being unset.
Previously we panicked on these. This change translates the
disambiguated keys from crossterm so that they do not cause a panic.
---
 helix-view/src/input.rs    | 142 ++++++++++++++++++++++++-
 helix-view/src/keyboard.rs | 205 +++++++++++++++++++++++++++++++++++--
 2 files changed, 335 insertions(+), 12 deletions(-)

diff --git a/helix-view/src/input.rs b/helix-view/src/input.rs
index 30fa72c4..bda0520e 100644
--- a/helix-view/src/input.rs
+++ b/helix-view/src/input.rs
@@ -4,7 +4,7 @@ use helix_core::unicode::{segmentation::UnicodeSegmentation, width::UnicodeWidth
 use serde::de::{self, Deserialize, Deserializer};
 use std::fmt;
 
-pub use crate::keyboard::{KeyCode, KeyModifiers};
+pub use crate::keyboard::{KeyCode, KeyModifiers, MediaKeyCode, ModifierKeyCode};
 
 #[derive(Debug, PartialOrd, PartialEq, Eq, Clone, Hash)]
 pub enum Event {
@@ -119,6 +119,40 @@ pub(crate) mod keys {
     pub(crate) const MINUS: &str = "minus";
     pub(crate) const LESS_THAN: &str = "lt";
     pub(crate) const GREATER_THAN: &str = "gt";
+    pub(crate) const CAPS_LOCK: &str = "capslock";
+    pub(crate) const SCROLL_LOCK: &str = "scrolllock";
+    pub(crate) const NUM_LOCK: &str = "numlock";
+    pub(crate) const PRINT_SCREEN: &str = "printscreen";
+    pub(crate) const PAUSE: &str = "pause";
+    pub(crate) const MENU: &str = "menu";
+    pub(crate) const KEYPAD_BEGIN: &str = "keypadbegin";
+    pub(crate) const PLAY: &str = "play";
+    pub(crate) const PAUSE_MEDIA: &str = "pausemedia";
+    pub(crate) const PLAY_PAUSE: &str = "playpause";
+    pub(crate) const REVERSE: &str = "reverse";
+    pub(crate) const STOP: &str = "stop";
+    pub(crate) const FAST_FORWARD: &str = "fastforward";
+    pub(crate) const REWIND: &str = "rewind";
+    pub(crate) const TRACK_NEXT: &str = "tracknext";
+    pub(crate) const TRACK_PREVIOUS: &str = "trackprevious";
+    pub(crate) const RECORD: &str = "record";
+    pub(crate) const LOWER_VOLUME: &str = "lowervolume";
+    pub(crate) const RAISE_VOLUME: &str = "raisevolume";
+    pub(crate) const MUTE_VOLUME: &str = "mutevolume";
+    pub(crate) const LEFT_SHIFT: &str = "leftshift";
+    pub(crate) const LEFT_CONTROL: &str = "leftcontrol";
+    pub(crate) const LEFT_ALT: &str = "leftalt";
+    pub(crate) const LEFT_SUPER: &str = "leftsuper";
+    pub(crate) const LEFT_HYPER: &str = "lefthyper";
+    pub(crate) const LEFT_META: &str = "leftmeta";
+    pub(crate) const RIGHT_SHIFT: &str = "rightshift";
+    pub(crate) const RIGHT_CONTROL: &str = "rightcontrol";
+    pub(crate) const RIGHT_ALT: &str = "rightalt";
+    pub(crate) const RIGHT_SUPER: &str = "rightsuper";
+    pub(crate) const RIGHT_HYPER: &str = "righthyper";
+    pub(crate) const RIGHT_META: &str = "rightmeta";
+    pub(crate) const ISO_LEVEL_3_SHIFT: &str = "isolevel3shift";
+    pub(crate) const ISO_LEVEL_5_SHIFT: &str = "isolevel5shift";
 }
 
 impl fmt::Display for KeyEvent {
@@ -163,6 +197,44 @@ impl fmt::Display for KeyEvent {
             KeyCode::Char('>') => f.write_str(keys::GREATER_THAN)?,
             KeyCode::F(i) => f.write_fmt(format_args!("F{}", i))?,
             KeyCode::Char(c) => f.write_fmt(format_args!("{}", c))?,
+            KeyCode::CapsLock => f.write_str(keys::CAPS_LOCK)?,
+            KeyCode::ScrollLock => f.write_str(keys::SCROLL_LOCK)?,
+            KeyCode::NumLock => f.write_str(keys::NUM_LOCK)?,
+            KeyCode::PrintScreen => f.write_str(keys::PRINT_SCREEN)?,
+            KeyCode::Pause => f.write_str(keys::PAUSE)?,
+            KeyCode::Menu => f.write_str(keys::MENU)?,
+            KeyCode::KeypadBegin => f.write_str(keys::KEYPAD_BEGIN)?,
+            KeyCode::Media(MediaKeyCode::Play) => f.write_str(keys::PLAY)?,
+            KeyCode::Media(MediaKeyCode::Pause) => f.write_str(keys::PAUSE_MEDIA)?,
+            KeyCode::Media(MediaKeyCode::PlayPause) => f.write_str(keys::PLAY_PAUSE)?,
+            KeyCode::Media(MediaKeyCode::Stop) => f.write_str(keys::STOP)?,
+            KeyCode::Media(MediaKeyCode::Reverse) => f.write_str(keys::REVERSE)?,
+            KeyCode::Media(MediaKeyCode::FastForward) => f.write_str(keys::FAST_FORWARD)?,
+            KeyCode::Media(MediaKeyCode::Rewind) => f.write_str(keys::REWIND)?,
+            KeyCode::Media(MediaKeyCode::TrackNext) => f.write_str(keys::TRACK_NEXT)?,
+            KeyCode::Media(MediaKeyCode::TrackPrevious) => f.write_str(keys::TRACK_PREVIOUS)?,
+            KeyCode::Media(MediaKeyCode::Record) => f.write_str(keys::RECORD)?,
+            KeyCode::Media(MediaKeyCode::LowerVolume) => f.write_str(keys::LOWER_VOLUME)?,
+            KeyCode::Media(MediaKeyCode::RaiseVolume) => f.write_str(keys::RAISE_VOLUME)?,
+            KeyCode::Media(MediaKeyCode::MuteVolume) => f.write_str(keys::MUTE_VOLUME)?,
+            KeyCode::Modifier(ModifierKeyCode::LeftShift) => f.write_str(keys::LEFT_SHIFT)?,
+            KeyCode::Modifier(ModifierKeyCode::LeftControl) => f.write_str(keys::LEFT_CONTROL)?,
+            KeyCode::Modifier(ModifierKeyCode::LeftAlt) => f.write_str(keys::LEFT_ALT)?,
+            KeyCode::Modifier(ModifierKeyCode::LeftSuper) => f.write_str(keys::LEFT_SUPER)?,
+            KeyCode::Modifier(ModifierKeyCode::LeftHyper) => f.write_str(keys::LEFT_HYPER)?,
+            KeyCode::Modifier(ModifierKeyCode::LeftMeta) => f.write_str(keys::LEFT_META)?,
+            KeyCode::Modifier(ModifierKeyCode::RightShift) => f.write_str(keys::RIGHT_SHIFT)?,
+            KeyCode::Modifier(ModifierKeyCode::RightControl) => f.write_str(keys::RIGHT_CONTROL)?,
+            KeyCode::Modifier(ModifierKeyCode::RightAlt) => f.write_str(keys::RIGHT_ALT)?,
+            KeyCode::Modifier(ModifierKeyCode::RightSuper) => f.write_str(keys::RIGHT_SUPER)?,
+            KeyCode::Modifier(ModifierKeyCode::RightHyper) => f.write_str(keys::RIGHT_HYPER)?,
+            KeyCode::Modifier(ModifierKeyCode::RightMeta) => f.write_str(keys::RIGHT_META)?,
+            KeyCode::Modifier(ModifierKeyCode::IsoLevel3Shift) => {
+                f.write_str(keys::ISO_LEVEL_3_SHIFT)?
+            }
+            KeyCode::Modifier(ModifierKeyCode::IsoLevel5Shift) => {
+                f.write_str(keys::ISO_LEVEL_5_SHIFT)?
+            }
         };
         Ok(())
     }
@@ -192,6 +264,40 @@ impl UnicodeWidthStr for KeyEvent {
             KeyCode::F(1..=9) => 2,
             KeyCode::F(_) => 3,
             KeyCode::Char(c) => c.width().unwrap_or(0),
+            KeyCode::CapsLock => keys::CAPS_LOCK.len(),
+            KeyCode::ScrollLock => keys::SCROLL_LOCK.len(),
+            KeyCode::NumLock => keys::NUM_LOCK.len(),
+            KeyCode::PrintScreen => keys::PRINT_SCREEN.len(),
+            KeyCode::Pause => keys::PAUSE.len(),
+            KeyCode::Menu => keys::MENU.len(),
+            KeyCode::KeypadBegin => keys::KEYPAD_BEGIN.len(),
+            KeyCode::Media(MediaKeyCode::Play) => keys::PLAY.len(),
+            KeyCode::Media(MediaKeyCode::Pause) => keys::PAUSE_MEDIA.len(),
+            KeyCode::Media(MediaKeyCode::PlayPause) => keys::PLAY_PAUSE.len(),
+            KeyCode::Media(MediaKeyCode::Stop) => keys::STOP.len(),
+            KeyCode::Media(MediaKeyCode::Reverse) => keys::REVERSE.len(),
+            KeyCode::Media(MediaKeyCode::FastForward) => keys::FAST_FORWARD.len(),
+            KeyCode::Media(MediaKeyCode::Rewind) => keys::REWIND.len(),
+            KeyCode::Media(MediaKeyCode::TrackNext) => keys::TRACK_NEXT.len(),
+            KeyCode::Media(MediaKeyCode::TrackPrevious) => keys::TRACK_PREVIOUS.len(),
+            KeyCode::Media(MediaKeyCode::Record) => keys::RECORD.len(),
+            KeyCode::Media(MediaKeyCode::LowerVolume) => keys::LOWER_VOLUME.len(),
+            KeyCode::Media(MediaKeyCode::RaiseVolume) => keys::RAISE_VOLUME.len(),
+            KeyCode::Media(MediaKeyCode::MuteVolume) => keys::MUTE_VOLUME.len(),
+            KeyCode::Modifier(ModifierKeyCode::LeftShift) => keys::LEFT_SHIFT.len(),
+            KeyCode::Modifier(ModifierKeyCode::LeftControl) => keys::LEFT_CONTROL.len(),
+            KeyCode::Modifier(ModifierKeyCode::LeftAlt) => keys::LEFT_ALT.len(),
+            KeyCode::Modifier(ModifierKeyCode::LeftSuper) => keys::LEFT_SUPER.len(),
+            KeyCode::Modifier(ModifierKeyCode::LeftHyper) => keys::LEFT_HYPER.len(),
+            KeyCode::Modifier(ModifierKeyCode::LeftMeta) => keys::LEFT_META.len(),
+            KeyCode::Modifier(ModifierKeyCode::RightShift) => keys::RIGHT_SHIFT.len(),
+            KeyCode::Modifier(ModifierKeyCode::RightControl) => keys::RIGHT_CONTROL.len(),
+            KeyCode::Modifier(ModifierKeyCode::RightAlt) => keys::RIGHT_ALT.len(),
+            KeyCode::Modifier(ModifierKeyCode::RightSuper) => keys::RIGHT_SUPER.len(),
+            KeyCode::Modifier(ModifierKeyCode::RightHyper) => keys::RIGHT_HYPER.len(),
+            KeyCode::Modifier(ModifierKeyCode::RightMeta) => keys::RIGHT_META.len(),
+            KeyCode::Modifier(ModifierKeyCode::IsoLevel3Shift) => keys::ISO_LEVEL_3_SHIFT.len(),
+            KeyCode::Modifier(ModifierKeyCode::IsoLevel5Shift) => keys::ISO_LEVEL_5_SHIFT.len(),
         };
         if self.modifiers.contains(KeyModifiers::SHIFT) {
             width += 2;
@@ -235,6 +341,40 @@ impl std::str::FromStr for KeyEvent {
             keys::MINUS => KeyCode::Char('-'),
             keys::LESS_THAN => KeyCode::Char('<'),
             keys::GREATER_THAN => KeyCode::Char('>'),
+            keys::CAPS_LOCK => KeyCode::CapsLock,
+            keys::SCROLL_LOCK => KeyCode::ScrollLock,
+            keys::NUM_LOCK => KeyCode::NumLock,
+            keys::PRINT_SCREEN => KeyCode::PrintScreen,
+            keys::PAUSE => KeyCode::Pause,
+            keys::MENU => KeyCode::Menu,
+            keys::KEYPAD_BEGIN => KeyCode::KeypadBegin,
+            keys::PLAY => KeyCode::Media(MediaKeyCode::Play),
+            keys::PAUSE_MEDIA => KeyCode::Media(MediaKeyCode::Pause),
+            keys::PLAY_PAUSE => KeyCode::Media(MediaKeyCode::PlayPause),
+            keys::STOP => KeyCode::Media(MediaKeyCode::Stop),
+            keys::REVERSE => KeyCode::Media(MediaKeyCode::Reverse),
+            keys::FAST_FORWARD => KeyCode::Media(MediaKeyCode::FastForward),
+            keys::REWIND => KeyCode::Media(MediaKeyCode::Rewind),
+            keys::TRACK_NEXT => KeyCode::Media(MediaKeyCode::TrackNext),
+            keys::TRACK_PREVIOUS => KeyCode::Media(MediaKeyCode::TrackPrevious),
+            keys::RECORD => KeyCode::Media(MediaKeyCode::Record),
+            keys::LOWER_VOLUME => KeyCode::Media(MediaKeyCode::LowerVolume),
+            keys::RAISE_VOLUME => KeyCode::Media(MediaKeyCode::RaiseVolume),
+            keys::MUTE_VOLUME => KeyCode::Media(MediaKeyCode::MuteVolume),
+            keys::LEFT_SHIFT => KeyCode::Modifier(ModifierKeyCode::LeftShift),
+            keys::LEFT_CONTROL => KeyCode::Modifier(ModifierKeyCode::LeftControl),
+            keys::LEFT_ALT => KeyCode::Modifier(ModifierKeyCode::LeftAlt),
+            keys::LEFT_SUPER => KeyCode::Modifier(ModifierKeyCode::LeftSuper),
+            keys::LEFT_HYPER => KeyCode::Modifier(ModifierKeyCode::LeftHyper),
+            keys::LEFT_META => KeyCode::Modifier(ModifierKeyCode::LeftMeta),
+            keys::RIGHT_SHIFT => KeyCode::Modifier(ModifierKeyCode::RightShift),
+            keys::RIGHT_CONTROL => KeyCode::Modifier(ModifierKeyCode::RightControl),
+            keys::RIGHT_ALT => KeyCode::Modifier(ModifierKeyCode::RightAlt),
+            keys::RIGHT_SUPER => KeyCode::Modifier(ModifierKeyCode::RightSuper),
+            keys::RIGHT_HYPER => KeyCode::Modifier(ModifierKeyCode::RightHyper),
+            keys::RIGHT_META => KeyCode::Modifier(ModifierKeyCode::RightMeta),
+            keys::ISO_LEVEL_3_SHIFT => KeyCode::Modifier(ModifierKeyCode::IsoLevel3Shift),
+            keys::ISO_LEVEL_5_SHIFT => KeyCode::Modifier(ModifierKeyCode::IsoLevel5Shift),
             single if single.chars().count() == 1 => KeyCode::Char(single.chars().next().unwrap()),
             function if function.len() > 1 && function.starts_with('F') => {
                 let function: String = function.chars().skip(1).collect();
diff --git a/helix-view/src/keyboard.rs b/helix-view/src/keyboard.rs
index 84cfebf1..cf673e11 100644
--- a/helix-view/src/keyboard.rs
+++ b/helix-view/src/keyboard.rs
@@ -53,6 +53,164 @@ impl From<crossterm::event::KeyModifiers> for KeyModifiers {
     }
 }
 
+/// Represents a media key (as part of [`KeyCode::Media`]).
+#[derive(Debug, PartialOrd, Ord, PartialEq, Eq, Clone, Copy, Hash)]
+pub enum MediaKeyCode {
+    /// Play media key.
+    Play,
+    /// Pause media key.
+    Pause,
+    /// Play/Pause media key.
+    PlayPause,
+    /// Reverse media key.
+    Reverse,
+    /// Stop media key.
+    Stop,
+    /// Fast-forward media key.
+    FastForward,
+    /// Rewind media key.
+    Rewind,
+    /// Next-track media key.
+    TrackNext,
+    /// Previous-track media key.
+    TrackPrevious,
+    /// Record media key.
+    Record,
+    /// Lower-volume media key.
+    LowerVolume,
+    /// Raise-volume media key.
+    RaiseVolume,
+    /// Mute media key.
+    MuteVolume,
+}
+
+#[cfg(feature = "term")]
+impl From<MediaKeyCode> for crossterm::event::MediaKeyCode {
+    fn from(media_key_code: MediaKeyCode) -> Self {
+        use crossterm::event::MediaKeyCode as CMediaKeyCode;
+
+        match media_key_code {
+            MediaKeyCode::Play => CMediaKeyCode::Play,
+            MediaKeyCode::Pause => CMediaKeyCode::Pause,
+            MediaKeyCode::PlayPause => CMediaKeyCode::PlayPause,
+            MediaKeyCode::Reverse => CMediaKeyCode::Reverse,
+            MediaKeyCode::Stop => CMediaKeyCode::Stop,
+            MediaKeyCode::FastForward => CMediaKeyCode::FastForward,
+            MediaKeyCode::Rewind => CMediaKeyCode::Rewind,
+            MediaKeyCode::TrackNext => CMediaKeyCode::TrackNext,
+            MediaKeyCode::TrackPrevious => CMediaKeyCode::TrackPrevious,
+            MediaKeyCode::Record => CMediaKeyCode::Record,
+            MediaKeyCode::LowerVolume => CMediaKeyCode::LowerVolume,
+            MediaKeyCode::RaiseVolume => CMediaKeyCode::RaiseVolume,
+            MediaKeyCode::MuteVolume => CMediaKeyCode::MuteVolume,
+        }
+    }
+}
+
+#[cfg(feature = "term")]
+impl From<crossterm::event::MediaKeyCode> for MediaKeyCode {
+    fn from(val: crossterm::event::MediaKeyCode) -> Self {
+        use crossterm::event::MediaKeyCode as CMediaKeyCode;
+
+        match val {
+            CMediaKeyCode::Play => MediaKeyCode::Play,
+            CMediaKeyCode::Pause => MediaKeyCode::Pause,
+            CMediaKeyCode::PlayPause => MediaKeyCode::PlayPause,
+            CMediaKeyCode::Reverse => MediaKeyCode::Reverse,
+            CMediaKeyCode::Stop => MediaKeyCode::Stop,
+            CMediaKeyCode::FastForward => MediaKeyCode::FastForward,
+            CMediaKeyCode::Rewind => MediaKeyCode::Rewind,
+            CMediaKeyCode::TrackNext => MediaKeyCode::TrackNext,
+            CMediaKeyCode::TrackPrevious => MediaKeyCode::TrackPrevious,
+            CMediaKeyCode::Record => MediaKeyCode::Record,
+            CMediaKeyCode::LowerVolume => MediaKeyCode::LowerVolume,
+            CMediaKeyCode::RaiseVolume => MediaKeyCode::RaiseVolume,
+            CMediaKeyCode::MuteVolume => MediaKeyCode::MuteVolume,
+        }
+    }
+}
+
+/// Represents a media key (as part of [`KeyCode::Modifier`]).
+#[derive(Debug, PartialOrd, Ord, PartialEq, Eq, Clone, Copy, Hash)]
+pub enum ModifierKeyCode {
+    /// Left Shift key.
+    LeftShift,
+    /// Left Control key.
+    LeftControl,
+    /// Left Alt key.
+    LeftAlt,
+    /// Left Super key.
+    LeftSuper,
+    /// Left Hyper key.
+    LeftHyper,
+    /// Left Meta key.
+    LeftMeta,
+    /// Right Shift key.
+    RightShift,
+    /// Right Control key.
+    RightControl,
+    /// Right Alt key.
+    RightAlt,
+    /// Right Super key.
+    RightSuper,
+    /// Right Hyper key.
+    RightHyper,
+    /// Right Meta key.
+    RightMeta,
+    /// Iso Level3 Shift key.
+    IsoLevel3Shift,
+    /// Iso Level5 Shift key.
+    IsoLevel5Shift,
+}
+
+#[cfg(feature = "term")]
+impl From<ModifierKeyCode> for crossterm::event::ModifierKeyCode {
+    fn from(modifier_key_code: ModifierKeyCode) -> Self {
+        use crossterm::event::ModifierKeyCode as CModifierKeyCode;
+
+        match modifier_key_code {
+            ModifierKeyCode::LeftShift => CModifierKeyCode::LeftShift,
+            ModifierKeyCode::LeftControl => CModifierKeyCode::LeftControl,
+            ModifierKeyCode::LeftAlt => CModifierKeyCode::LeftAlt,
+            ModifierKeyCode::LeftSuper => CModifierKeyCode::LeftSuper,
+            ModifierKeyCode::LeftHyper => CModifierKeyCode::LeftHyper,
+            ModifierKeyCode::LeftMeta => CModifierKeyCode::LeftMeta,
+            ModifierKeyCode::RightShift => CModifierKeyCode::RightShift,
+            ModifierKeyCode::RightControl => CModifierKeyCode::RightControl,
+            ModifierKeyCode::RightAlt => CModifierKeyCode::RightAlt,
+            ModifierKeyCode::RightSuper => CModifierKeyCode::RightSuper,
+            ModifierKeyCode::RightHyper => CModifierKeyCode::RightHyper,
+            ModifierKeyCode::RightMeta => CModifierKeyCode::RightMeta,
+            ModifierKeyCode::IsoLevel3Shift => CModifierKeyCode::IsoLevel3Shift,
+            ModifierKeyCode::IsoLevel5Shift => CModifierKeyCode::IsoLevel5Shift,
+        }
+    }
+}
+
+#[cfg(feature = "term")]
+impl From<crossterm::event::ModifierKeyCode> for ModifierKeyCode {
+    fn from(val: crossterm::event::ModifierKeyCode) -> Self {
+        use crossterm::event::ModifierKeyCode as CModifierKeyCode;
+
+        match val {
+            CModifierKeyCode::LeftShift => ModifierKeyCode::LeftShift,
+            CModifierKeyCode::LeftControl => ModifierKeyCode::LeftControl,
+            CModifierKeyCode::LeftAlt => ModifierKeyCode::LeftAlt,
+            CModifierKeyCode::LeftSuper => ModifierKeyCode::LeftSuper,
+            CModifierKeyCode::LeftHyper => ModifierKeyCode::LeftHyper,
+            CModifierKeyCode::LeftMeta => ModifierKeyCode::LeftMeta,
+            CModifierKeyCode::RightShift => ModifierKeyCode::RightShift,
+            CModifierKeyCode::RightControl => ModifierKeyCode::RightControl,
+            CModifierKeyCode::RightAlt => ModifierKeyCode::RightAlt,
+            CModifierKeyCode::RightSuper => ModifierKeyCode::RightSuper,
+            CModifierKeyCode::RightHyper => ModifierKeyCode::RightHyper,
+            CModifierKeyCode::RightMeta => ModifierKeyCode::RightMeta,
+            CModifierKeyCode::IsoLevel3Shift => ModifierKeyCode::IsoLevel3Shift,
+            CModifierKeyCode::IsoLevel5Shift => ModifierKeyCode::IsoLevel5Shift,
+        }
+    }
+}
+
 /// Represents a key.
 #[derive(Debug, PartialOrd, Ord, PartialEq, Eq, Clone, Copy, Hash)]
 pub enum KeyCode {
@@ -94,6 +252,24 @@ pub enum KeyCode {
     Null,
     /// Escape key.
     Esc,
+    /// CapsLock key.
+    CapsLock,
+    /// ScrollLock key.
+    ScrollLock,
+    /// NumLock key.
+    NumLock,
+    /// PrintScreen key.
+    PrintScreen,
+    /// Pause key.
+    Pause,
+    /// Menu key.
+    Menu,
+    /// KeypadBegin key.
+    KeypadBegin,
+    /// A media key.
+    Media(MediaKeyCode),
+    /// A modifier key.
+    Modifier(ModifierKeyCode),
 }
 
 #[cfg(feature = "term")]
@@ -119,6 +295,15 @@ impl From<KeyCode> for crossterm::event::KeyCode {
             KeyCode::Char(character) => CKeyCode::Char(character),
             KeyCode::Null => CKeyCode::Null,
             KeyCode::Esc => CKeyCode::Esc,
+            KeyCode::CapsLock => CKeyCode::CapsLock,
+            KeyCode::ScrollLock => CKeyCode::ScrollLock,
+            KeyCode::NumLock => CKeyCode::NumLock,
+            KeyCode::PrintScreen => CKeyCode::PrintScreen,
+            KeyCode::Pause => CKeyCode::Pause,
+            KeyCode::Menu => CKeyCode::Menu,
+            KeyCode::KeypadBegin => CKeyCode::KeypadBegin,
+            KeyCode::Media(media_key_code) => CKeyCode::Media(media_key_code.into()),
+            KeyCode::Modifier(modifier_key_code) => CKeyCode::Modifier(modifier_key_code.into()),
         }
     }
 }
@@ -147,17 +332,15 @@ impl From<crossterm::event::KeyCode> for KeyCode {
             CKeyCode::Char(character) => KeyCode::Char(character),
             CKeyCode::Null => KeyCode::Null,
             CKeyCode::Esc => KeyCode::Esc,
-            CKeyCode::CapsLock
-            | CKeyCode::ScrollLock
-            | CKeyCode::NumLock
-            | CKeyCode::PrintScreen
-            | CKeyCode::Pause
-            | CKeyCode::Menu
-            | CKeyCode::KeypadBegin
-            | CKeyCode::Media(_)
-            | CKeyCode::Modifier(_) => unreachable!(
-                "Shouldn't get this key without enabling DISAMBIGUATE_ESCAPE_CODES in crossterm"
-            ),
+            CKeyCode::CapsLock => KeyCode::CapsLock,
+            CKeyCode::ScrollLock => KeyCode::ScrollLock,
+            CKeyCode::NumLock => KeyCode::NumLock,
+            CKeyCode::PrintScreen => KeyCode::PrintScreen,
+            CKeyCode::Pause => KeyCode::Pause,
+            CKeyCode::Menu => KeyCode::Menu,
+            CKeyCode::KeypadBegin => KeyCode::KeypadBegin,
+            CKeyCode::Media(media_key_code) => KeyCode::Media(media_key_code.into()),
+            CKeyCode::Modifier(modifier_key_code) => KeyCode::Modifier(modifier_key_code.into()),
         }
     }
 }

From 664d08e70d02a3e3917ddc69e66b5fc826a0caf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20S=C3=A1?= <enkodr@outlook.com>
Date: Tue, 29 Nov 2022 23:30:06 +0000
Subject: [PATCH 575/884] Fix ayu theme cursor issue (#4764)

---
 runtime/themes/ayu_dark.toml   | 3 +--
 runtime/themes/ayu_light.toml  | 3 +--
 runtime/themes/ayu_mirage.toml | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/runtime/themes/ayu_dark.toml b/runtime/themes/ayu_dark.toml
index 3b989f82..b297a3ab 100644
--- a/runtime/themes/ayu_dark.toml
+++ b/runtime/themes/ayu_dark.toml
@@ -10,7 +10,6 @@
 "string.regexp" = "orange"
 "string.special" = "yellow"
 "comment" = { fg = "gray", modifiers = ["italic"] }
-"comment.block.documentation" = { fg = "blue", modifiers = ["italic"] }
 "variable" = "foreground"
 "label" = "orange"
 "punctuation" = "foreground"
@@ -34,7 +33,7 @@
 
 # Interface
 "ui.background"= { bg = "background" }
-"ui.cursor" = { modifiers = ["reversed"] }
+"ui.cursor" = { fg = "dark_gray", bg = "orange" }
 "ui.cursor.match" = "orange"
 "ui.linenr" = "dark_gray"
 "ui.linenr.selected" = "gray"
diff --git a/runtime/themes/ayu_light.toml b/runtime/themes/ayu_light.toml
index 6a801951..ab0283fb 100644
--- a/runtime/themes/ayu_light.toml
+++ b/runtime/themes/ayu_light.toml
@@ -10,7 +10,6 @@
 "string.regexp" = "orange"
 "string.special" = "yellow"
 "comment" = { fg = "gray", modifiers = ["italic"] }
-"comment.block.documentation" = { fg = "blue", modifiers = ["italic"] }
 "variable" = "foreground"
 "label" = "orange"
 "punctuation" = "foreground"
@@ -34,7 +33,7 @@
 
 # Interface
 "ui.background"= { bg = "background" }
-"ui.cursor" = { modifiers = ["reversed"] }
+"ui.cursor" = { fg = "dark_gray", bg = "orange" }
 "ui.cursor.match" = "orange"
 "ui.linenr" = "dark_gray"
 "ui.linenr.selected" = "gray"
diff --git a/runtime/themes/ayu_mirage.toml b/runtime/themes/ayu_mirage.toml
index b1abd9a3..d6af12fa 100644
--- a/runtime/themes/ayu_mirage.toml
+++ b/runtime/themes/ayu_mirage.toml
@@ -10,7 +10,6 @@
 "string.regexp" = "orange"
 "string.special" = "yellow"
 "comment" = { fg = "gray", modifiers = ["italic"] }
-"comment.block.documentation" = { fg = "blue", modifiers = ["italic"] }
 "variable" = "foreground"
 "label" = "orange"
 "punctuation" = "foreground"
@@ -34,7 +33,7 @@
 
 # Interface
 "ui.background"= { bg = "background" }
-"ui.cursor" = { modifiers = ["reversed"] }
+"ui.cursor" = { fg = "dark_gray", bg = "orange" }
 "ui.cursor.match" = "orange"
 "ui.linenr" = "dark_gray"
 "ui.linenr.selected" = "gray"

From 67415e096ea70173d30550803559eb2347ed04d6 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 30 Nov 2022 08:27:08 -0600
Subject: [PATCH 576/884] Fix file-types declaration for racket (#4915)

Both the racket and scheme entries used the rkt file-extension. This
commit removes that entry for scheme and so that the racket entry takes
precedence. We explicitly point to the scheme grammar now and setup
queries that inherit from scheme. This should enable using the racket
language server configuration.
---
 book/src/generated/lang-support.md    | 2 +-
 languages.toml                        | 3 ++-
 runtime/queries/racket/highlights.scm | 1 +
 runtime/queries/racket/injections.scm | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 runtime/queries/racket/highlights.scm
 create mode 100644 runtime/queries/racket/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 487057e6..b1fde001 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -95,7 +95,7 @@
 | python | ✓ | ✓ | ✓ | `pylsp` |
 | qml | ✓ |  | ✓ | `qmlls` |
 | r | ✓ |  |  | `R` |
-| racket |  |  |  | `racket` |
+| racket | ✓ |  |  | `racket` |
 | regex | ✓ |  |  |  |
 | rescript | ✓ | ✓ |  | `rescript-language-server` |
 | rmarkdown | ✓ |  | ✓ | `R` |
diff --git a/languages.toml b/languages.toml
index 756315cd..4eb8a4da 100644
--- a/languages.toml
+++ b/languages.toml
@@ -880,6 +880,7 @@ file-types = ["rkt"]
 shebangs = ["racket"]
 comment-token = ";"
 language-server = { command = "racket", args = ["-l", "racket-langserver"] }
+grammar = "scheme"
 
 [[language]]
 name = "comment"
@@ -1526,7 +1527,7 @@ source = { git = "https://github.com/metio/tree-sitter-ssh-client-config", rev =
 name = "scheme"
 scope = "source.scheme"
 injection-regex = "scheme"
-file-types = ["ss", "rkt"] # "scm",
+file-types = ["ss"] # "scm",
 roots = []
 comment-token = ";"
 indent = { tab-width = 2, unit = "  " }
diff --git a/runtime/queries/racket/highlights.scm b/runtime/queries/racket/highlights.scm
new file mode 100644
index 00000000..e11eb788
--- /dev/null
+++ b/runtime/queries/racket/highlights.scm
@@ -0,0 +1 @@
+; inherits: scheme
diff --git a/runtime/queries/racket/injections.scm b/runtime/queries/racket/injections.scm
new file mode 100644
index 00000000..e11eb788
--- /dev/null
+++ b/runtime/queries/racket/injections.scm
@@ -0,0 +1 @@
+; inherits: scheme

From 5a3ff742218aac32c3af08993f0edb623631fc72 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Thu, 1 Dec 2022 09:35:23 +0100
Subject: [PATCH 577/884] Show (git) diff signs in gutter (#3890)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Show (git) diff signs in gutter (#3890)

Avoid string allocation when git diffing

Incrementally diff using changesets

refactor diffs to be provider indepndent and improve git implementation

remove dependency on zlib-ng

switch to asynchronus diffing with similar

Update helix-vcs/Cargo.toml

fix toml formatting

Co-authored-by: Ivan Tham <pickfire@riseup.net>

fix typo in documentation

use ropey reexpors from helix-core

fix crash when creating new file

remove useless use if io::Cursor

fix spelling mistakes

implement suggested improvement to repository loading

improve git test isolation

remove lefover comments

Co-authored-by: univerz <univerz@fu-solution.com>

fixed spelling mistake

minor cosmetic changes

fix: set self.differ to None if decoding the diff_base fails

fixup formatting

Co-authored-by: Ivan Tham <pickfire@riseup.net>

reload diff_base when file is reloaded from disk

switch to imara-diff

Fixup formatting

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>

Redraw buffer whenever a diff is updated.

Only store hunks instead of changes for individual lines to easily allow
jumping between them

Update to latest gitoxide version

Change default diff gutter position

Only update gutter after timeout

* update diff gutter synchronously, with a timeout

* Apply suggestions from code review

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* address review comments and ensure lock is always aquired

* remove configuration for redraw timeout

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 Cargo.lock                        | 878 +++++++++++++++++++++++++++++-
 Cargo.toml                        |   1 +
 book/src/configuration.md         |   2 +-
 helix-core/src/lib.rs             |   2 +-
 helix-term/Cargo.toml             |   3 +
 helix-term/src/application.rs     |  50 +-
 helix-term/src/commands/typed.rs  |  11 +-
 helix-term/src/ui/editor.rs       |   2 +-
 helix-vcs/Cargo.toml              |  28 +
 helix-vcs/src/diff.rs             | 198 +++++++
 helix-vcs/src/diff/line_cache.rs  | 130 +++++
 helix-vcs/src/diff/worker.rs      | 207 +++++++
 helix-vcs/src/diff/worker/test.rs | 149 +++++
 helix-vcs/src/git.rs              |  80 +++
 helix-vcs/src/git/test.rs         | 121 ++++
 helix-vcs/src/lib.rs              |  51 ++
 helix-view/Cargo.toml             |   2 +
 helix-view/src/document.rs        |  52 +-
 helix-view/src/editor.rs          |  75 ++-
 helix-view/src/gutter.rs          |  55 +-
 helix-view/src/view.rs            |  15 +-
 21 files changed, 2036 insertions(+), 76 deletions(-)
 create mode 100644 helix-vcs/Cargo.toml
 create mode 100644 helix-vcs/src/diff.rs
 create mode 100644 helix-vcs/src/diff/line_cache.rs
 create mode 100644 helix-vcs/src/diff/worker.rs
 create mode 100644 helix-vcs/src/diff/worker/test.rs
 create mode 100644 helix-vcs/src/git.rs
 create mode 100644 helix-vcs/src/git/test.rs
 create mode 100644 helix-vcs/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index 05a0396f..2e021197 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,12 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
 [[package]]
 name = "ahash"
 version = "0.7.6"
@@ -55,6 +61,15 @@ version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164"
 
+[[package]]
+name = "atoi"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -78,12 +93,43 @@ dependencies = [
  "regex-automata",
 ]
 
+[[package]]
+name = "bstr"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fca0852af221f458706eb0725c03e4ed6c46af9ac98e6a689d5e634215d594dd"
+dependencies = [
+ "memchr",
+ "once_cell",
+ "regex-automata",
+ "serde",
+]
+
+[[package]]
+name = "btoi"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97c0869a9faa81f8bbf8102371105d6d0a7b79167a04c340b04ab16892246a11"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
 
+[[package]]
+name = "byte-unit"
+version = "4.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581ad4b3d627b0c09a0ccb2912148f839acaca0b93cf54cbe42b6c674e86079c"
+dependencies = [
+ "serde",
+ "utf8-width",
+]
+
 [[package]]
 name = "bytecount"
 version = "0.6.3"
@@ -96,12 +142,27 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
 
+[[package]]
+name = "bytesize"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70"
+
 [[package]]
 name = "cassowary"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
 
+[[package]]
+name = "castaway"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "cc"
 version = "1.0.77"
@@ -148,6 +209,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "clru"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "218d6bd3dde8e442a975fa1cd233c0e5fded7596bccfe39f58eca98d22421e0a"
+
 [[package]]
 name = "codespan-reporting"
 version = "0.11.1"
@@ -158,6 +225,17 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "compact_str"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5138945395949e7dfba09646dc9e766b548ff48e23deb5246890e6b64ae9e1b9"
+dependencies = [
+ "castaway",
+ "itoa",
+ "ryu",
+]
+
 [[package]]
 name = "content_inspector"
 version = "0.2.4"
@@ -173,6 +251,15 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 
+[[package]]
+name = "crc32fast"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.14"
@@ -252,6 +339,28 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "dashmap"
+version = "5.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
+dependencies = [
+ "cfg-if",
+ "hashbrown 0.12.3",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "dirs"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
+dependencies = [
+ "dirs-sys",
+]
+
 [[package]]
 name = "dirs-next"
 version = "2.0.0"
@@ -262,6 +371,17 @@ dependencies = [
  "dirs-sys-next",
 ]
 
+[[package]]
+name = "dirs-sys"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
 [[package]]
 name = "dirs-sys-next"
 version = "0.1.2"
@@ -336,6 +456,28 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "filetime"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "windows-sys",
+]
+
+[[package]]
+name = "flate2"
+version = "1.0.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -407,6 +549,498 @@ dependencies = [
  "wasi",
 ]
 
+[[package]]
+name = "git-actor"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18d4ce09c0a6c71c044700e5932877667f427f007b77e6c39ab49aebc4719e25"
+dependencies = [
+ "bstr 1.0.1",
+ "btoi",
+ "git-date",
+ "itoa",
+ "nom",
+ "quick-error",
+]
+
+[[package]]
+name = "git-attributes"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c62e66a042c6b39c6dbfa3be37d134900d99ff9c54bbe489ed560a573895d5d"
+dependencies = [
+ "bstr 1.0.1",
+ "compact_str",
+ "git-features",
+ "git-glob",
+ "git-path",
+ "git-quote",
+ "thiserror",
+ "unicode-bom",
+]
+
+[[package]]
+name = "git-bitmap"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "327098a7ad27ae298d7e71602dbd4375cc828d755d10a720e4be0be1b4ec38f0"
+dependencies = [
+ "quick-error",
+]
+
+[[package]]
+name = "git-chunk"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07b2bc1635b660ad6e30379a84a4946590a3c124b747107c2cca1d9dbb98f588"
+dependencies = [
+ "thiserror",
+]
+
+[[package]]
+name = "git-command"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e4b01997b6551554fdac6f02277d0d04c3e869daa649bedd06d38c86f11dc42"
+dependencies = [
+ "bstr 1.0.1",
+]
+
+[[package]]
+name = "git-config"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd8603e953bd4c9bf310e74e43697400f5542f1cc75fad46fbd7427135a9534f"
+dependencies = [
+ "bstr 1.0.1",
+ "git-config-value",
+ "git-features",
+ "git-glob",
+ "git-path",
+ "git-ref",
+ "git-sec",
+ "memchr",
+ "nom",
+ "once_cell",
+ "smallvec",
+ "thiserror",
+ "unicode-bom",
+]
+
+[[package]]
+name = "git-config-value"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f276bfe5806b414915112f1eec0f006206cdf5b8cc9bbb44ef7e52286dc3eb"
+dependencies = [
+ "bitflags",
+ "bstr 1.0.1",
+ "git-path",
+ "libc",
+ "thiserror",
+]
+
+[[package]]
+name = "git-credentials"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f540186ea56fd075ba2b923180ebf4318e66ceaeac0a2a518e75dab8517d339"
+dependencies = [
+ "bstr 1.0.1",
+ "git-command",
+ "git-config-value",
+ "git-path",
+ "git-prompt",
+ "git-sec",
+ "git-url",
+ "thiserror",
+]
+
+[[package]]
+name = "git-date"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37881e9725df41e15d16216d3a0cee251fd8a39d425f75b389112df5c7f20f3d"
+dependencies = [
+ "bstr 1.0.1",
+ "itoa",
+ "thiserror",
+ "time",
+]
+
+[[package]]
+name = "git-diff"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a88666a0ae4365b55a0cbf2efde68d2a4cff0747894ad229403bd60b0b2abc5"
+dependencies = [
+ "git-hash",
+ "git-object",
+ "imara-diff",
+ "thiserror",
+]
+
+[[package]]
+name = "git-discover"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "881e4136d5599cfdb79d8ef60d650823d1a563589fa493d8e4961e64d78a79f2"
+dependencies = [
+ "bstr 1.0.1",
+ "git-hash",
+ "git-path",
+ "git-ref",
+ "git-sec",
+ "thiserror",
+]
+
+[[package]]
+name = "git-features"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4be88ae837674c71b30c6517c6f5f1335f8135bb8a9ffef20000d211933bed08"
+dependencies = [
+ "crc32fast",
+ "flate2",
+ "git-hash",
+ "libc",
+ "once_cell",
+ "prodash",
+ "quick-error",
+ "sha1_smol",
+ "walkdir",
+]
+
+[[package]]
+name = "git-glob"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d756430237112f8c89049236f60fdcdb0005127b1f7e531d40984e4fe7daa90"
+dependencies = [
+ "bitflags",
+ "bstr 1.0.1",
+]
+
+[[package]]
+name = "git-hash"
+version = "0.9.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16d46e6c2d1e8da4438a87bf516a6761b300964a353541fea61e96b3c7b34554"
+dependencies = [
+ "hex",
+ "thiserror",
+]
+
+[[package]]
+name = "git-index"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "821583c2d12b1e864694eb0bf1cca10ff6a3f45966f5f834e0f921b496dbe7cb"
+dependencies = [
+ "atoi",
+ "bitflags",
+ "bstr 1.0.1",
+ "filetime",
+ "git-bitmap",
+ "git-features",
+ "git-hash",
+ "git-lock",
+ "git-object",
+ "git-traverse",
+ "itoa",
+ "memmap2",
+ "smallvec",
+ "thiserror",
+]
+
+[[package]]
+name = "git-lock"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f0fe10bf961f62b1335b4c07785e64fb4d86c5ed367dc7cd9360f13c3eb7c78"
+dependencies = [
+ "fastrand",
+ "git-tempfile",
+ "quick-error",
+]
+
+[[package]]
+name = "git-mailmap"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb3f85ce84b2328aeb3124a809f7b3a63e59c4d63c227dba7a9cdf6fca6c0987"
+dependencies = [
+ "bstr 1.0.1",
+ "git-actor",
+ "quick-error",
+]
+
+[[package]]
+name = "git-object"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9469a8c00d8bb500ee76a12e455bb174b4ddf71674713335dd1a84313723f7b3"
+dependencies = [
+ "bstr 1.0.1",
+ "btoi",
+ "git-actor",
+ "git-features",
+ "git-hash",
+ "git-validate",
+ "hex",
+ "itoa",
+ "nom",
+ "smallvec",
+ "thiserror",
+]
+
+[[package]]
+name = "git-odb"
+version = "0.35.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aaaea7031ac7d8dfee232a16d7114395d118226214fb03fe4e15d1f4d62a88a6"
+dependencies = [
+ "arc-swap",
+ "git-features",
+ "git-hash",
+ "git-object",
+ "git-pack",
+ "git-path",
+ "git-quote",
+ "parking_lot",
+ "tempfile",
+ "thiserror",
+]
+
+[[package]]
+name = "git-pack"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc4386dff835ffdc3697c3558111f708fd7b7695c42a4347f2d211cf3246c8e1"
+dependencies = [
+ "bytesize",
+ "clru",
+ "dashmap",
+ "git-chunk",
+ "git-diff",
+ "git-features",
+ "git-hash",
+ "git-object",
+ "git-path",
+ "git-tempfile",
+ "git-traverse",
+ "hash_hasher",
+ "memmap2",
+ "parking_lot",
+ "smallvec",
+ "thiserror",
+]
+
+[[package]]
+name = "git-path"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "425dc1022690be13e6c5bde4b7e04d9504d323605ec314cd367cebf38a812572"
+dependencies = [
+ "bstr 1.0.1",
+ "thiserror",
+]
+
+[[package]]
+name = "git-prompt"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa6947935c0671342277bc883ff0687978477b570c1ffe2200b9ba5ac8afdd9f"
+dependencies = [
+ "git-command",
+ "git-config-value",
+ "nix",
+ "parking_lot",
+ "thiserror",
+]
+
+[[package]]
+name = "git-quote"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ea17931d07cbe447f371bbdf45ff03c30ea86db43788166655a5302df87ecfc"
+dependencies = [
+ "bstr 1.0.1",
+ "btoi",
+ "quick-error",
+]
+
+[[package]]
+name = "git-ref"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "638c9e454bacb2965a43f05b4a383c8f66dc64f3a770bd0324b221c2a20e121d"
+dependencies = [
+ "git-actor",
+ "git-features",
+ "git-hash",
+ "git-lock",
+ "git-object",
+ "git-path",
+ "git-tempfile",
+ "git-validate",
+ "memmap2",
+ "nom",
+ "thiserror",
+]
+
+[[package]]
+name = "git-refspec"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9497af773538ae8cfda053ff7dd0a9e6c28d333ba653040f54b8b4ee32f14187"
+dependencies = [
+ "bstr 1.0.1",
+ "git-hash",
+ "git-revision",
+ "git-validate",
+ "smallvec",
+ "thiserror",
+]
+
+[[package]]
+name = "git-repository"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eeb43e59612e493af6a433bf0a960de0042c8aa6f4e4c4cb414f03b97e296b82"
+dependencies = [
+ "byte-unit",
+ "clru",
+ "git-actor",
+ "git-attributes",
+ "git-config",
+ "git-credentials",
+ "git-date",
+ "git-diff",
+ "git-discover",
+ "git-features",
+ "git-glob",
+ "git-hash",
+ "git-index",
+ "git-lock",
+ "git-mailmap",
+ "git-object",
+ "git-odb",
+ "git-pack",
+ "git-path",
+ "git-prompt",
+ "git-ref",
+ "git-refspec",
+ "git-revision",
+ "git-sec",
+ "git-tempfile",
+ "git-traverse",
+ "git-url",
+ "git-validate",
+ "git-worktree",
+ "log",
+ "once_cell",
+ "signal-hook",
+ "smallvec",
+ "thiserror",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "git-revision"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efd31c63c3745b5dba5ec7109eec41a9c717f4e1e797fe0ef93098f33f31b25"
+dependencies = [
+ "bstr 1.0.1",
+ "git-date",
+ "git-hash",
+ "git-object",
+ "hash_hasher",
+ "thiserror",
+]
+
+[[package]]
+name = "git-sec"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c79769f6546814d0774db7295c768441016b7e40bdd414fa8dfae2c616a1892"
+dependencies = [
+ "bitflags",
+ "dirs",
+ "git-path",
+ "libc",
+ "windows",
+]
+
+[[package]]
+name = "git-tempfile"
+version = "2.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d23bc6129de3cbd81e6c9d0d685b5540c6b41bd9fa0cc38f381bc300743d708"
+dependencies = [
+ "dashmap",
+ "libc",
+ "once_cell",
+ "signal-hook",
+ "signal-hook-registry",
+ "tempfile",
+]
+
+[[package]]
+name = "git-traverse"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d0c4dd773c69f294f43ace8373d48eb770129791f104c6857fa8cac0505af89"
+dependencies = [
+ "git-hash",
+ "git-object",
+ "hash_hasher",
+ "thiserror",
+]
+
+[[package]]
+name = "git-url"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21b7f8323196840e7932f5b60e1d9c1d6c140fd806bc512f8beedc3f990a1f81"
+dependencies = [
+ "bstr 1.0.1",
+ "git-features",
+ "git-path",
+ "home",
+ "thiserror",
+ "url",
+]
+
+[[package]]
+name = "git-validate"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5439d6aa0de838dfadd74a71e97a9e23ebc719fd11a9ab6788b835b112c8c3d"
+dependencies = [
+ "bstr 1.0.1",
+ "thiserror",
+]
+
+[[package]]
+name = "git-worktree"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45bcc69c36a29cfa283710b7901877ab251d658935f5a41ed824416af500e0ed"
+dependencies = [
+ "bstr 1.0.1",
+ "git-attributes",
+ "git-features",
+ "git-glob",
+ "git-hash",
+ "git-index",
+ "git-object",
+ "git-path",
+ "io-close",
+ "thiserror",
+]
+
 [[package]]
 name = "globset"
 version = "0.4.9"
@@ -414,7 +1048,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a"
 dependencies = [
  "aho-corasick",
- "bstr",
+ "bstr 0.2.17",
  "fnv",
  "log",
  "regex",
@@ -436,7 +1070,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1345f8d33c89f2d5b081f2f2a41175adef9fd0bed2fea6a26c96c2deb027e58e"
 dependencies = [
  "aho-corasick",
- "bstr",
+ "bstr 0.2.17",
  "grep-matcher",
  "log",
  "regex",
@@ -450,7 +1084,7 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48852bd08f9b4eb3040ecb6d2f4ade224afe880a9a0909c5563cc59fa67932cc"
 dependencies = [
- "bstr",
+ "bstr 0.2.17",
  "bytecount",
  "encoding_rs",
  "encoding_rs_io",
@@ -459,6 +1093,12 @@ dependencies = [
  "memmap2",
 ]
 
+[[package]]
+name = "hash_hasher"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74721d007512d0cb3338cd20f0654ac913920061a4c4d0d8708edb3f2a698c0c"
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -576,6 +1216,7 @@ dependencies = [
  "helix-loader",
  "helix-lsp",
  "helix-tui",
+ "helix-vcs",
  "helix-view",
  "ignore",
  "indoc",
@@ -608,6 +1249,19 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "helix-vcs"
+version = "0.6.0"
+dependencies = [
+ "git-repository",
+ "helix-core",
+ "imara-diff",
+ "log",
+ "parking_lot",
+ "tempfile",
+ "tokio",
+]
+
 [[package]]
 name = "helix-view"
 version = "0.6.0"
@@ -624,6 +1278,7 @@ dependencies = [
  "helix-loader",
  "helix-lsp",
  "helix-tui",
+ "helix-vcs",
  "log",
  "once_cell",
  "serde",
@@ -645,6 +1300,27 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "home"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "human_format"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86cce260d758a9aa3d7c4b99d55c815a540f8a37514ba6046ab6be402a157cb0"
+
 [[package]]
 name = "iana-time-zone"
 version = "0.1.53"
@@ -722,6 +1398,16 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "io-close"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cadcf447f06744f8ce713d2d6239bb5bde2c357a452397a9ed90c625da390bc"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.4"
@@ -815,6 +1501,21 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+dependencies = [
+ "adler",
+]
+
 [[package]]
 name = "mio"
 version = "0.8.5"
@@ -827,6 +1528,28 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "nix"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
+dependencies = [
+ "autocfg",
+ "bitflags",
+ "cfg-if",
+ "libc",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@@ -856,6 +1579,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "num_threads"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.16.0"
@@ -912,6 +1644,16 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "prodash"
+version = "21.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e13d7bd38cdab08b3a8b780cedcc54238c84fdca4084eb188807b308bcf11e6"
+dependencies = [
+ "bytesize",
+ "human_format",
+]
+
 [[package]]
 name = "pulldown-cmark"
 version = "0.9.2"
@@ -923,6 +1665,12 @@ dependencies = [
  "unicase",
 ]
 
+[[package]]
+name = "quick-error"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+
 [[package]]
 name = "quickcheck"
 version = "1.0.3"
@@ -1021,6 +1769,12 @@ dependencies = [
  "str_indices",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
+
 [[package]]
 name = "ryu"
 version = "1.0.11"
@@ -1090,6 +1844,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "sha1_smol"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
+
 [[package]]
 name = "signal-hook"
 version = "0.3.14"
@@ -1293,6 +2053,35 @@ dependencies = [
  "num_cpus",
 ]
 
+[[package]]
+name = "time"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
+dependencies = [
+ "itoa",
+ "libc",
+ "num_threads",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+
+[[package]]
+name = "time-macros"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
+dependencies = [
+ "time-core",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
@@ -1384,6 +2173,12 @@ version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
 
+[[package]]
+name = "unicode-bom"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63ec69f541d875b783ca40184d655f2927c95f0bffd486faa83cd3ac3529ec32"
+
 [[package]]
 name = "unicode-general-category"
 version = "0.6.0"
@@ -1439,6 +2234,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "utf8-width"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1"
+
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -1558,57 +2359,114 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e30acc718a52fb130fec72b1cb5f55ffeeec9253e1b785e94db222178a6acaa1"
+dependencies = [
+ "windows_aarch64_gnullvm 0.40.0",
+ "windows_aarch64_msvc 0.40.0",
+ "windows_i686_gnu 0.40.0",
+ "windows_i686_msvc 0.40.0",
+ "windows_x86_64_gnu 0.40.0",
+ "windows_x86_64_gnullvm 0.40.0",
+ "windows_x86_64_msvc 0.40.0",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.42.0",
+ "windows_aarch64_msvc 0.42.0",
+ "windows_i686_gnu 0.42.0",
+ "windows_i686_msvc 0.42.0",
+ "windows_x86_64_gnu 0.42.0",
+ "windows_x86_64_gnullvm 0.42.0",
+ "windows_x86_64_msvc 0.42.0",
 ]
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3caa4a1a16561b714323ca6b0817403738583033a6a92e04c5d10d4ba37ca10"
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "328973c62dfcc50fb1aaa8e7100676e0b642fe56bac6bafff3327902db843ab4"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa5b09fad70f0df85dea2ac2a525537e415e2bf63ee31cf9b8e263645ee9f3c1"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a1ad4031c1a98491fa195d8d43d7489cb749f135f2e5c4eed58da094bd0d876"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520ff37edd72da8064b49d2281182898e17f0688ae9f4070bca27e4b5c162ac7"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "046e5b82215102c44fd75f488f1b9158973d02aa34d06ed85c23d6f5520a2853"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a0c9c6df55dd1bfa76e131cef44bdd8ec9c819ef3611f04dfe453fd5bfeda28"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.0"
diff --git a/Cargo.toml b/Cargo.toml
index 9e985ddc..ecf6848e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,6 +7,7 @@ members = [
   "helix-lsp",
   "helix-dap",
   "helix-loader",
+  "helix-vcs",
   "xtask",
 ]
 
diff --git a/book/src/configuration.md b/book/src/configuration.md
index e4854cda..0890d283 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -46,7 +46,7 @@ on unix operating systems.
 | `line-number` | Line number display: `absolute` simply shows each line's number, while `relative` shows the distance from the current line. When unfocused or in insert mode, `relative` will still show absolute line numbers. | `absolute` |
 | `cursorline` | Highlight all lines with a cursor. | `false` |
 | `cursorcolumn` | Highlight all columns with a cursor. | `false` |
-| `gutters` | Gutters to display: Available are `diagnostics` and `line-numbers` and `spacer`, note that `diagnostics` also includes other features like breakpoints, 1-width padding will be inserted if gutters is non-empty | `["diagnostics", "spacer", "line-numbers"]` |
+| `gutters` | Gutters to display: Available are `diagnostics` and `diff` and `line-numbers` and `spacer`, note that `diagnostics` also includes other features like breakpoints, 1-width padding will be inserted if gutters is non-empty | `["diagnostics", "spacer", "line-numbers", "spacer", "diff"]` |
 | `auto-completion` | Enable automatic pop up of auto-completion. | `true` |
 | `auto-format` | Enable automatic formatting on save. | `true` |
 | `auto-save` | Enable automatic saving on focus moving away from Helix. Requires [focus event support](https://github.com/helix-editor/helix/wiki/Terminal-Support) from your terminal. | `false` |
diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index 5f60c048..0e76ebbb 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -83,7 +83,7 @@ pub fn find_root(root: Option<&str>, root_markers: &[String]) -> std::path::Path
     top_marker.map_or(current_dir, |a| a.to_path_buf())
 }
 
-pub use ropey::{str_utils, Rope, RopeBuilder, RopeSlice};
+pub use ropey::{self, str_utils, Rope, RopeBuilder, RopeSlice};
 
 // pub use tendril::StrTendril as Tendril;
 pub use smartstring::SmartString;
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 485cabe9..30bfc7ea 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -17,8 +17,10 @@ build = true
 app = true
 
 [features]
+default = ["git"]
 unicode-lines = ["helix-core/unicode-lines"]
 integration = []
+git = ["helix-vcs/git"]
 
 [[bin]]
 name = "hx"
@@ -29,6 +31,7 @@ helix-core = { version = "0.6", path = "../helix-core" }
 helix-view = { version = "0.6", path = "../helix-view" }
 helix-lsp = { version = "0.6", path = "../helix-lsp" }
 helix-dap = { version = "0.6", path = "../helix-dap" }
+helix-vcs = { version = "0.6", path = "../helix-vcs" }
 helix-loader = { version = "0.6", path = "../helix-loader" }
 
 anyhow = "1"
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 99d3af18..dc12ba3c 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -274,16 +274,27 @@ impl Application {
     }
 
     #[cfg(feature = "integration")]
-    fn render(&mut self) {}
+    async fn render(&mut self) {}
 
     #[cfg(not(feature = "integration"))]
-    fn render(&mut self) {
+    async fn render(&mut self) {
         let mut cx = crate::compositor::Context {
             editor: &mut self.editor,
             jobs: &mut self.jobs,
             scroll: None,
         };
 
+        // Acquire mutable access to the redraw_handle lock
+        // to ensure that there are no tasks running that want to block rendering
+        drop(cx.editor.redraw_handle.1.write().await);
+        cx.editor.needs_redraw = false;
+        {
+            // exhaust any leftover redraw notifications
+            let notify = cx.editor.redraw_handle.0.notified();
+            tokio::pin!(notify);
+            notify.enable();
+        }
+
         let area = self
             .terminal
             .autoresize()
@@ -304,7 +315,7 @@ impl Application {
     where
         S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
     {
-        self.render();
+        self.render().await;
         self.last_render = Instant::now();
 
         loop {
@@ -329,18 +340,18 @@ impl Application {
                 biased;
 
                 Some(event) = input_stream.next() => {
-                    self.handle_terminal_events(event);
+                    self.handle_terminal_events(event).await;
                 }
                 Some(signal) = self.signals.next() => {
                     self.handle_signals(signal).await;
                 }
                 Some(callback) = self.jobs.futures.next() => {
                     self.jobs.handle_callback(&mut self.editor, &mut self.compositor, callback);
-                    self.render();
+                    self.render().await;
                 }
                 Some(callback) = self.jobs.wait_futures.next() => {
                     self.jobs.handle_callback(&mut self.editor, &mut self.compositor, callback);
-                    self.render();
+                    self.render().await;
                 }
                 event = self.editor.wait_event() => {
                     let _idle_handled = self.handle_editor_event(event).await;
@@ -445,25 +456,25 @@ impl Application {
                 self.compositor.resize(area);
                 self.terminal.clear().expect("couldn't clear terminal");
 
-                self.render();
+                self.render().await;
             }
             signal::SIGUSR1 => {
                 self.refresh_config();
-                self.render();
+                self.render().await;
             }
             _ => unreachable!(),
         }
     }
 
-    pub fn handle_idle_timeout(&mut self) {
+    pub async fn handle_idle_timeout(&mut self) {
         let mut cx = crate::compositor::Context {
             editor: &mut self.editor,
             jobs: &mut self.jobs,
             scroll: None,
         };
         let should_render = self.compositor.handle_event(&Event::IdleTimeout, &mut cx);
-        if should_render {
-            self.render();
+        if should_render || self.editor.needs_redraw {
+            self.render().await;
         }
     }
 
@@ -536,11 +547,11 @@ impl Application {
         match event {
             EditorEvent::DocumentSaved(event) => {
                 self.handle_document_write(event);
-                self.render();
+                self.render().await;
             }
             EditorEvent::ConfigEvent(event) => {
                 self.handle_config_events(event);
-                self.render();
+                self.render().await;
             }
             EditorEvent::LanguageServerMessage((id, call)) => {
                 self.handle_language_server_message(call, id).await;
@@ -548,19 +559,19 @@ impl Application {
                 let last = self.editor.language_servers.incoming.is_empty();
 
                 if last || self.last_render.elapsed() > LSP_DEADLINE {
-                    self.render();
+                    self.render().await;
                     self.last_render = Instant::now();
                 }
             }
             EditorEvent::DebuggerEvent(payload) => {
                 let needs_render = self.editor.handle_debugger_message(payload).await;
                 if needs_render {
-                    self.render();
+                    self.render().await;
                 }
             }
             EditorEvent::IdleTimer => {
                 self.editor.clear_idle_timer();
-                self.handle_idle_timeout();
+                self.handle_idle_timeout().await;
 
                 #[cfg(feature = "integration")]
                 {
@@ -572,7 +583,10 @@ impl Application {
         false
     }
 
-    pub fn handle_terminal_events(&mut self, event: Result<CrosstermEvent, crossterm::ErrorKind>) {
+    pub async fn handle_terminal_events(
+        &mut self,
+        event: Result<CrosstermEvent, crossterm::ErrorKind>,
+    ) {
         let mut cx = crate::compositor::Context {
             editor: &mut self.editor,
             jobs: &mut self.jobs,
@@ -596,7 +610,7 @@ impl Application {
         };
 
         if should_redraw && !self.editor.should_close() {
-            self.render();
+            self.render().await;
         }
     }
 
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 2fa903a7..9f848efd 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1028,10 +1028,12 @@ fn reload(
     }
 
     let scrolloff = cx.editor.config().scrolloff;
+    let redraw_handle = cx.editor.redraw_handle.clone();
     let (view, doc) = current!(cx.editor);
-    doc.reload(view).map(|_| {
-        view.ensure_cursor_in_view(doc, scrolloff);
-    })
+    doc.reload(view, &cx.editor.diff_providers, redraw_handle)
+        .map(|_| {
+            view.ensure_cursor_in_view(doc, scrolloff);
+        })
 }
 
 fn reload_all(
@@ -1066,7 +1068,8 @@ fn reload_all(
 
         // Every doc is guaranteed to have at least 1 view at this point.
         let view = view_mut!(cx.editor, view_ids[0]);
-        doc.reload(view)?;
+        let redraw_handle = cx.editor.redraw_handle.clone();
+        doc.reload(view, &cx.editor.diff_providers, redraw_handle)?;
 
         for view_id in view_ids {
             let view = view_mut!(cx.editor, view_id);
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 7bda74d2..32c8fe91 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -730,7 +730,7 @@ impl EditorView {
         let mut text = String::with_capacity(8);
 
         for gutter_type in view.gutters() {
-            let gutter = gutter_type.style(editor, doc, view, theme, is_focused);
+            let mut gutter = gutter_type.style(editor, doc, view, theme, is_focused);
             let width = gutter_type.width(view, doc);
             text.reserve(width); // ensure there's enough space for the gutter
             for (i, line) in (view.offset.row..(last_line + 1)).enumerate() {
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
new file mode 100644
index 00000000..c114666d
--- /dev/null
+++ b/helix-vcs/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "helix-vcs"
+version = "0.6.0"
+authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
+edition = "2021"
+license = "MPL-2.0"
+categories = ["editor"]
+repository = "https://github.com/helix-editor/helix"
+homepage = "https://helix-editor.com"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+helix-core = { version = "0.6", path = "../helix-core" }
+
+tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
+parking_lot = "0.12"
+
+git-repository = { version = "0.26", default-features = false , optional = true }
+imara-diff = "0.1.5"
+
+log = "0.4"
+
+[features]
+git = ["git-repository"]
+
+[dev-dependencies]
+tempfile = "3.3"
\ No newline at end of file
diff --git a/helix-vcs/src/diff.rs b/helix-vcs/src/diff.rs
new file mode 100644
index 00000000..b1acd1f2
--- /dev/null
+++ b/helix-vcs/src/diff.rs
@@ -0,0 +1,198 @@
+use std::ops::Range;
+use std::sync::Arc;
+
+use helix_core::Rope;
+use imara_diff::Algorithm;
+use parking_lot::{Mutex, MutexGuard};
+use tokio::sync::mpsc::{unbounded_channel, UnboundedSender};
+use tokio::sync::{Notify, OwnedRwLockReadGuard, RwLock};
+use tokio::task::JoinHandle;
+use tokio::time::Instant;
+
+use crate::diff::worker::DiffWorker;
+
+mod line_cache;
+mod worker;
+
+type RedrawHandle = (Arc<Notify>, Arc<RwLock<()>>);
+
+/// A rendering lock passed to the differ the prevents redraws from occurring
+struct RenderLock {
+    pub lock: OwnedRwLockReadGuard<()>,
+    pub timeout: Option<Instant>,
+}
+
+struct Event {
+    text: Rope,
+    is_base: bool,
+    render_lock: Option<RenderLock>,
+}
+
+#[derive(Clone, Debug)]
+pub struct DiffHandle {
+    channel: UnboundedSender<Event>,
+    render_lock: Arc<RwLock<()>>,
+    hunks: Arc<Mutex<Vec<Hunk>>>,
+    inverted: bool,
+}
+
+impl DiffHandle {
+    pub fn new(diff_base: Rope, doc: Rope, redraw_handle: RedrawHandle) -> DiffHandle {
+        DiffHandle::new_with_handle(diff_base, doc, redraw_handle).0
+    }
+
+    fn new_with_handle(
+        diff_base: Rope,
+        doc: Rope,
+        redraw_handle: RedrawHandle,
+    ) -> (DiffHandle, JoinHandle<()>) {
+        let (sender, receiver) = unbounded_channel();
+        let hunks: Arc<Mutex<Vec<Hunk>>> = Arc::default();
+        let worker = DiffWorker {
+            channel: receiver,
+            hunks: hunks.clone(),
+            new_hunks: Vec::default(),
+            redraw_notify: redraw_handle.0,
+            diff_finished_notify: Arc::default(),
+        };
+        let handle = tokio::spawn(worker.run(diff_base, doc));
+        let differ = DiffHandle {
+            channel: sender,
+            hunks,
+            inverted: false,
+            render_lock: redraw_handle.1,
+        };
+        (differ, handle)
+    }
+
+    pub fn invert(&mut self) {
+        self.inverted = !self.inverted;
+    }
+
+    pub fn hunks(&self) -> FileHunks {
+        FileHunks {
+            hunks: self.hunks.lock(),
+            inverted: self.inverted,
+        }
+    }
+
+    /// Updates the document associated with this redraw handle
+    /// This function is only intended to be called from within the rendering loop
+    /// if called from elsewhere it may fail to acquire the render lock and panic
+    pub fn update_document(&self, doc: Rope, block: bool) -> bool {
+        // unwrap is ok here because the rendering lock is
+        // only exclusively locked during redraw.
+        // This function is only intended to be called
+        // from the core rendering loop where no redraw can happen in parallel
+        let lock = self.render_lock.clone().try_read_owned().unwrap();
+        let timeout = if block {
+            None
+        } else {
+            Some(Instant::now() + tokio::time::Duration::from_millis(SYNC_DIFF_TIMEOUT))
+        };
+        self.update_document_impl(doc, self.inverted, Some(RenderLock { lock, timeout }))
+    }
+
+    pub fn update_diff_base(&self, diff_base: Rope) -> bool {
+        self.update_document_impl(diff_base, !self.inverted, None)
+    }
+
+    fn update_document_impl(
+        &self,
+        text: Rope,
+        is_base: bool,
+        render_lock: Option<RenderLock>,
+    ) -> bool {
+        let event = Event {
+            text,
+            is_base,
+            render_lock,
+        };
+        self.channel.send(event).is_ok()
+    }
+}
+
+/// synchronous debounce value should be low
+/// so we can update synchronously most of the time
+const DIFF_DEBOUNCE_TIME_SYNC: u64 = 1;
+/// maximum time that rendering should be blocked until the diff finishes
+const SYNC_DIFF_TIMEOUT: u64 = 12;
+const DIFF_DEBOUNCE_TIME_ASYNC: u64 = 96;
+const ALGORITHM: Algorithm = Algorithm::Histogram;
+const MAX_DIFF_LINES: usize = 64 * u16::MAX as usize;
+// cap average line length to 128 for files with MAX_DIFF_LINES
+const MAX_DIFF_BYTES: usize = MAX_DIFF_LINES * 128;
+
+/// A single change in a file potentially spanning multiple lines
+/// Hunks produced by the differs are always ordered by their position
+/// in the file and non-overlapping.
+/// Specifically for any two hunks `x` and `y` the following properties hold:
+///
+/// ``` no_compile
+/// assert!(x.before.end <= y.before.start);
+/// assert!(x.after.end <= y.after.start);
+/// ```
+#[derive(PartialEq, Eq, Clone, Debug)]
+pub struct Hunk {
+    pub before: Range<u32>,
+    pub after: Range<u32>,
+}
+
+impl Hunk {
+    /// Can be used instead of `Option::None` for better performance
+    /// because lines larger then `i32::MAX` are not supported by `imara-diff` anyways.
+    /// Has some nice properties where it usually is not necessary to check for `None` separately:
+    /// Empty ranges fail contains checks and also fails smaller then checks.
+    pub const NONE: Hunk = Hunk {
+        before: u32::MAX..u32::MAX,
+        after: u32::MAX..u32::MAX,
+    };
+
+    /// Inverts a change so that `before`
+    pub fn invert(&self) -> Hunk {
+        Hunk {
+            before: self.after.clone(),
+            after: self.before.clone(),
+        }
+    }
+
+    pub fn is_pure_insertion(&self) -> bool {
+        self.before.is_empty()
+    }
+
+    pub fn is_pure_removal(&self) -> bool {
+        self.after.is_empty()
+    }
+}
+
+/// A list of changes in a file sorted in ascending
+/// non-overlapping order
+#[derive(Debug)]
+pub struct FileHunks<'a> {
+    hunks: MutexGuard<'a, Vec<Hunk>>,
+    inverted: bool,
+}
+
+impl FileHunks<'_> {
+    pub fn is_inverted(&self) -> bool {
+        self.inverted
+    }
+
+    /// Returns the `Hunk` for the `n`th change in this file.
+    /// if there is no `n`th change  `Hunk::NONE` is returned instead.
+    pub fn nth_hunk(&self, n: u32) -> Hunk {
+        match self.hunks.get(n as usize) {
+            Some(hunk) if self.inverted => hunk.invert(),
+            Some(hunk) => hunk.clone(),
+            None => Hunk::NONE,
+        }
+    }
+
+    pub fn len(&self) -> u32 {
+        self.hunks.len() as u32
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+}
diff --git a/helix-vcs/src/diff/line_cache.rs b/helix-vcs/src/diff/line_cache.rs
new file mode 100644
index 00000000..c3ee5daa
--- /dev/null
+++ b/helix-vcs/src/diff/line_cache.rs
@@ -0,0 +1,130 @@
+//! This modules encapsulates a tiny bit of unsafe code that
+//! makes diffing significantly faster and more ergonomic to implement.
+//! This code is necessary because diffing requires quick random
+//! access to the lines of the text that is being diffed.
+//!
+//! Therefore it is best to collect the `Rope::lines` iterator into a vec
+//! first because access to the vec is `O(1)` where `Rope::line` is `O(log N)`.
+//! However this process can allocate a (potentially quite large) vector.
+//!
+//! To avoid reallocation for every diff, the vector is reused.
+//! However the RopeSlice references the original rope and therefore forms a self-referential data structure.
+//! A transmute is used to change the lifetime of the slice to static to circumvent that project.
+use std::mem::transmute;
+
+use helix_core::{Rope, RopeSlice};
+use imara_diff::intern::{InternedInput, Interner};
+
+use super::{MAX_DIFF_BYTES, MAX_DIFF_LINES};
+
+/// A cache that stores the `lines` of a rope as a vector.
+/// It allows safely reusing the allocation of the vec when updating the rope
+pub(crate) struct InternedRopeLines {
+    diff_base: Rope,
+    doc: Rope,
+    num_tokens_diff_base: u32,
+    interned: InternedInput<RopeSlice<'static>>,
+}
+
+impl InternedRopeLines {
+    pub fn new(diff_base: Rope, doc: Rope) -> InternedRopeLines {
+        let mut res = InternedRopeLines {
+            interned: InternedInput {
+                before: Vec::with_capacity(diff_base.len_lines()),
+                after: Vec::with_capacity(doc.len_lines()),
+                interner: Interner::new(diff_base.len_lines() + doc.len_lines()),
+            },
+            diff_base,
+            doc,
+            // will be populated by update_diff_base_impl
+            num_tokens_diff_base: 0,
+        };
+        res.update_diff_base_impl();
+        res
+    }
+
+    /// Updates the `diff_base` and optionally the document if `doc` is not None
+    pub fn update_diff_base(&mut self, diff_base: Rope, doc: Option<Rope>) {
+        self.interned.clear();
+        self.diff_base = diff_base;
+        if let Some(doc) = doc {
+            self.doc = doc
+        }
+        if !self.is_too_large() {
+            self.update_diff_base_impl();
+        }
+    }
+
+    /// Updates the `doc` without reinterning the `diff_base`, this function
+    /// is therefore significantly faster than `update_diff_base` when only the document changes.
+    pub fn update_doc(&mut self, doc: Rope) {
+        // Safety: we clear any tokens that were added after
+        // the interning of `self.diff_base` finished so
+        // all lines that refer to `self.doc` have been purged.
+
+        self.interned
+            .interner
+            .erase_tokens_after(self.num_tokens_diff_base.into());
+
+        self.doc = doc;
+        if self.is_too_large() {
+            self.interned.after.clear();
+        } else {
+            self.update_doc_impl();
+        }
+    }
+
+    fn update_diff_base_impl(&mut self) {
+        // Safety: This transmute is safe because it only transmutes a lifetime, which has no effect.
+        // The backing storage for the RopeSlices referred to by the lifetime is stored in `self.diff_base`.
+        // Therefore as long as `self.diff_base` is not dropped/replaced this memory remains valid.
+        // `self.diff_base` is only changed in `self.update_diff_base`, which clears the interner.
+        // When the interned lines are exposed to consumer in `self.diff_input`, the lifetime is bounded to a reference to self.
+        // That means that on calls to update there exist no references to `self.interned`.
+        let before = self
+            .diff_base
+            .lines()
+            .map(|line: RopeSlice| -> RopeSlice<'static> { unsafe { transmute(line) } });
+        self.interned.update_before(before);
+        self.num_tokens_diff_base = self.interned.interner.num_tokens();
+        // the has to be interned again because the interner was fully cleared
+        self.update_doc_impl()
+    }
+
+    fn update_doc_impl(&mut self) {
+        // Safety: This transmute is save because it only transmutes a lifetime, which has no effect.
+        // The backing storage for the RopeSlices referred to by the lifetime is stored in `self.doc`.
+        // Therefore as long as `self.doc` is not dropped/replaced this memory remains valid.
+        // `self.doc` is only changed in `self.update_doc`, which clears the interner.
+        // When the interned lines are exposed to consumer in `self.diff_input`, the lifetime is bounded to a reference to self.
+        // That means that on calls to update there exist no references to `self.interned`.
+        let after = self
+            .doc
+            .lines()
+            .map(|line: RopeSlice| -> RopeSlice<'static> { unsafe { transmute(line) } });
+        self.interned.update_after(after);
+    }
+
+    fn is_too_large(&self) -> bool {
+        // bound both lines and bytes to avoid huge files with few (but huge) lines
+        // or huge file with tiny lines. While this makes no difference to
+        // diff itself (the diff performance only depends on the number of tokens)
+        // the interning runtime depends mostly on filesize and is actually dominant
+        // for large files
+        self.doc.len_lines() > MAX_DIFF_LINES
+            || self.diff_base.len_lines() > MAX_DIFF_LINES
+            || self.doc.len_bytes() > MAX_DIFF_BYTES
+            || self.diff_base.len_bytes() > MAX_DIFF_BYTES
+    }
+
+    /// Returns the `InternedInput` for performing the diff.
+    /// If `diff_base` or `doc` is so large that performing a diff could slow the editor
+    /// this function returns `None`.
+    pub fn interned_lines(&self) -> Option<&InternedInput<RopeSlice>> {
+        if self.is_too_large() {
+            None
+        } else {
+            Some(&self.interned)
+        }
+    }
+}
diff --git a/helix-vcs/src/diff/worker.rs b/helix-vcs/src/diff/worker.rs
new file mode 100644
index 00000000..b8659c9b
--- /dev/null
+++ b/helix-vcs/src/diff/worker.rs
@@ -0,0 +1,207 @@
+use std::mem::swap;
+use std::ops::Range;
+use std::sync::Arc;
+
+use helix_core::{Rope, RopeSlice};
+use imara_diff::intern::InternedInput;
+use parking_lot::Mutex;
+use tokio::sync::mpsc::UnboundedReceiver;
+use tokio::sync::Notify;
+use tokio::time::{timeout, timeout_at, Duration};
+
+use crate::diff::{
+    Event, RenderLock, ALGORITHM, DIFF_DEBOUNCE_TIME_ASYNC, DIFF_DEBOUNCE_TIME_SYNC,
+};
+
+use super::line_cache::InternedRopeLines;
+use super::Hunk;
+
+#[cfg(test)]
+mod test;
+
+pub(super) struct DiffWorker {
+    pub channel: UnboundedReceiver<Event>,
+    pub hunks: Arc<Mutex<Vec<Hunk>>>,
+    pub new_hunks: Vec<Hunk>,
+    pub redraw_notify: Arc<Notify>,
+    pub diff_finished_notify: Arc<Notify>,
+}
+
+impl DiffWorker {
+    async fn accumulate_events(&mut self, event: Event) -> (Option<Rope>, Option<Rope>) {
+        let mut accumulator = EventAccumulator::new();
+        accumulator.handle_event(event).await;
+        accumulator
+            .accumulate_debounced_events(
+                &mut self.channel,
+                self.redraw_notify.clone(),
+                self.diff_finished_notify.clone(),
+            )
+            .await;
+        (accumulator.doc, accumulator.diff_base)
+    }
+
+    pub async fn run(mut self, diff_base: Rope, doc: Rope) {
+        let mut interner = InternedRopeLines::new(diff_base, doc);
+        if let Some(lines) = interner.interned_lines() {
+            self.perform_diff(lines);
+        }
+        self.apply_hunks();
+        while let Some(event) = self.channel.recv().await {
+            let (doc, diff_base) = self.accumulate_events(event).await;
+
+            let process_accumulated_events = || {
+                if let Some(new_base) = diff_base {
+                    interner.update_diff_base(new_base, doc)
+                } else {
+                    interner.update_doc(doc.unwrap())
+                }
+
+                if let Some(lines) = interner.interned_lines() {
+                    self.perform_diff(lines)
+                }
+            };
+
+            // Calculating diffs is computationally expensive and should
+            // not run inside an async function to avoid blocking other futures.
+            // Note: tokio::task::block_in_place does not work during tests
+            #[cfg(test)]
+            process_accumulated_events();
+            #[cfg(not(test))]
+            tokio::task::block_in_place(process_accumulated_events);
+
+            self.apply_hunks();
+        }
+    }
+
+    /// update the hunks (used by the gutter) by replacing it with `self.new_hunks`.
+    /// `self.new_hunks` is always empty after this function runs.
+    /// To improve performance this function tries to reuse the allocation of the old diff previously stored in `self.line_diffs`
+    fn apply_hunks(&mut self) {
+        swap(&mut *self.hunks.lock(), &mut self.new_hunks);
+        self.diff_finished_notify.notify_waiters();
+        self.new_hunks.clear();
+    }
+
+    fn perform_diff(&mut self, input: &InternedInput<RopeSlice>) {
+        imara_diff::diff(ALGORITHM, input, |before: Range<u32>, after: Range<u32>| {
+            self.new_hunks.push(Hunk { before, after })
+        })
+    }
+}
+
+struct EventAccumulator {
+    diff_base: Option<Rope>,
+    doc: Option<Rope>,
+    render_lock: Option<RenderLock>,
+}
+
+impl<'a> EventAccumulator {
+    fn new() -> EventAccumulator {
+        EventAccumulator {
+            diff_base: None,
+            doc: None,
+            render_lock: None,
+        }
+    }
+
+    async fn handle_event(&mut self, event: Event) {
+        let dst = if event.is_base {
+            &mut self.diff_base
+        } else {
+            &mut self.doc
+        };
+
+        *dst = Some(event.text);
+
+        // always prefer the most synchronous requested render mode
+        if let Some(render_lock) = event.render_lock {
+            match &mut self.render_lock {
+                Some(RenderLock { timeout, .. }) => {
+                    // A timeout of `None` means that the render should
+                    // always wait for the diff to complete (so no timeout)
+                    // remove the existing timeout, otherwise keep the previous timeout
+                    // because it will be shorter then the current timeout
+                    if render_lock.timeout.is_none() {
+                        timeout.take();
+                    }
+                }
+                None => self.render_lock = Some(render_lock),
+            }
+        }
+    }
+
+    async fn accumulate_debounced_events(
+        &mut self,
+        channel: &mut UnboundedReceiver<Event>,
+        redraw_notify: Arc<Notify>,
+        diff_finished_notify: Arc<Notify>,
+    ) {
+        let async_debounce = Duration::from_millis(DIFF_DEBOUNCE_TIME_ASYNC);
+        let sync_debounce = Duration::from_millis(DIFF_DEBOUNCE_TIME_SYNC);
+        loop {
+            // if we are not blocking rendering use a much longer timeout
+            let debounce = if self.render_lock.is_none() {
+                async_debounce
+            } else {
+                sync_debounce
+            };
+
+            if let Ok(Some(event)) = timeout(debounce, channel.recv()).await {
+                self.handle_event(event).await;
+            } else {
+                break;
+            }
+        }
+
+        // setup task to trigger the rendering
+        match self.render_lock.take() {
+            // diff is performed outside of the rendering loop
+            // request a redraw after the diff is done
+            None => {
+                tokio::spawn(async move {
+                    diff_finished_notify.notified().await;
+                    redraw_notify.notify_one();
+                });
+            }
+            // diff is performed inside the rendering loop
+            // block redraw until the diff is done or the timeout is expired
+            Some(RenderLock {
+                lock,
+                timeout: Some(timeout),
+            }) => {
+                tokio::spawn(async move {
+                    let res = {
+                        // Acquire a lock on the redraw handle.
+                        // The lock will block the rendering from occurring while held.
+                        // The rendering waits for the diff if it doesn't time out
+                        timeout_at(timeout, diff_finished_notify.notified()).await
+                    };
+                    // we either reached the timeout or the diff is finished, release the render lock
+                    drop(lock);
+                    if res.is_ok() {
+                        // Diff finished in time we are done.
+                        return;
+                    }
+                    // Diff failed to complete in time log the event
+                    // and wait until the diff occurs to trigger an async redraw
+                    log::warn!("Diff computation timed out, update of diffs might appear delayed");
+                    diff_finished_notify.notified().await;
+                    redraw_notify.notify_one();
+                });
+            }
+            // a blocking diff is performed inside the rendering loop
+            // block redraw until the diff is done
+            Some(RenderLock {
+                lock,
+                timeout: None,
+            }) => {
+                tokio::spawn(async move {
+                    diff_finished_notify.notified().await;
+                    // diff is done release the lock
+                    drop(lock)
+                });
+            }
+        };
+    }
+}
diff --git a/helix-vcs/src/diff/worker/test.rs b/helix-vcs/src/diff/worker/test.rs
new file mode 100644
index 00000000..14442426
--- /dev/null
+++ b/helix-vcs/src/diff/worker/test.rs
@@ -0,0 +1,149 @@
+use helix_core::Rope;
+use tokio::task::JoinHandle;
+
+use crate::diff::{DiffHandle, Hunk};
+
+impl DiffHandle {
+    fn new_test(diff_base: &str, doc: &str) -> (DiffHandle, JoinHandle<()>) {
+        DiffHandle::new_with_handle(
+            Rope::from_str(diff_base),
+            Rope::from_str(doc),
+            Default::default(),
+        )
+    }
+    async fn into_diff(self, handle: JoinHandle<()>) -> Vec<Hunk> {
+        let hunks = self.hunks;
+        // dropping the channel terminates the task
+        drop(self.channel);
+        handle.await.unwrap();
+        let hunks = hunks.lock();
+        Vec::clone(&*hunks)
+    }
+}
+
+#[tokio::test]
+async fn append_line() {
+    let (differ, handle) = DiffHandle::new_test("foo\n", "foo\nbar\n");
+    let line_diffs = differ.into_diff(handle).await;
+    assert_eq!(
+        &line_diffs,
+        &[Hunk {
+            before: 1..1,
+            after: 1..2
+        }]
+    )
+}
+
+#[tokio::test]
+async fn prepend_line() {
+    let (differ, handle) = DiffHandle::new_test("foo\n", "bar\nfoo\n");
+    let line_diffs = differ.into_diff(handle).await;
+    assert_eq!(
+        &line_diffs,
+        &[Hunk {
+            before: 0..0,
+            after: 0..1
+        }]
+    )
+}
+
+#[tokio::test]
+async fn modify() {
+    let (differ, handle) = DiffHandle::new_test("foo\nbar\n", "foo bar\nbar\n");
+    let line_diffs = differ.into_diff(handle).await;
+    assert_eq!(
+        &line_diffs,
+        &[Hunk {
+            before: 0..1,
+            after: 0..1
+        }]
+    )
+}
+
+#[tokio::test]
+async fn delete_line() {
+    let (differ, handle) = DiffHandle::new_test("foo\nfoo bar\nbar\n", "foo\nbar\n");
+    let line_diffs = differ.into_diff(handle).await;
+    assert_eq!(
+        &line_diffs,
+        &[Hunk {
+            before: 1..2,
+            after: 1..1
+        }]
+    )
+}
+
+#[tokio::test]
+async fn delete_line_and_modify() {
+    let (differ, handle) = DiffHandle::new_test("foo\nbar\ntest\nfoo", "foo\ntest\nfoo bar");
+    let line_diffs = differ.into_diff(handle).await;
+    assert_eq!(
+        &line_diffs,
+        &[
+            Hunk {
+                before: 1..2,
+                after: 1..1
+            },
+            Hunk {
+                before: 3..4,
+                after: 2..3
+            },
+        ]
+    )
+}
+
+#[tokio::test]
+async fn add_use() {
+    let (differ, handle) = DiffHandle::new_test(
+        "use ropey::Rope;\nuse tokio::task::JoinHandle;\n",
+        "use ropey::Rope;\nuse ropey::RopeSlice;\nuse tokio::task::JoinHandle;\n",
+    );
+    let line_diffs = differ.into_diff(handle).await;
+    assert_eq!(
+        &line_diffs,
+        &[Hunk {
+            before: 1..1,
+            after: 1..2
+        },]
+    )
+}
+
+#[tokio::test]
+async fn update_document() {
+    let (differ, handle) = DiffHandle::new_test("foo\nbar\ntest\nfoo", "foo\nbar\ntest\nfoo");
+    differ.update_document(Rope::from_str("foo\ntest\nfoo bar"), false);
+    let line_diffs = differ.into_diff(handle).await;
+    assert_eq!(
+        &line_diffs,
+        &[
+            Hunk {
+                before: 1..2,
+                after: 1..1
+            },
+            Hunk {
+                before: 3..4,
+                after: 2..3
+            },
+        ]
+    )
+}
+
+#[tokio::test]
+async fn update_base() {
+    let (differ, handle) = DiffHandle::new_test("foo\ntest\nfoo bar", "foo\ntest\nfoo bar");
+    differ.update_diff_base(Rope::from_str("foo\nbar\ntest\nfoo"));
+    let line_diffs = differ.into_diff(handle).await;
+    assert_eq!(
+        &line_diffs,
+        &[
+            Hunk {
+                before: 1..2,
+                after: 1..1
+            },
+            Hunk {
+                before: 3..4,
+                after: 2..3
+            },
+        ]
+    )
+}
diff --git a/helix-vcs/src/git.rs b/helix-vcs/src/git.rs
new file mode 100644
index 00000000..82b2b558
--- /dev/null
+++ b/helix-vcs/src/git.rs
@@ -0,0 +1,80 @@
+use std::path::Path;
+
+use git::objs::tree::EntryMode;
+use git::sec::trust::DefaultForLevel;
+use git::{Commit, ObjectId, Repository, ThreadSafeRepository};
+use git_repository as git;
+
+use crate::DiffProvider;
+
+#[cfg(test)]
+mod test;
+
+pub struct Git;
+
+impl Git {
+    fn open_repo(path: &Path, ceiling_dir: Option<&Path>) -> Option<ThreadSafeRepository> {
+        // custom open options
+        let mut git_open_opts_map = git::sec::trust::Mapping::<git::open::Options>::default();
+
+        // don't use the global git configs (not needed)
+        let config = git::permissions::Config {
+            system: false,
+            git: false,
+            user: false,
+            env: true,
+            includes: true,
+            git_binary: false,
+        };
+        // change options for config permissions without touching anything else
+        git_open_opts_map.reduced = git_open_opts_map.reduced.permissions(git::Permissions {
+            config,
+            ..git::Permissions::default_for_level(git::sec::Trust::Reduced)
+        });
+        git_open_opts_map.full = git_open_opts_map.full.permissions(git::Permissions {
+            config,
+            ..git::Permissions::default_for_level(git::sec::Trust::Full)
+        });
+
+        let mut open_options = git::discover::upwards::Options::default();
+        if let Some(ceiling_dir) = ceiling_dir {
+            open_options.ceiling_dirs = vec![ceiling_dir.to_owned()];
+        }
+
+        ThreadSafeRepository::discover_with_environment_overrides_opts(
+            path,
+            open_options,
+            git_open_opts_map,
+        )
+        .ok()
+    }
+}
+
+impl DiffProvider for Git {
+    fn get_diff_base(&self, file: &Path) -> Option<Vec<u8>> {
+        debug_assert!(!file.exists() || file.is_file());
+        debug_assert!(file.is_absolute());
+
+        // TODO cache repository lookup
+        let repo = Git::open_repo(file.parent()?, None)?.to_thread_local();
+        let head = repo.head_commit().ok()?;
+        let file_oid = find_file_in_commit(&repo, &head, file)?;
+
+        let file_object = repo.find_object(file_oid).ok()?;
+        Some(file_object.detach().data)
+    }
+}
+
+/// Finds the object that contains the contents of a file at a specific commit.
+fn find_file_in_commit(repo: &Repository, commit: &Commit, file: &Path) -> Option<ObjectId> {
+    let repo_dir = repo.work_dir()?;
+    let rel_path = file.strip_prefix(repo_dir).ok()?;
+    let tree = commit.tree().ok()?;
+    let tree_entry = tree.lookup_entry_by_path(rel_path).ok()??;
+    match tree_entry.mode() {
+        // not a file, everything is new, do not show diff
+        EntryMode::Tree | EntryMode::Commit | EntryMode::Link => None,
+        // found a file
+        EntryMode::Blob | EntryMode::BlobExecutable => Some(tree_entry.object_id()),
+    }
+}
diff --git a/helix-vcs/src/git/test.rs b/helix-vcs/src/git/test.rs
new file mode 100644
index 00000000..d6e9af08
--- /dev/null
+++ b/helix-vcs/src/git/test.rs
@@ -0,0 +1,121 @@
+use std::{fs::File, io::Write, path::Path, process::Command};
+
+use tempfile::TempDir;
+
+use crate::{DiffProvider, Git};
+
+fn exec_git_cmd(args: &str, git_dir: &Path) {
+    let res = Command::new("git")
+        .arg("-C")
+        .arg(git_dir) // execute the git command in this directory
+        .args(args.split_whitespace())
+        .env_remove("GIT_DIR")
+        .env_remove("GIT_ASKPASS")
+        .env_remove("SSH_ASKPASS")
+        .env("GIT_TERMINAL_PROMPT", "false")
+        .env("GIT_AUTHOR_DATE", "2000-01-01 00:00:00 +0000")
+        .env("GIT_AUTHOR_EMAIL", "author@example.com")
+        .env("GIT_AUTHOR_NAME", "author")
+        .env("GIT_COMMITTER_DATE", "2000-01-02 00:00:00 +0000")
+        .env("GIT_COMMITTER_EMAIL", "committer@example.com")
+        .env("GIT_COMMITTER_NAME", "committer")
+        .env("GIT_CONFIG_COUNT", "2")
+        .env("GIT_CONFIG_KEY_0", "commit.gpgsign")
+        .env("GIT_CONFIG_VALUE_0", "false")
+        .env("GIT_CONFIG_KEY_1", "init.defaultBranch")
+        .env("GIT_CONFIG_VALUE_1", "main")
+        .output()
+        .unwrap_or_else(|_| panic!("`git {args}` failed"));
+    if !res.status.success() {
+        println!("{}", String::from_utf8_lossy(&res.stdout));
+        eprintln!("{}", String::from_utf8_lossy(&res.stderr));
+        panic!("`git {args}` failed (see output above)")
+    }
+}
+
+fn create_commit(repo: &Path, add_modified: bool) {
+    if add_modified {
+        exec_git_cmd("add -A", repo);
+    }
+    exec_git_cmd("commit -m message", repo);
+}
+
+fn empty_git_repo() -> TempDir {
+    let tmp = tempfile::tempdir().expect("create temp dir for git testing");
+    exec_git_cmd("init", tmp.path());
+    exec_git_cmd("config user.email test@helix.org", tmp.path());
+    exec_git_cmd("config user.name helix-test", tmp.path());
+    tmp
+}
+
+#[test]
+fn missing_file() {
+    let temp_git = empty_git_repo();
+    let file = temp_git.path().join("file.txt");
+    File::create(&file).unwrap().write_all(b"foo").unwrap();
+
+    assert_eq!(Git.get_diff_base(&file), None);
+}
+
+#[test]
+fn unmodified_file() {
+    let temp_git = empty_git_repo();
+    let file = temp_git.path().join("file.txt");
+    let contents = b"foo".as_slice();
+    File::create(&file).unwrap().write_all(contents).unwrap();
+    create_commit(temp_git.path(), true);
+    assert_eq!(Git.get_diff_base(&file), Some(Vec::from(contents)));
+}
+
+#[test]
+fn modified_file() {
+    let temp_git = empty_git_repo();
+    let file = temp_git.path().join("file.txt");
+    let contents = b"foo".as_slice();
+    File::create(&file).unwrap().write_all(contents).unwrap();
+    create_commit(temp_git.path(), true);
+    File::create(&file).unwrap().write_all(b"bar").unwrap();
+
+    assert_eq!(Git.get_diff_base(&file), Some(Vec::from(contents)));
+}
+
+/// Test that `get_file_head` does not return content for a directory.
+/// This is important to correctly cover cases where a directory is removed and replaced by a file.
+/// If the contents of the directory object were returned a diff between a path and the directory children would be produced.
+#[test]
+fn directory() {
+    let temp_git = empty_git_repo();
+    let dir = temp_git.path().join("file.txt");
+    std::fs::create_dir(&dir).expect("");
+    let file = dir.join("file.txt");
+    let contents = b"foo".as_slice();
+    File::create(&file).unwrap().write_all(contents).unwrap();
+
+    create_commit(temp_git.path(), true);
+
+    std::fs::remove_dir_all(&dir).unwrap();
+    File::create(&dir).unwrap().write_all(b"bar").unwrap();
+    assert_eq!(Git.get_diff_base(&dir), None);
+}
+
+/// Test that `get_file_head` does not return content for a symlink.
+/// This is important to correctly cover cases where a symlink is removed and replaced by a file.
+/// If the contents of the symlink object were returned a diff between a path and the actual file would be produced (bad ui).
+#[cfg(any(unix, windows))]
+#[test]
+fn symlink() {
+    #[cfg(unix)]
+    use std::os::unix::fs::symlink;
+    #[cfg(not(unix))]
+    use std::os::windows::fs::symlink_file as symlink;
+    let temp_git = empty_git_repo();
+    let file = temp_git.path().join("file.txt");
+    let contents = b"foo".as_slice();
+    File::create(&file).unwrap().write_all(contents).unwrap();
+    let file_link = temp_git.path().join("file_link.txt");
+    symlink("file.txt", &file_link).unwrap();
+
+    create_commit(temp_git.path(), true);
+    assert_eq!(Git.get_diff_base(&file_link), None);
+    assert_eq!(Git.get_diff_base(&file), Some(Vec::from(contents)));
+}
diff --git a/helix-vcs/src/lib.rs b/helix-vcs/src/lib.rs
new file mode 100644
index 00000000..97320d32
--- /dev/null
+++ b/helix-vcs/src/lib.rs
@@ -0,0 +1,51 @@
+use std::path::Path;
+
+#[cfg(feature = "git")]
+pub use git::Git;
+#[cfg(not(feature = "git"))]
+pub use Dummy as Git;
+
+#[cfg(feature = "git")]
+mod git;
+
+mod diff;
+
+pub use diff::{DiffHandle, Hunk};
+
+pub trait DiffProvider {
+    /// Returns the data that a diff should be computed against
+    /// if this provider is used.
+    /// The data is returned as raw byte without any decoding or encoding performed
+    /// to ensure all file encodings are handled correctly.
+    fn get_diff_base(&self, file: &Path) -> Option<Vec<u8>>;
+}
+
+#[doc(hidden)]
+pub struct Dummy;
+impl DiffProvider for Dummy {
+    fn get_diff_base(&self, _file: &Path) -> Option<Vec<u8>> {
+        None
+    }
+}
+
+pub struct DiffProviderRegistry {
+    providers: Vec<Box<dyn DiffProvider>>,
+}
+
+impl DiffProviderRegistry {
+    pub fn get_diff_base(&self, file: &Path) -> Option<Vec<u8>> {
+        self.providers
+            .iter()
+            .find_map(|provider| provider.get_diff_base(file))
+    }
+}
+
+impl Default for DiffProviderRegistry {
+    fn default() -> Self {
+        // currently only git is supported
+        // TODO make this configurable when more providers are added
+        let git: Box<dyn DiffProvider> = Box::new(Git);
+        let providers = vec![git];
+        DiffProviderRegistry { providers }
+    }
+}
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index a2a88001..13d5da0e 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -21,6 +21,7 @@ helix-loader = { version = "0.6", path = "../helix-loader" }
 helix-lsp = { version = "0.6", path = "../helix-lsp" }
 helix-dap = { version = "0.6", path = "../helix-dap" }
 crossterm = { version = "0.25", optional = true }
+helix-vcs = { version = "0.6", path = "../helix-vcs" }
 
 # Conversion traits
 once_cell = "1.16"
@@ -43,6 +44,7 @@ log = "~0.4"
 
 which = "4.2"
 
+
 [target.'cfg(windows)'.dependencies]
 clipboard-win = { version = "4.4", features = ["std"] }
 
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index ad47f838..856e5628 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -3,6 +3,8 @@ use futures_util::future::BoxFuture;
 use futures_util::FutureExt;
 use helix_core::auto_pairs::AutoPairs;
 use helix_core::Range;
+use helix_vcs::{DiffHandle, DiffProviderRegistry};
+
 use serde::de::{self, Deserialize, Deserializer};
 use serde::Serialize;
 use std::borrow::Cow;
@@ -24,6 +26,7 @@ use helix_core::{
     DEFAULT_LINE_ENDING,
 };
 
+use crate::editor::RedrawHandle;
 use crate::{apply_transaction, DocumentId, Editor, View, ViewId};
 
 /// 8kB of buffer space for encoding and decoding `Rope`s.
@@ -133,6 +136,8 @@ pub struct Document {
 
     diagnostics: Vec<Diagnostic>,
     language_server: Option<Arc<helix_lsp::Client>>,
+
+    diff_handle: Option<DiffHandle>,
 }
 
 use std::{fmt, mem};
@@ -371,6 +376,7 @@ impl Document {
             last_saved_revision: 0,
             modified_since_accessed: false,
             language_server: None,
+            diff_handle: None,
         }
     }
 
@@ -624,16 +630,20 @@ impl Document {
     }
 
     /// Reload the document from its path.
-    pub fn reload(&mut self, view: &mut View) -> Result<(), Error> {
+    pub fn reload(
+        &mut self,
+        view: &mut View,
+        provider_registry: &DiffProviderRegistry,
+        redraw_handle: RedrawHandle,
+    ) -> Result<(), Error> {
         let encoding = &self.encoding;
-        let path = self.path().filter(|path| path.exists());
-
-        // If there is no path or the path no longer exists.
-        if path.is_none() {
-            bail!("can't find file to reload from");
-        }
+        let path = self
+            .path()
+            .filter(|path| path.exists())
+            .ok_or_else(|| anyhow!("can't find file to reload from"))?
+            .to_owned();
 
-        let mut file = std::fs::File::open(path.unwrap())?;
+        let mut file = std::fs::File::open(&path)?;
         let (rope, ..) = from_reader(&mut file, Some(encoding))?;
 
         // Calculate the difference between the buffer and source text, and apply it.
@@ -646,6 +656,11 @@ impl Document {
 
         self.detect_indent_and_line_ending();
 
+        match provider_registry.get_diff_base(&path) {
+            Some(diff_base) => self.set_diff_base(diff_base, redraw_handle),
+            None => self.diff_handle = None,
+        }
+
         Ok(())
     }
 
@@ -787,6 +802,10 @@ impl Document {
 
         if !transaction.changes().is_empty() {
             self.version += 1;
+            // start computing the diff in parallel
+            if let Some(diff_handle) = &self.diff_handle {
+                diff_handle.update_document(self.text.clone(), false);
+            }
 
             // generate revert to savepoint
             if self.savepoint.is_some() {
@@ -1046,6 +1065,23 @@ impl Document {
         server.is_initialized().then(|| server)
     }
 
+    pub fn diff_handle(&self) -> Option<&DiffHandle> {
+        self.diff_handle.as_ref()
+    }
+
+    /// Intialize/updates the differ for this document with a new base.
+    pub fn set_diff_base(&mut self, diff_base: Vec<u8>, redraw_handle: RedrawHandle) {
+        if let Ok((diff_base, _)) = from_reader(&mut diff_base.as_slice(), Some(self.encoding)) {
+            if let Some(differ) = &self.diff_handle {
+                differ.update_diff_base(diff_base);
+                return;
+            }
+            self.diff_handle = Some(DiffHandle::new(diff_base, self.text.clone(), redraw_handle))
+        } else {
+            self.diff_handle = None;
+        }
+    }
+
     #[inline]
     /// Tree-sitter AST tree
     pub fn syntax(&self) -> Option<&Syntax> {
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 5a1ac6b1..973cf82e 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -9,6 +9,7 @@ use crate::{
     tree::{self, Tree},
     Align, Document, DocumentId, View, ViewId,
 };
+use helix_vcs::DiffProviderRegistry;
 
 use futures_util::stream::select_all::SelectAll;
 use futures_util::{future, StreamExt};
@@ -26,7 +27,10 @@ use std::{
 };
 
 use tokio::{
-    sync::mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender},
+    sync::{
+        mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender},
+        Notify, RwLock,
+    },
     time::{sleep, Duration, Instant, Sleep},
 };
 
@@ -454,6 +458,8 @@ pub enum GutterType {
     LineNumbers,
     /// Show one blank space
     Spacer,
+    /// Highlight local changes
+    Diff,
 }
 
 impl std::str::FromStr for GutterType {
@@ -464,6 +470,7 @@ impl std::str::FromStr for GutterType {
             "diagnostics" => Ok(Self::Diagnostics),
             "spacer" => Ok(Self::Spacer),
             "line-numbers" => Ok(Self::LineNumbers),
+            "diff" => Ok(Self::Diff),
             _ => anyhow::bail!("Gutter type can only be `diagnostics` or `line-numbers`."),
         }
     }
@@ -600,6 +607,8 @@ impl Default for Config {
                 GutterType::Diagnostics,
                 GutterType::Spacer,
                 GutterType::LineNumbers,
+                GutterType::Spacer,
+                GutterType::Diff,
             ],
             middle_click_paste: true,
             auto_pairs: AutoPairConfig::default(),
@@ -681,6 +690,7 @@ pub struct Editor {
     pub macro_replaying: Vec<char>,
     pub language_servers: helix_lsp::Registry,
     pub diagnostics: BTreeMap<lsp::Url, Vec<lsp::Diagnostic>>,
+    pub diff_providers: DiffProviderRegistry,
 
     pub debugger: Option<dap::Client>,
     pub debugger_events: SelectAll<UnboundedReceiverStream<dap::Payload>>,
@@ -711,8 +721,15 @@ pub struct Editor {
     pub exit_code: i32,
 
     pub config_events: (UnboundedSender<ConfigEvent>, UnboundedReceiver<ConfigEvent>),
+    /// Allows asynchronous tasks to control the rendering
+    /// The `Notify` allows asynchronous tasks to request the editor to perform a redraw
+    /// The `RwLock` blocks the editor from performing the render until an exclusive lock can be aquired
+    pub redraw_handle: RedrawHandle,
+    pub needs_redraw: bool,
 }
 
+pub type RedrawHandle = (Arc<Notify>, Arc<RwLock<()>>);
+
 #[derive(Debug)]
 pub enum EditorEvent {
     DocumentSaved(DocumentSavedEventResult),
@@ -785,6 +802,7 @@ impl Editor {
             theme: theme_loader.default(),
             language_servers: helix_lsp::Registry::new(),
             diagnostics: BTreeMap::new(),
+            diff_providers: DiffProviderRegistry::default(),
             debugger: None,
             debugger_events: SelectAll::new(),
             breakpoints: HashMap::new(),
@@ -803,6 +821,8 @@ impl Editor {
             auto_pairs,
             exit_code: 0,
             config_events: unbounded_channel(),
+            redraw_handle: Default::default(),
+            needs_redraw: false,
         }
     }
 
@@ -1109,7 +1129,9 @@ impl Editor {
             let mut doc = Document::open(&path, None, Some(self.syn_loader.clone()))?;
 
             let _ = Self::launch_language_server(&mut self.language_servers, &mut doc);
-
+            if let Some(diff_base) = self.diff_providers.get_diff_base(&path) {
+                doc.set_diff_base(diff_base, self.redraw_handle.clone());
+            }
             self.new_document(doc)
         };
 
@@ -1348,24 +1370,39 @@ impl Editor {
     }
 
     pub async fn wait_event(&mut self) -> EditorEvent {
-        tokio::select! {
-            biased;
+        // the loop only runs once or twice and would be better implemented with a recursion + const generic
+        // however due to limitations with async functions that can not be implemented right now
+        loop {
+            tokio::select! {
+                biased;
+
+                Some(event) = self.save_queue.next() => {
+                    self.write_count -= 1;
+                    return EditorEvent::DocumentSaved(event)
+                }
+                Some(config_event) = self.config_events.1.recv() => {
+                    return EditorEvent::ConfigEvent(config_event)
+                }
+                Some(message) = self.language_servers.incoming.next() => {
+                    return EditorEvent::LanguageServerMessage(message)
+                }
+                Some(event) = self.debugger_events.next() => {
+                    return EditorEvent::DebuggerEvent(event)
+                }
 
-            Some(event) = self.save_queue.next() => {
-                self.write_count -= 1;
-                EditorEvent::DocumentSaved(event)
-            }
-            Some(config_event) = self.config_events.1.recv() => {
-                EditorEvent::ConfigEvent(config_event)
-            }
-            Some(message) = self.language_servers.incoming.next() => {
-                EditorEvent::LanguageServerMessage(message)
-            }
-            Some(event) = self.debugger_events.next() => {
-                EditorEvent::DebuggerEvent(event)
-            }
-            _ = &mut self.idle_timer => {
-                EditorEvent::IdleTimer
+                _ = self.redraw_handle.0.notified() => {
+                    if  !self.needs_redraw{
+                        self.needs_redraw = true;
+                        let timeout = Instant::now() + Duration::from_millis(96);
+                        if timeout < self.idle_timer.deadline(){
+                            self.idle_timer.as_mut().reset(timeout)
+                        }
+                    }
+                }
+
+                _ = &mut self.idle_timer  => {
+                    return EditorEvent::IdleTimer
+                }
             }
         }
     }
diff --git a/helix-view/src/gutter.rs b/helix-view/src/gutter.rs
index 61a17791..377518fb 100644
--- a/helix-view/src/gutter.rs
+++ b/helix-view/src/gutter.rs
@@ -12,7 +12,7 @@ fn count_digits(n: usize) -> usize {
     std::iter::successors(Some(n), |&n| (n >= 10).then(|| n / 10)).count()
 }
 
-pub type GutterFn<'doc> = Box<dyn Fn(usize, bool, &mut String) -> Option<Style> + 'doc>;
+pub type GutterFn<'doc> = Box<dyn FnMut(usize, bool, &mut String) -> Option<Style> + 'doc>;
 pub type Gutter =
     for<'doc> fn(&'doc Editor, &'doc Document, &View, &Theme, bool, usize) -> GutterFn<'doc>;
 
@@ -31,6 +31,7 @@ impl GutterType {
             }
             GutterType::LineNumbers => line_numbers(editor, doc, view, theme, is_focused),
             GutterType::Spacer => padding(editor, doc, view, theme, is_focused),
+            GutterType::Diff => diff(editor, doc, view, theme, is_focused),
         }
     }
 
@@ -39,6 +40,7 @@ impl GutterType {
             GutterType::Diagnostics => 1,
             GutterType::LineNumbers => line_numbers_width(_view, doc),
             GutterType::Spacer => 1,
+            GutterType::Diff => 1,
         }
     }
 }
@@ -83,6 +85,53 @@ pub fn diagnostic<'doc>(
     })
 }
 
+pub fn diff<'doc>(
+    _editor: &'doc Editor,
+    doc: &'doc Document,
+    _view: &View,
+    theme: &Theme,
+    _is_focused: bool,
+) -> GutterFn<'doc> {
+    let added = theme.get("diff.plus");
+    let deleted = theme.get("diff.minus");
+    let modified = theme.get("diff.delta");
+    if let Some(diff_handle) = doc.diff_handle() {
+        let hunks = diff_handle.hunks();
+        let mut hunk_i = 0;
+        let mut hunk = hunks.nth_hunk(hunk_i);
+        Box::new(move |line: usize, _selected: bool, out: &mut String| {
+            // truncating the line is fine here because we don't compute diffs
+            // for files with more lines than i32::MAX anyways
+            // we need to special case removals here
+            // these technically do not have a range of lines to highlight (`hunk.after.start == hunk.after.end`).
+            // However we still want to display these hunks correctly we must not yet skip to the next hunk here
+            while hunk.after.end < line as u32
+                || !hunk.is_pure_removal() && line as u32 == hunk.after.end
+            {
+                hunk_i += 1;
+                hunk = hunks.nth_hunk(hunk_i);
+            }
+
+            if hunk.after.start > line as u32 {
+                return None;
+            }
+
+            let (icon, style) = if hunk.is_pure_insertion() {
+                ("▍", added)
+            } else if hunk.is_pure_removal() {
+                ("▔", deleted)
+            } else {
+                ("▍", modified)
+            };
+
+            write!(out, "{}", icon).unwrap();
+            Some(style)
+        })
+    } else {
+        Box::new(move |_, _, _| None)
+    }
+}
+
 pub fn line_numbers<'doc>(
     editor: &'doc Editor,
     doc: &'doc Document,
@@ -226,8 +275,8 @@ pub fn diagnostics_or_breakpoints<'doc>(
     theme: &Theme,
     is_focused: bool,
 ) -> GutterFn<'doc> {
-    let diagnostics = diagnostic(editor, doc, view, theme, is_focused);
-    let breakpoints = breakpoints(editor, doc, view, theme, is_focused);
+    let mut diagnostics = diagnostic(editor, doc, view, theme, is_focused);
+    let mut breakpoints = breakpoints(editor, doc, view, theme, is_focused);
 
     Box::new(move |line, selected, out| {
         breakpoints(line, selected, out).or_else(|| diagnostics(line, selected, out))
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index 845a5458..ecc8e8be 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -158,17 +158,10 @@ impl View {
     }
 
     pub fn gutter_offset(&self, doc: &Document) -> u16 {
-        let mut offset = self
-            .gutters
+        self.gutters
             .iter()
             .map(|gutter| gutter.width(self, doc) as u16)
-            .sum();
-
-        if offset > 0 {
-            offset += 1
-        }
-
-        offset
+            .sum()
     }
 
     //
@@ -392,8 +385,8 @@ impl View {
 mod tests {
     use super::*;
     use helix_core::Rope;
-    const OFFSET: u16 = 4; // 1 diagnostic + 2 linenr (< 100 lines) + 1 gutter
-    const OFFSET_WITHOUT_LINE_NUMBERS: u16 = 2; // 1 diagnostic + 1 gutter
+    const OFFSET: u16 = 3; // 1 diagnostic + 2 linenr (< 100 lines)
+    const OFFSET_WITHOUT_LINE_NUMBERS: u16 = 1; // 1 diagnostic
                                                 // const OFFSET: u16 = GUTTERS.iter().map(|(_, width)| *width as u16).sum();
     use crate::document::Document;
     use crate::editor::GutterType;

From a8a54be6bcd0667c50b7c739dbfd072df684b3c3 Mon Sep 17 00:00:00 2001
From: Tshepang Mbambo <tshepang@gmail.com>
Date: Thu, 1 Dec 2022 18:37:38 +0200
Subject: [PATCH 578/884] Fix nightly clippy lints (#4954)

---
 helix-term/src/commands.rs     |  4 ++--
 helix-term/src/commands/lsp.rs |  2 +-
 helix-term/src/health.rs       |  2 +-
 helix-term/src/keymap.rs       |  6 +++---
 helix-term/src/ui/editor.rs    | 10 +++++-----
 helix-term/src/ui/mod.rs       |  4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index a6f88362..4cd27119 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2346,8 +2346,8 @@ fn buffer_picker(cx: &mut Context) {
     let picker = FilePicker::new(
         cx.editor
             .documents
-            .iter()
-            .map(|(_, doc)| new_meta(doc))
+            .values()
+            .map(|doc| new_meta(doc))
             .collect(),
         (),
         |cx, meta, action| {
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 1f80de5f..810e3adf 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -706,7 +706,7 @@ pub fn apply_document_resource_op(op: &lsp::ResourceOp) -> std::io::Result<()> {
             if ignore_if_exists && to.exists() {
                 Ok(())
             } else {
-                fs::rename(&from, &to)
+                fs::rename(from, &to)
             }
         }
     }
diff --git a/helix-term/src/health.rs b/helix-term/src/health.rs
index ac9f06fc..e8fbb84d 100644
--- a/helix-term/src/health.rs
+++ b/helix-term/src/health.rs
@@ -281,7 +281,7 @@ fn probe_protocol(protocol_name: &str, server_cmd: Option<String>) -> std::io::R
     writeln!(stdout, "Configured {}: {}", protocol_name, cmd_name)?;
 
     if let Some(cmd) = server_cmd {
-        let path = match which::which(&cmd) {
+        let path = match which::which(cmd) {
             Ok(path) => path.display().to_string().green(),
             Err(_) => "Not found in $PATH".to_string().red(),
         };
diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index 088b3b6d..4a131f0a 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -390,18 +390,18 @@ impl Keymaps {
 
         self.state.push(key);
         match trie.search(&self.state[1..]) {
-            Some(&KeyTrie::Node(ref map)) => {
+            Some(KeyTrie::Node(map)) => {
                 if map.is_sticky {
                     self.state.clear();
                     self.sticky = Some(map.clone());
                 }
                 KeymapResult::Pending(map.clone())
             }
-            Some(&KeyTrie::Leaf(ref cmd)) => {
+            Some(KeyTrie::Leaf(cmd)) => {
                 self.state.clear();
                 KeymapResult::Matched(cmd.clone())
             }
-            Some(&KeyTrie::Sequence(ref cmds)) => {
+            Some(KeyTrie::Sequence(cmds)) => {
                 self.state.clear();
                 KeymapResult::MatchedSequence(cmds.clone())
             }
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 32c8fe91..fc201853 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -516,8 +516,8 @@ impl EditorView {
                     use helix_core::graphemes::{grapheme_width, RopeGraphemes};
 
                     for grapheme in RopeGraphemes::new(text) {
-                        let out_of_bounds = offset.col > (visual_x as usize)
-                            || (visual_x as usize) >= viewport.width as usize + offset.col;
+                        let out_of_bounds = offset.col > visual_x
+                            || visual_x >= viewport.width as usize + offset.col;
 
                         if LineEnding::from_rope_slice(&grapheme).is_some() {
                             if !out_of_bounds {
@@ -547,7 +547,7 @@ impl EditorView {
                             let (display_grapheme, width) = if grapheme == "\t" {
                                 is_whitespace = true;
                                 // make sure we display tab as appropriate amount of spaces
-                                let visual_tab_width = tab_width - (visual_x as usize % tab_width);
+                                let visual_tab_width = tab_width - (visual_x % tab_width);
                                 let grapheme_tab_width =
                                     helix_core::str_utils::char_to_byte_idx(&tab, visual_tab_width);
 
@@ -566,7 +566,7 @@ impl EditorView {
                                 (grapheme.as_ref(), width)
                             };
 
-                            let cut_off_start = offset.col.saturating_sub(visual_x as usize);
+                            let cut_off_start = offset.col.saturating_sub(visual_x);
 
                             if !out_of_bounds {
                                 // if we're offscreen just keep going until we hit a new line
@@ -583,7 +583,7 @@ impl EditorView {
                             } else if cut_off_start != 0 && cut_off_start < width {
                                 // partially on screen
                                 let rect = Rect::new(
-                                    viewport.x as u16,
+                                    viewport.x,
                                     viewport.y + line,
                                     (width - cut_off_start) as u16,
                                     1,
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 3416b319..f61c4c45 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -254,8 +254,8 @@ pub mod completers {
     pub fn buffer(editor: &Editor, input: &str) -> Vec<Completion> {
         let mut names: Vec<_> = editor
             .documents
-            .iter()
-            .map(|(_id, doc)| {
+            .values()
+            .map(|doc| {
                 let name = doc
                     .relative_path()
                     .map(|p| p.display().to_string())

From e3f05603acae078af89472e21928251846c57efd Mon Sep 17 00:00:00 2001
From: Tshepang Mbambo <tshepang@gmail.com>
Date: Thu, 1 Dec 2022 23:55:52 +0200
Subject: [PATCH 579/884] tutor: Clarify space searching instructions (#4953)

---
 runtime/tutor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/tutor b/runtime/tutor
index 957af640..d977e078 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -535,7 +535,8 @@ _________________________________________________________________
 
  1. Move the cursor to the line marked '-->' below.
  2. Select the line with x and then type s.
- 3. Enter '  +' to select any amount of consecutive spaces >1.
+ 3. Type '  +' to select any amount of consecutive spaces >1,
+    then type Enter.
  4. Type c and change the matches to single spaces.
 
  --> This  sentence has   some      extra spaces.
@@ -547,7 +548,6 @@ _________________________________________________________________
        then perform the steps explained above.
 
 
-
 =================================================================
 =                      5.4 ALIGN SELECTIONS                     =
 =================================================================

From 71a3a23f425bb562ab8cfede8f4220e8a7250242 Mon Sep 17 00:00:00 2001
From: Bertrand Bousquet <b.kamek@gmail.com>
Date: Fri, 2 Dec 2022 01:18:18 +0000
Subject: [PATCH 580/884] Varua theme updates (cursorline, statusline) (#4964)

---
 runtime/themes/varua.toml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/runtime/themes/varua.toml b/runtime/themes/varua.toml
index 63c85887..7ef502a6 100644
--- a/runtime/themes/varua.toml
+++ b/runtime/themes/varua.toml
@@ -45,7 +45,7 @@
 "diff.minus" = "red"
 
 "ui.background" = { bg = "bg0" }
-"ui.cursorline.primary" = { bg = "bg2" }
+"ui.cursorline.primary" = { bg = "bg6" }
 "ui.cursor" = { fg = "bg0", bg = "fg" }
 "ui.cursor.match" = { fg = "orange", bg = "bg_yellow" }
 "ui.cursor.insert" = { fg = "bg0", bg = "grey1" }
@@ -63,6 +63,8 @@
 "ui.menu.selected" = { fg = "fg", bg = "bg1" }
 "ui.selection" = { bg = "bg3" }
 "ui.virtual.whitespace" = "grey0"
+"ui.statusline.insert" = { bg = "green", fg = "bg2" }
+"ui.statusline.select" = { bg = "blue", fg = "bg2" }
 
 "hint" = "blue"
 "info" = "aqua"
@@ -77,6 +79,7 @@ bg2 = "#32302f"
 bg3 = "#3c3836"
 bg4 = "#4c555b"
 bg5 = "#53605c"
+bg6 = "#2c2c2c"
 bg_visual = "#503946"
 bg_red = "#4e3e43"
 bg_green = "#404d44"

From 8291654326e0e5ff14830bfade72178b622a9f3c Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 1 Dec 2022 19:18:32 -0600
Subject: [PATCH 581/884] reload_all: Ensure view is synced with doc history
 before reload (#4965)

---
 helix-term/src/commands/typed.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 9f848efd..03fcaa55 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1068,6 +1068,10 @@ fn reload_all(
 
         // Every doc is guaranteed to have at least 1 view at this point.
         let view = view_mut!(cx.editor, view_ids[0]);
+
+        // Ensure that the view is synced with the document's history.
+        view.sync_changes(doc);
+
         let redraw_handle = cx.editor.redraw_handle.clone();
         doc.reload(view, &cx.editor.diff_providers, redraw_handle)?;
 

From 4960c41f18d93e8b4c48a7c4e96f00d948cfad5f Mon Sep 17 00:00:00 2001
From: sigmaSd <bedisnbiba@gmail.com>
Date: Fri, 2 Dec 2022 02:18:45 +0100
Subject: [PATCH 582/884] feat(lsp): add support for lsp Diagnostic{}.data
 (#4935)

---
 helix-core/src/diagnostic.rs  |  1 +
 helix-lsp/src/lib.rs          | 15 ++++++++-------
 helix-term/src/application.rs |  3 ++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/helix-core/src/diagnostic.rs b/helix-core/src/diagnostic.rs
index db1f2da9..6b5da17e 100644
--- a/helix-core/src/diagnostic.rs
+++ b/helix-core/src/diagnostic.rs
@@ -45,4 +45,5 @@ pub struct Diagnostic {
     pub code: Option<NumberOrString>,
     pub tags: Vec<DiagnosticTag>,
     pub source: Option<String>,
+    pub data: Option<serde_json::Value>,
 }
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index 5de76c6c..abc930f8 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -102,16 +102,17 @@ pub mod util {
             None
         };
 
-        // TODO: add support for Diagnostic.data
-        lsp::Diagnostic::new(
-            range_to_lsp_range(doc, range, offset_encoding),
+        lsp::Diagnostic {
+            range: range_to_lsp_range(doc, range, offset_encoding),
             severity,
             code,
-            diag.source.clone(),
-            diag.message.to_owned(),
-            None,
+            source: diag.source.clone(),
+            message: diag.message.to_owned(),
+            related_information: None,
             tags,
-        )
+            data: diag.data.to_owned(),
+            ..Default::default()
+        }
     }
 
     /// Converts [`lsp::Position`] to a position in the document.
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index dc12ba3c..7a50e007 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -772,7 +772,8 @@ impl Application {
                                         severity,
                                         code,
                                         tags,
-                                        source: diagnostic.source.clone()
+                                        source: diagnostic.source.clone(),
+                                        data: diagnostic.data.clone(),
                                     })
                                 })
                                 .collect();

From 700f8ba252fdf44c019b8ba77eb5c2b3f91402d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 22 Nov 2022 18:30:31 +0900
Subject: [PATCH 583/884] Use `cargo fmt`'s --check

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 526c7b3c..deeff80e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -85,7 +85,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
 
       - name: Run cargo fmt
-        run: cargo fmt --all -- --check
+        run: cargo fmt --all --check
 
       - name: Run cargo clippy
         run: cargo clippy --workspace --all-targets -- -D warnings

From dc1ec5632223a87f2d7a70aa13273c85db1b57d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Fri, 2 Dec 2022 12:05:42 +0900
Subject: [PATCH 584/884] Add the new logo!

---
 README.md | 6 ++++++
 logo.svg  | 1 +
 2 files changed, 7 insertions(+)
 create mode 100644 logo.svg

diff --git a/README.md b/README.md
index c1f30218..8035fd2c 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Helix
 
+<img src="./logo.svg" height="" alt="Logo"/>
+
 [![Build status](https://github.com/helix-editor/helix/actions/workflows/build.yml/badge.svg)](https://github.com/helix-editor/helix/actions)
 
 ![Screenshot](./screenshot.png)
@@ -126,3 +128,7 @@ Contributing guidelines can be found [here](./docs/CONTRIBUTING.md).
 Your question might already be answered on the [FAQ](https://github.com/helix-editor/helix/wiki/FAQ).
 
 Discuss the project on the community [Matrix Space](https://matrix.to/#/#helix-community:matrix.org) (make sure to join `#helix-editor:matrix.org` if you're on a client that doesn't support Matrix Spaces yet).
+
+# Credits
+
+Thanks to [@JakeHL](https://github.com/JakeHL) for designing the logo!
diff --git a/logo.svg b/logo.svg
new file mode 100644
index 00000000..05dd73a8
--- /dev/null
+++ b/logo.svg
@@ -0,0 +1 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;" viewBox="663.38 37.57 575.35 903.75">     <g transform="matrix(1,0,0,1,-31352.7,-1817.25)">                  <g transform="matrix(1,0,0,1,31062.7,-20.8972)">             <g transform="matrix(1,0,0,1,-130.173,0.00185558)">                 <path d="M1083.58,1875.72L1635.06,2194.12C1649.8,2202.63 1658.88,2218.37 1658.88,2235.39C1658.88,2264.98 1658.88,2311.74 1658.88,2341.33C1658.88,2349.84 1656.61,2358.03 1652.5,2365.16C1652.5,2365.16 1214.7,2112.4 1107.2,2050.33C1092.58,2041.89 1083.58,2026.29 1083.58,2009.41C1083.58,1963.5 1083.58,1875.72 1083.58,1875.72Z" style="fill:#706bc8;"></path>             </g>             <g transform="matrix(1,0,0,1,-130.173,0.00185558)">                 <path d="M1635.26,2604.84C1649.88,2613.28 1658.88,2628.87 1658.88,2645.75C1658.88,2691.67 1658.88,2779.44 1658.88,2779.44L1107.41,2461.05C1092.66,2452.53 1083.58,2436.8 1083.58,2419.78C1083.58,2390.19 1083.58,2343.42 1083.58,2313.84C1083.58,2305.32 1085.85,2297.13 1089.96,2290.01C1089.96,2290.01 1527.76,2542.77 1635.26,2604.84Z" style="fill:#55c5e4;"></path>             </g>             <g transform="matrix(1,0,0,1,216.062,984.098)">                 <path d="M790.407,1432.56C785.214,1435.55 780.717,1439.9 777.509,1445.46C767.862,1462.16 773.473,1483.76 790.004,1493.59L789.998,1493.59L761.173,1476.95C746.427,1468.44 737.344,1452.71 737.344,1435.68C737.344,1406.09 737.344,1359.33 737.344,1329.74C737.344,1312.71 746.427,1296.98 761.173,1288.47L1259.59,1000.74L1259.83,1000.6C1264.92,997.617 1269.33,993.314 1272.48,987.844C1282.13,971.136 1276.52,949.544 1259.99,939.707L1260,939.707L1288.82,956.349C1303.57,964.862 1312.65,980.595 1312.65,997.622C1312.65,1027.21 1312.65,1073.97 1312.65,1103.56C1312.65,1120.59 1303.57,1136.32 1288.82,1144.83L1259.19,1161.94L1259.59,1161.68L790.407,1432.56Z" style="fill:#84ddea;"></path>             </g>             <g transform="matrix(1,0,0,1,216.062,984.098)">                 <path d="M790.407,1686.24C785.214,1689.23 780.717,1693.58 777.509,1699.13C767.862,1715.84 773.473,1737.43 790.004,1747.27L789.998,1747.27L761.173,1730.63C746.427,1722.12 737.344,1706.38 737.344,1689.36C737.344,1659.77 737.344,1613.01 737.344,1583.42C737.344,1566.39 746.427,1550.66 761.173,1542.15L1259.59,1254.42L1259.83,1254.28C1264.92,1251.29 1269.33,1246.99 1272.48,1241.52C1282.13,1224.81 1276.52,1203.22 1259.99,1193.38L1260,1193.38L1288.82,1210.03C1303.57,1218.54 1312.65,1234.27 1312.65,1251.3C1312.65,1280.89 1312.65,1327.65 1312.65,1357.24C1312.65,1374.26 1303.57,1390 1288.82,1398.51L1259.19,1415.61L1259.59,1415.36L790.407,1686.24Z" style="fill:#997bc8;"></path></g></g></g> </svg>
\ No newline at end of file

From e92651816dea9f28ff2d73b06dedbe03c02ebe30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Fri, 2 Dec 2022 12:07:08 +0900
Subject: [PATCH 585/884] Forgot to set the height

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8035fd2c..79873b74 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# Helix
+<img src="./logo.svg" height="128" alt="Logo"/>
 
-<img src="./logo.svg" height="" alt="Logo"/>
+# Helix
 
 [![Build status](https://github.com/helix-editor/helix/actions/workflows/build.yml/badge.svg)](https://github.com/helix-editor/helix/actions)
 

From 98c121c9fc9d9dbc058120ede9700c0e0bbc5551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Fri, 2 Dec 2022 17:42:10 +0900
Subject: [PATCH 586/884] Detect WezTerm and mark it as undercurl/Smulx capable

---
 helix-tui/src/backend/crossterm.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/helix-tui/src/backend/crossterm.rs b/helix-tui/src/backend/crossterm.rs
index 7c7250fa..c00e1f40 100644
--- a/helix-tui/src/backend/crossterm.rs
+++ b/helix-tui/src/backend/crossterm.rs
@@ -14,6 +14,10 @@ use std::{
     fmt,
     io::{self, Write},
 };
+
+fn term_program() -> Option<String> {
+    std::env::var("TERM_PROGRAM").ok()
+}
 fn vte_version() -> Option<usize> {
     std::env::var("VTE_VERSION").ok()?.parse().ok()
 }
@@ -35,9 +39,11 @@ impl Capabilities {
             Ok(t) => Capabilities {
                 // Smulx, VTE: https://unix.stackexchange.com/a/696253/246284
                 // Su (used by kitty): https://sw.kovidgoyal.net/kitty/underlines
+                // WezTerm supports underlines but a lot of distros don't properly install it's terminfo
                 has_extended_underlines: t.extended_cap("Smulx").is_some()
                     || t.extended_cap("Su").is_some()
-                    || vte_version() >= Some(5102),
+                    || vte_version() >= Some(5102)
+                    || matches!(term_program().as_deref(), Some("WezTerm")),
             },
         }
     }

From c38519c57adbbdc36b6cf19359384c89f4f34431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= <matousdzivjak@gmail.com>
Date: Fri, 2 Dec 2022 12:56:36 +0100
Subject: [PATCH 587/884] feat(docs): style readme & add badges (#4970)

Centre Helix title and logo and add badge with latest
release and link to matrix chat.
---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 79873b74..3555b539 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,16 @@
+<div align="center">
+
 <img src="./logo.svg" height="128" alt="Logo"/>
 
 # Helix
 
 [![Build status](https://github.com/helix-editor/helix/actions/workflows/build.yml/badge.svg)](https://github.com/helix-editor/helix/actions)
+[![GitHub Release](https://img.shields.io/github/v/release/helix-editor/helix)](https://github.com/helix-editor/helix/releases/latest)
+[![Documentation](https://shields.io/badge/-documentation-452859)](https://docs.helix-editor.com/)
+[![GitHub contributors](https://img.shields.io/github/contributors/helix-editor/helix)](https://github.com/helix-editor/helix/graphs/contributors)
+[![Matrix Space](https://img.shields.io/matrix/helix-community:matrix.org)](https://matrix.to/#/#helix-community:matrix.org)
+
+</div>
 
 ![Screenshot](./screenshot.png)
 

From 8c2692caf14d49e25b19c4d232b3658abc4f6ec5 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Fri, 2 Dec 2022 07:45:06 -0600
Subject: [PATCH 588/884] Use the logo as the favicon for the docs book (#4971)

---
 book/theme/favicon.png | Bin 5679 -> 42591 bytes
 book/theme/favicon.svg |  23 +----------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/book/theme/favicon.png b/book/theme/favicon.png
index a5b1aa16c4dcb6c872cb5af799bfc9b5552c7b9e..1baa7c517245924ad4ab7011253083ca5b92a4ee 100644
GIT binary patch
literal 42591
zcmZ_0cRbbaA2)tfsEBNeh?KHd96~~6W$%ORlD#*dL{`b(M3E6f#xcw0*n96|uk3w(
z*Zb6GeDC{r|KZ{Bc)R9nkLM*&@!69rm#<xh!C+UUpGqpjVCMs%pNn|lOXRo74)E)e
z%~LIV7>s}v`oZZL_d0>W7+}(p;;JqqtK+UNw7W@D-YGuty0G()7`_GW@B1eCjbA#x
z?(P-Ab^Sp_ghBL=ui*xG=Oi?TvzOJ?R-!$k)cQpYeUWWZ!!+kE89b=t{_EQ`wItVa
zUifGUSF~kTj&_NOZ1%ljyz?c$Qa8Lz?3odwGRpKDgWHw#VnyC<rrOH=3lZzqgR$HX
zZ*<?&JKdM~B?C?hdzi%;VD1*3H==cDU6nDcKTm-JzWVg&UEO~bB*KEx{iHS|&^LB4
zcDIrT8n2i}kS0f%es@V^3$yl8-tyQ<Yk2Ed<)c4;o52rGGbdg&Kgw%e+7ob%f<AwI
zLsd_#Y@wjCy6obyOXXUO{TNAAUq|;e^I4AGw1?P@&gAACh=8#43Wn-QVYfCfgoe(S
z5E`b&t!3yy50^LsHau7RmU30s4zowxZss#Uqa(Lo9~dOX8?u&H&l6OJL!T5!2xb(I
zjoH<*Pend`oxPx^1bt;0$NhCW(MNu4_G_ubq%!;Ok;j(unR}HkW1=Y<RM0mWcX3*C
z#Q}~AB_-`=Xf^0aK0UfuCpUBtYcPkBQb+e@Tca;kj$r4P6U-c24yrAjxr|l6(V+b^
z|3PHN2wdLLyjW+AbG!9C`1<e?XTaNNNp#m?J%4%l+340*Tg%A>X!u7-s`}9HIvPp(
zFU?0wQLWLT3wNOFV#%P-g5e$0f{&lw7P|s{V_C!fWfQcvM6r~;ywwIjQH4H!{J-d^
zfDe6_aTfQeao&kNEz2u;M#K9!1pNiOBSc?JL9gCn3TM{KID!LdEOqa42G9>=<t$x3
zosZ_+B!dnOiNM>D7{#@iduqq-CMGC_sXN$}u^dW>H^i`sjw3@-Za}+5?!7)ZJFL$w
zpP~Mxv$lPB_Z;~65Uk20Ux1IUd1WkcPX?8B!Ut`Jz4K1qNzLq`4FB$UVIg|<Fbg{#
z;&G|2%G&X)?J=oWA+#{W&0|-$w!Eyk?jvTe+P}Xk;`1|)M=OqcDe5J|<5Kvb?~&`T
z54<YSn0E?`*}M&0A+{&=*!>)+>i6k`Nm{*QZb$YB9Asfxg1vE^qD6X|VME->4tC&o
zD#_HlOXmv*-k9r?g^IZ|*5G3IOCy+hGLqi3`h<*oLC2^upy1>_^!>Rw8zfaFOEM!p
zt@>3ylNX_{Yys(23`G1aI$v^@bXHKjW}6An;y$=xdo9Td^}QN2k5L!AB%q<+7<v-Q
zmmiR)tRot&FF{`@C9h@csI1~iy*$2L!w!AXyej(u$v~8(fcVs~dfnVyPuOqr8uSOY
z0OlH&jQ!@pl_eLcWnsXertMKI<8Z_9_!^L$H%d9D1+YgVV7#PTAR=FoGyAJwe@+0q
z69FUL2l%DpHGDKWF5>VVME@VJpH`q>9lrTnU<3$YiiCtW8)?`LUmFD2R$hZfJV_#Z
z!M(8O@?d-8VC@`?ydivO)V&Z{fMKj#!;t3VL6<7%|A(;AIIzoJ(&UDZde$(+?Z_#G
zd9!0dcVcjQ2g1+>L55dA{rDeiHC;L>0V8$o?;j{gccvsb)YaT@GYiwW0PerEShMD!
z@yO9DEC4<^<G~2~*rkP>AZSOFN$v$itznot?wo^x>!5^#%-s?YlnE5*QvF#0Vwhrc
z$odqkbZ5=@)@%0Y>tiq7ehRp%L7aGBEj}!yD?h0XgvWRCA?)Ez&Or71n&z%&R>)g!
z(NyX*RTUl6Q8<7fLPrx(`KQ}~K|5-VQS4*~@)uy_X%h4TyRU0X?SA4Q8P)~Hr%VpT
zygL`KCRX7?GyEsI`gbHCJ9BdX9PF}Ep>Wxl-RT!L&Z`@{?-8W*)*VMGZ>Cm7AX0HB
zDtxz(k|}>y(SOEM69w~mWaKv8Z+ExN!&sU;<GKZ}y;l+1YWDZwZZXPP$cAY9c}ldu
z>rAS(z61NHNX^bpCYP@t5p1y8&HSrMXu;jfuY3FySMM&6(9fT|y=HD4+PiA2j8^Na
zmv}s=Ne7#JW2rdxK<&~;5={RLWe>Fa*11(1LzJR0H~a%)a?@5pFAkuO8hm^{rw#{(
zdvgiT+sd_i`_cwuwMLl=N3fV>$DVF$4lcw<w!0-?a-OL@IBTUke1{90<Nc(Q7`ao6
zw4)h2U6P$ibtW&3PqwBW&Ry8f#(_BHiBFo{o2?-@8QN5IXDfjK)~unfv1y4Sz^w5C
zuW+Sx;FkS)0k-vxg+D~vd4Hpbez1Swu2JJ=|1`|!WZUN|SuUdMR!mK4=yPdWa|Ir%
zvmEr=0R|OK&@piy+T^t9S<-||e{z0yF4dL}A*@*-LwHkPp3?<=5$u6}je{cCNT_i=
zX0CjVy|Vh3jG>^s{AuXEu12Y)vxKN^>*IQBzS9#S`ObXmqsgDFm!RwJtVI;7X6@~V
z@Kg)Y!amT4TOADA4Uf7I63ld!CRMXyJWbC`F`<4_PjRuzu#=H7Bo?gT%rPr)9mX{h
zUq$Er-0kOVQwhTjjwL@4>A`&6Z%*5Bm1)>x3;^TP8Qf$Et<7Z~vc4V>KhE$H{rY@U
z(Jk%dnkI+Sl(+=EGkrZZh`UCw{_#};bTF=KU&nsDi@xsCRLW4j|1<>A74C3+7O6o2
zY0;3o##u;;g6ijdo;-`VAJz|G&u{TBycR2{+-$f=Szm|z>4w_I3|xKfehoUd?f2h?
zI3b@19~Kgen{XP;KIko2i2G~v$uogCD?yRu_T*+(LWm-?EzI0sva&|vX>#>vO6g%-
zV<A?y;fQ5Q+M|FMk+NymE%?V7M0aXZG-#lc90+CJUAjL^j6(6=+17x;sGmhsE!$<e
zGmSWtoWDs`pPahDEXq(Xsb>ORan{=Tkz;a~npuzm_3Xhb7>p3Vm*DIfhh4%ay{nVQ
zWiL6Fa7(G#6N@0-3(8hJyYbs+dXvC>GFzC}^XGU<om?pEC5m<OyxH^lz~z)9fy8Qj
z&dEmcE^Nl&zyf4=N<HJzc)4|D43}A{PBP#t3e){~(0V23FZI8KY}BuVA`f9&*i>1&
z{qb2}8!jjD%Iig3d^G7%=zQZ@uuB6Duq$bpl3wQ>%_Cb~%OoDt5NeeEW!RKv`vy@B
zQ%q^J0dS~pym17k6BE6>ff{sx7B5{yoknt4-={~_xZ!xS!+eao6A8}hw`!@LJQpWd
z=Rk1AbklETLjrxpI;lK9uglu%@SHb4%;yvLBYN)B&0kb{o1N{$YcX3O(trjXlV+bP
zr<;4{f3-Ngbg~PBy_f7Ez&skbuS}4J#<RZS+1IzYE*hvo5AA;7uA-6jcBVH8bwF?q
z=5d3U>O=uqRwZgkFf+ZtBqS|xV6W#1F(FJirA$qOmdPu}Q`B1;=A+QNiYI_d&vgg!
z3&Q5%Sw-LCB0M++>(ZWjj%FDWw|Wo0;6C<`j~{$C&3PHNdCWGLA3-oG%ydiyECPvs
z%qfK!4tD7cT@h0;jjW7n9mqU+Yr%YOI$p2qZ9|k9&&AY9TxrF%jho){4otZK$>k#7
z$GaV#zsfu>dF#Spbyunl+@_g6eP<vlZd|@m=Kp8V{8ErEuhC;xOfEYtlB;(+KU{Vs
zNJ;0a{m;Kl2lXwCOH(=&&O;P%5C*bX@@8bu7aNon<2<~?5nv@azVo_T$pc@Bvbrzv
zN=+Sh>|L=DcJI!ABr)f_PtS9Q3txz;+?@~DrZPDKgv0ed{vv~%Mr(eP;hU|=^h?aU
zSI)Lz9}oE5JvEwf*W$W$iNqG^bH_Re4zoaRz=+mQy40Y4@1A;Mi#`L4Jm1(^lY^>g
z!b9_Fgx=8YV*;;xkWp|wJgMKo(R%f$I6tr{MI@|762?-9=34L`-a0wnnj4oeK>p18
zyrQukf!%z=X^H!|Te9tNAeP&Z%{vUHNc$CW5My^&CrW@|Ce@nn3O(0-|Ak+@*wL60
zX4TQJ$|Kc{`phu$62FP}ymEv3j4_4hU5gpq&Iq=3F`<W-AiGWR*tgKJJifZP`hh*3
zcM?o7*8hf__ae@&YccH&^H1nq{Z568fT&sDM(((aDuq?ImKB<u^G=5;3Wjt{*ndUX
zd_go4%}>5w+<4|DeoFl_3=a~3N2~I>jyHlJ1IbANyDY&Yu*rmEaC1FapH7wIEUR0b
zIK=f*hUnm@Q<@>P8*l0zSEC7Qo<)EA?O3-Q;T{{h^-mVur;WX|p@F!knjsPkWP>j#
z_O9>?h&o^PM#4VmQ+^%y$UyrA&z&m~=%kXY&cuTb8<3n*_T;QXlrI0N=NF(fE@!WC
zp6}2Ar#d&oUuWl=dssz#!|ldQcIp$GO_lS2yZ17rl#1~k`jN6~bfUK}z&^FL?O}+K
z9=WZ@=uMlXc0J7GpMj0!qrK!6LO1kJrOx7Up3i9^r$(c%SE@3grWLDN*1sjD&_d?u
zmlH#(P_A3s;aR&tX=1%TKP;rrZfIYBu6B3joHo&0x4NxINg&XMhL-A_iHfD><f=4=
zOw(w<xDw+l@Xy4M79y<I*)nmtsVXhYz1YRXA;R{+Q-;3W&BE<BU-3KfJOA+eo2y1|
ztLLORbXW;ilj`<s8g|A%Q}Jy@T!1cBCB)yL?%;WaSQ5|YA~oI21+10T*7ZZu-dOgD
zA~5~ciyhbAWJvp=__pftH7L6}o57hH(p=xm*UGCI+BsRnt)wOLtl#ljIx0F0gu=3@
zz0#z0namDOQV=^QDqQekGP}tAbCu|<VhJ~&e9TpXQWBi?)=^@~vP`y?lGic+*%8iE
z5xb4Ab+g~{v*Cw7IsMrJAg1oz1%bhm`OyH-R2l>>Y|5EN#5&oeeA)p;Fi6pE*!=n;
za7L0Ty%k&g|E6k)E3n8D!=Y~5*Kxa;wyhH?v|U-vV)UPFg<k&?t072Wk+*I(-mZ9!
zlJE4E<WRDvK>xkw6QF>I^zgi1tKyorD4d5`-|U1rBZGU-^%5Kfxp5ndLzGGT<jvNY
zx*hoH`(<GFuBQn5v0m^oGy%583i(ssj@yDW$oh`S@1X`3rFlX%J$)tCF;VRFol)l=
z7O-?0-|j#i_R4j7|J<teWG<pEWPk{$bir@SdaeUXr;*w)7KirXYS~=G!AAt4bM)BX
z2MkLeO3o8f`*pyoKbMX3vFnzA-$Fd{dB&1of~?cu=L-=2pqQjyReR|5AXy|V2j9oT
z?848i=t1u)M2LEHAN&tZuKk?oHrksl9}zNXqvnpzx#&}=L+D3shCEXpR*7ENF!_5u
z1I$oXZ%)=T<z5~t8)lpjob&F}bH*HHO|5>TS{JphLLTwO+)7`+gP)f@imEIPM$P`%
zYy+M_^}_DbvLVSIvUOXgd`(v_uF+60Ik}L>274@%_Qfo`_~n!~@4}b4a}FPvKj4x8
zO%2@oBEa8prsYv?PXm(mx)!ebviXj`SlI+z<TymEi%trD)9Xx>(kLfmWP8T;*dvbz
zmS$?TT*DGa;LS*t>=iBgTiou2;F+uyUZ+S$tLEK@y^rbcwvR?wW$5UYy*CN{z1!s?
zXY}Ooc9i*Y1(aLa_v6@nzj4*jkY_=m=mACwNxN>=ZS<R)wbm6GBl}IWd&~$|7%j<f
zAz~Ns7_##%)!fv?5+buXT-NZJib^p*uXas6#l;_A3WV^h&0VKyd#|`@uKpQR2Dzg@
zp^-iFxy@=R;0eRme}u|$zK9`cXON{MU<77>H0oIeS@!muJRudrI_f5hODwwRxHicm
z;Ywu=?wXPZ7~N?2pNozIPgE#ODzkhY5#`gvJ4tXSLC+<B30GKa=J%cf6Zt9{D&|rR
zLA*#IoCZ#$=!3ylJo#uUD?``c_hUTzOms{23xDd!VErs8)Tmu%5iQ-{k>e4;2=P*V
zp6jvu(C`irZOfllGGXpvd1z`P%f|oY%ZOZ`TA=nFcBfexRHAodqD0s%fKq>Oc4)}D
zew0S&Z<|&rk}|}KdB&c5(oaxkhy(11(;<~kvUdVP`5YxbxJ>gTu99Q+9IQN8JTdcX
z$DIt;WsqFkpwC@yI?1i*C>i^x%yCDT?FCp@5k`=f+se%S{NVPzfQhKn3}t!GK`!mv
zHn``vV!GL%@l<V^^HNo^QAM0*GlRxo<zwDug4?(ePDtYR|C5rd5jGb!bX}c|7sk)~
zHa5kL45@5aZUj~ampN5va5?Do+Iayb@qtgQ9b@$&eHzGkoKKx&L*8MKi(%~P<iQS=
z4uxaXI0EvyUXW3kcZeTuw7xONIAXImwJX%FkDqjE*)7F##MC*m89+zrA}#2nUz9nr
z^|wf46ilHmO1UnSq6tMt8UoJ`L>TJpjXP3qQ`J$i2@G|f!)}qU{_;48mTkkV?DoC*
ze^UR;_=G8ba10OX3Vn3&v<{mdv^rl1tIq93nUSu@9UQz@X=(Qo0*196T~TnvlF!AB
z1fAOLHiY2lRxLXl0va9(=wbwyvoiR2`(8PbxlB2GYRT!x$_Ms58p2aU>?734(GK`t
z#%|&j2tGWm5+G0?U8p4clW*g<XwYN?29=D*$9p~cQ^>RHKmR`QX8i@;QRj37M{?Mj
zNsFQQ1)nqxP~pnR6B08ExP5P(uYWxvc;=Dk<D(VCp--m(kXKZ?VI0~|SThe=-k8vH
zHkJ08Sqrl*rv#spbl=~V1_aJup}gh3`LV+vySGl{+0>x(hx0L?N+54pJ-4}iFU*-N
z>c2r$4g;5I+nR_-gj{D$M;q>4q#UhrDs&)F?qglWWHwnOzkRA|es_;!xD$$y%Sh8y
zX&!|XA-uDf{1jT54T*!vfil|I^J(8E^lVdA>2ary50v@kVd$37hK;8vNSGZlD_flR
z?axS2+vh1+fE53Dax1c=CenB2p1(<2xTRvrGmYNT=oqt(sq6s5``&c}Me+gxsPxo`
zhCrZEo0oRB+K_gF9zHkYGUwbiG*-=W$d47?0VdiwN^*0TS19}=%l_xt<iVYNIu)}r
ztb0_2n|$OX3k4kbPp>YJDUrXSPFTInp#WlKJ0+I{6KHXpTLg@qlDE=A#l*NZvOceT
z2lYz(D9M}JT~*sF(wv$sRBuG1Z&6BuQwz$(haVNtUM}ULChL9+>NXCdw(rypCKc^x
z?Z4QhOWx!v991YC`zvA2u&cvP5*))OM74PLk$f@cuhiH8(dolLcRv18hf2oXB&gnp
zG-RazBg&?((*)7iSIxK?p?xNtNsKxsUj&UeJd~46NhE9jU9&4QWK7{RJLZUzomN2e
zY~m4+09*f1l2q(jQhLtP=p3vpR2*!>->}EmkoUex!#j-i&f|yz?gt7)n4&q-Z+=n%
zKzN=DPDrVaR<q;R#8AHuT(lSZA9r}?vGRE1CSQ(lr5+K6)x?)gydJ1}o$;cF5~C?=
zy!k#ijI5hvr=(Kvq_D8|td85LUNbL^dceKUj(ftcRH4{zTE%X26161(uFrK2$}I_#
zcxOIkNIJ~X3p={8s=1$aQR&%IG}y#$_(h<<)wFHZ(y@s^yD(WSj{Brqvm0+Rr+u<W
z%FD3M<?KxS8AYzd<>s8k6!S=z=twJ?4w6o#&siP)@rGv9E`f_I*N=9@Wuwf!J6To)
z|H`@hUg{su3C!{b?+;RMp=*D~=;%m<L`Y1q7h2)zF$(!x3y-I>cKnv=w3&bnkw+mq
zQ&$iM=-Q?^8w?Qv5k%b^cfk=5KrZG!Qt@n(c5|07r<Sw_HRy?i=G+sthp%pNM*E(S
z!uyWd?n8HQ&0dezP>3Lyv4GF58Fw+K8ClpYdKf;k^`Z?O{bFy@u)*dJ#cN1$Iil?(
zHa=($E<@PUr1Y$kyZDs?)DD4*L-u>i+{bZHJyRmIe|lMaCfLAvUpj+I&$9d{Dw=BD
zEbb-{6BY(gwB+UE7m+1$Jx_>~bV#g9%~^UYn4+2XTh0YUFeLCFH4UT?FBCtLr=$Dc
z%-otwD|?3%6To=DcwIqdB-^a*#VM)AP|tI;lOD_4J=_ecor21%K&8oXpc=onRJI(E
z^BQ59q(kM)Rw%A>U_LFC&<|-)D|xy>H@x;m$I2!GK{$%;5^bJ&1Z`xzGt?>;EirCw
zj8APB$nx6hRrV?8ugk}wkdsy`5sWnBAzMJ7yv$grdG0zbN=XSZl=1#f@ou~!=M;jG
zL`pL=Ye|^(%jo3XJ)NQWBF`9Y<fb^1dfiwFdv6k`QtIZn?FsK2-tbfn0k=sLOey0|
z9g>-8$|@@Bp^To(*hKJBweeNi@Df~x_!ubD_S92Nr8gsE#FMa8lDz#8<dX6Q-Z>hA
z-Xu_wTVvz_hLg~DN)@$Iqep~hg_}JEmw`!#^hcGT&=2<mXxAr9e=w&7xIGCS4qY){
ziA-G~92_}OE<uEpj;*PHvQX>RNfjG2#L)vffyptu@C+f1m7wjdE@2q7Wp~pvcYgk)
zzVB_gh?m=S9-N76Z#PW}>DZXCQ{=Lj6LXt-Y~e$WJY%FvZ(3f-ls~FLq6rW$pS<lJ
zc7IkV+%*SFHn{}R;D?g5>en(&m0sC7#Rc9WQYA^K9GAVf-`X0T@*~RWP2K{q>0jl~
z55~jAnBQ*rvN1rL2$o<<hOf@vi|SJa)rPFBy&L{Ij6s?I29zVyRsI6bM8B1w>y#)M
z9}o|gc4(bKmL**tUj0lXDRPyej-5mb*uI=R!N(`+AiVtE%_Fd@Z;U)M>?QD^Bm(?|
z5e93gud$ZLoA>qa+{SK_YF1E!vQmwVRzddMSg62i!SAf4-~}Xa&m~o}I_BOOa>{1z
z5n*RI^Yfp2q{kmwLA^D^%TPP+)kVRdZAadwu4ln^@UhNtalj&<FuKPf(U;uVJkxI!
zrF5&AaYD!IbCNIK2yI%EE$g{~^KU*wG+<qT!0x8nKfbm6GJfV{u_`p+3Pf?qe;O=#
z-&5L_X%Di|e)e(#iw0Q?fZ`AJ0vps*zOe3D!22u>z5zk_PyNn5-E)JC_Kz|w;jY=m
z-Y`zZ&YHM(G~x#D6Zx98R7!0X$dcxSdeur+zAVR0XoSep(?{{f1)4g$q|<)%wsbwK
zU?YXt#1e8d;{mUd%GyiN0Td^4I;MeU{u9EcJLx6?+bPdkIk@vWiR~(O%2Nso)(*M)
zRXg}lu2C6t+C`9YL<%{)ySumY!p_qrk2X3%u5+?&<{?C~w2z%ny>&Hug69+mJD<x+
zk~l)C_oe>o+c&)T>J2NbuEkA6pp{*c;s})Oo{Kj3U}rHhH7?7HqRVGa5E@CP*faf8
zW9f3tn4*%n*{GE#rnVP}K6KZj3;^C$vCpa+iM}Q8m=_&9gNhFq{b2)kE0)*jiB>;b
z#`Saaq!luYZNuHyMA`_;o-1Gg+1^8GCA9?$d3g<U-~ge+@w*(f*&huYfrJ;gh}vr0
zv810)we@FNFxm&&Lq;1kuNp4(>oMY&`%Fg%Fq)^V9!fs&j57Ex2l_%OAk-~HU_csW
z-|+z&zxnfnae!@<jCnSYmp)Z@VywJC@h;zv$ACx0JU^rW$e%`bSG^Mauv=_OZ`{7E
z9O1z1nMAv&T<8m_v(k9Hp#Y1_sK(=CAv3Ghnr4T(l;)ddDN@)OHWzlbG&=hG93p6!
z?{fnMC2zsCUG$i_#%?;PsIonBm+36e0E&92lB`^(g(zW=<Nv{(shrdTYD*eKj>0rH
zfaeqaMtk;uCtt+-j;lB~Z{M~*<3mzcKS%!b^7qD0vt{Azl<PBEV&(5Y+fDuX9uOhz
z<wKRkW03rXPlHNG+hL5B)xkFe;iTc>9Y{STGqG-}ZY&f?z}bYxFz*y;_pdKQ$r<0(
zI%B(!(lhfk8lyKK@KSY@RN4^KiIPAXO3iHgxjH**k5=n9&2Zu({`4LXHS-mM@B4pY
z9{-CzPOppO?U*>8C-!UsSB)Ig*X-b3|5X9ZJ-&&*u>g=dfFyfS$i9Aq`ZD*=wmsdu
z_@nwd$rz6FzqchPOi}=Ril<%Fi}W4$f^5U>J6(nyYrkCPCp{+|UsO{)yI-}b*Gu5U
zGeia%tgVNTBj97^*CldVp|%KQsTCp%%2ieUD!6U5am@)|KTOu(6WT9<dNB}$1~69^
zN_&nT)rC8DnJZ>MwO=Hs#ESmgl>2X%$Kd|KAQ_UP4^6<GeYu;fvB-VQEnhro0DJ>W
zIKfO_IrFRDZFNgjGmaCn!~=+KAAN3-W=UV_N2(J!-5nOkLof;rWXJQQy>yLvp*Pqx
z^$e@P#{Fpag<FOtx8GK>`EroZ^;h`wTc%BK3<kT#SrV>7;iQkDa=K6i`iFC<g|IIt
ziRZjwCOmDuq}XuXT7UqxOEZAIO+zy%3CJ+>s}cDqESbA;`f`z+dhs`!b05<v#9lw9
z>A{Xlf2bt%te;}R4NjQXNACUs1gP29c+-{&IJzsN?ftRag?|Pic~tO>oUY@2UIwzL
z#U^Po%QP>ow_K~aglK38EQID$wq*=hTO7%<Zu}f17&GrPbt=`{JY9>piV}HmwdRaH
z_vWE$Gk$~v3yB9sD@pm{FH15<xbO$-Mn1Ri&Di_fs|RW+Ak$n$76=2kc)b;R2$tiX
z!C;>_Zj>tItM&@C+$_{>Jd{i`6f)DSQRWjZRBC&*VFJ6;y5SU;r{Au64%U1fs_w;y
zYk$mgqW9%j;!fm6+##%Z63bC1poEhsPW!<-$2Nlm_Ar?QD~<96^kEY7I)o#Vxaw_`
z{OT34r-)Ln3PH1{st@V8$0Hql6XHN`+I49@LFX9|40Byuy=aLAFFfnClYF;<d)(WX
zH29otIzD8=sOkqzyc;fnGrS6vTxOHE%|K1t)14PoN>1kes&n@m{RqQ+?nL7UdDV|`
zc_}>hXDQsSFxX`yrLUT{1sNGJ%?5pD40l>1_@4B!d+N677MQ#!Gj6_pZz>$QsUI=C
zDaLCHhWmrgb9|4JA7}vfsvgtfIix)hG#hF$e5!g&UwK=Fsbbe7;|lEIbX7v^Q+ZHl
zEG}REY>ZDc6!>^^_A{?WU>qiqqJ8CvIx{fni#X~^_%Dk+$qYi+!=Kq4orz5N>blV;
zHg~SgH>s<Z2KuMuQEl@8*4?W;0xiGi0D(a6cdtM0>)j=j`1pyR3<~77QSURWEOTSG
zN84-LwrrKt(jIs(`dJp%JWm6I-$BVu&b`r$*1z`d>N@TLrIfPi=t3}=iY1WEKfa+O
zt~z%rTQrElmm>qd$R5R>pPa$kv1|83H|y>mgRf{e;GacXKwQl#Y5OY>h^d~V<10FQ
z#MJA~qjCZE@kN7SesYZBsA-FVGr@VWZjxkPx$l8TCUmt=ttm24Q*x@;4#(A<ZO9_d
z!#>{1G#^bbk3Y-G8?yceyXq-ptJBBfCEsQ_%*NJ1LmD+Q%YGIL_0MnP!5+3?4Jj}+
zH;VK>)NOiEo=YRni7S$6b87|UgH94e&skh)6V^?V*!mq{QQ)8j<MznWDqO-=I2b4D
z1YTDjmG*1;ouQsPrv#7EQVI8xzjyl^F!JS5$j%@-txQp6O_UP%UOy0fXuYkLS3fx0
z5eFM_grEiZ+rh>giZQ;OFV&*Wymdpzpg4HA(~+Pk80aMV>bFWosz)Ivw_&g;k^h94
zg&CiTzdcptRu_2{6?^!GHC`BqvLyY^cl54Turz>OD16NB7<OZ$i>Y(CLx4-s4zC*l
z=S;m~II(O=SSPvD?ZjO5apJ1sIWiawmU2_6U}olxIcImj!;jbExC!$C<>~psNY;{z
zz3AD`k~{8Z#8p#ErUEAt>qjscEl%D4gp`y-_cEK*`SMAMQr0NvA5%&&9@Q`0Ai7oc
zkoOIB6CFM1+PMmFhsA$pU0QMImu?{{^ib4G;k9TDh{N<T$Lntx!EUE@vUo&VbAa-;
zVBbAU{qBC%Pk9*v1p$f^A|+|%@_Y}z=}}wi(0Bwc7TKQ?u~J3an&HD3&Z%Yd!c&J(
zq}f%z4R0P-$vo*BF9D{=WV@@YX-ZZyW$*@&eaKJQJ^{lS{kwU@L(}v7jP`iTmsd@c
zQkCFlFTPS1rTlt>3~N%q+D)?03HliHHURSToVxE%!1$DCWvx&=n(`VL(w9#zFSbG6
zzE(w8A?d(3sXb!lMC_4LApn|kY?L~l$$3LX=*?<BTz~(yL<6;i%$j@&Y9e6g7Bjcm
zIs4ub*`9N@guxy^1?Aj0+By1xz8xJlK5{KcNG+)B^~P?saR4dp?w$wDqMwgGeOh2!
z?*mr%+uw$i`xqBKwqf=&bymns(78BvmlfD}i1|%@IK!Cx0(<)Pbk|@$N|6V)z&J_E
z$4HzBQPK%5+xt7RO3l_?Z>Z!4nx1B~{&5Kp)0enb5m^BMZmx`wLp17OgzxMZ9ds=K
z1rtm=OLnY%x_=R60z93ORhPr5x4dZ`rY(sY=JUXax=~R6Wz{2%)h362*955m(SPi!
z0Cd}fN%&6fodf|~OrS6qSbr5Vtl6q6gROoH%)-rvk`ij2+RUb+VHE9jo`fZm<Uivi
zFiK3L&X=4)fAjL2Y$3B(=H<#Ns~nV{NzVjdw##&H)(8Z+=9F;vfxsn(U_#n$x{9FO
z*(*sH0ETc`fCL)?=tf4)vmdppkAhR@1CE6Cs2X#0-k^cKVhsB1rR593L)P<v!Q%QO
zz(~Od%rOmBY>HB6LqYTWhI>VD1FN|L3Q2OUwHCytFaDd@W?c%H52F%5%xGzh<n^lE
zVV?CcEJ(siFRDUvTL^GV$+(JlCq&{?(LQFH<1*}FSPx1cuA$N^Z<jSxZ>V;G{!XqH
z*%jiiRF6m1{k0f_zS$(9@dRk9s_xh?0P}VM<Uz*Z?5r^%No?A<n(0jD);g^7)wOU5
z#vl%mVIgTbc<%3bCJ8gcV9XhnAX9*ZSoL_&ZpkI4A?INS&9$6{)h{9jR#S;LNu&m>
zhRHy0T*bd5&;Bh~|4qZ}-cpqL(QTy1cNCsh?N(9tQOFCo&nkSS`#fzR^CYe!9$_oR
zy!A*Vhrv$XLseb={$!>VgPW*N_WptQm1@39P%q`yI?%ibWXV2BTskWDAH^`Q`v9w?
z5>Qay<Alr@3T;Nuu~U9mVzUY!!Cf=#2u^r2+yLERIWe_H*9mjdKFT?r44`!Ho4XF7
znBb-PkreXls+qy{=_d6yNEoJr=83T6oRmAtLmzgc(3|%@rJI~{7J|WS`bY!&wBl#v
zVq{T5l%*tsW}2nSd}kJ)VoUuYOR43XLG@in3-kCBlVFtabr?+0svy=rEN>{-k$<hI
z`AQvJqMgK1b}$ICY7s!!l~j>G)sfU4I+5dEqRv1EuHLQVYJ4fPLIH9xIh8eM%~eJg
z)8K14x@}&0I<ZM?&?eULd6*)oyu7XlfN+}3f5JQtK@jFqRvDcLzEpY4$G$-dxn5I1
zD|`QAIe{14Ra5SdpEO+>D*$M-fGiGc_#KiWe&njL*1`Lk+0Xxp`idmUO_H`nYHAnP
z&(1lszyKB|Th$C$`<R#JZukUK3yHjyzzrV*H#`HeT8(2dikZqym}BZafH`hGf)Z!7
zC`%PI<4$B=#(v?|Gpm0BL01c05~&jEY9oNcY1i@&x@ySg%m@SB2=eq<RbAV>7};(a
z09%wjOEfTg%qKFy96x9W5-3I;LgHp`9r;1bnXZ;CqcZ?Le%Qy>XO$AOaysV2!KKsW
z`#4vw`d396fJDT@!q3drp#Q{Tk_y=iT+!?Q1dMEfXf7ZhDV4Y9tG{b$YGJwUr_NE<
zyYt%G&I|`=axNs_e==bXrQ_he#OXve!vU2%u0bfDV|-P*s$mB|aT>PcP8J4mWR`1?
zOHPlkmgZ1dD@=o@X!d^~k*`@KZ_nSwO7{ZcsXA&mzpCns8L9JCfUW$V-9JFU-=GI#
zM}4J4UO6a+cql8`oy5zhTN7{Z4?%Z-OErR=J`6RWgX`R3BVG}^U3=TW$rd_;`=HH_
zt=i*x>j|$*`v7aG82)$GJ3z63egrCV|KpdH&>LYGQ4z7x{Ur2jXnmNGYCl{!RgfF`
z#&I6qB>hSwsPXOnAlFxrArAu}%80frW8cbZFy!kHdbQ>bWZmTDIm2Y*Qm7!?R-XQ<
zVT?lO%@WqOeYFC%jn2c5RSd|N85bdUp0c!jKgF@Myz~Z56q@V*l45P-R4OFJd3#{>
zCpW|X6GA>&EufI6;oeRuOgr2ag{;+bg7kiicM2#j-jfKpgqQ|QdavZ@I!}u%TPj@r
z=9Tyz_~#Rcs@Ry}MlM;&Fo=xax;#`9<z1t;cp45s1Ooo8^t^u>QwQAi1aQ-*Yo-QR
za^8z0D2cOrPNTPhi}(qa_ZR<1jt%!C^Mu?(o#9`()j?e3Qajdc#2Ua-=%kg0$wUK8
zC=)10kAYj%tw!tUiO6dtuAsw9f#3M~Nz`m8mW0=P_-{FO?>fafw9e@lv5|j}AQHyP
z4~TU!_)m=oxnl`W`^VPpVa;^mGv4c&1ovxfZ)=!>ODJW4#An(3=!>0}$1GV)T^YN%
z_f~xDagV8i35e_@yN%1e0C3#A?598(DL|yoh5g58Bgxk>Q-4eH3%yRrFy8YnMIR~f
znUyNgxH++EJO_I`pa4bVJE{vA*^O#z?})9*w@2J*AVWeFuh(UYJQd?}b61!TA^<wL
zunfW)t?}tyyAL|>9YP*FZN{K9*Bp1LSuv{zn&aPiq7>I&&HOSuWCXZb9}l%ZWlPXQ
zkEEU7<LLqw3V!DukcgG1xpia{ckqL%?fV<DVtKzo7D|+WsIDd;(~kBX;~6G`mY*Yd
zQSQOLklvo=)cxvFsAp>_6RT5xo*=fgg9rqidmPtYu|kU?aD=y+K+Yn3>>+R*P$cna
zFp0^t+Wbr2p9ZE09teL80+W-a2QvP8)sFaZ?WpIXKeWm0=ltEEj1+5fwO!Uw2kw&>
z|AXy9WI+NFceB0>cj5<yI){fGk^Kf2xXms4JL6rPrebS>*Nk=x*!*iI|Ltf3cksL{
zx{d>5h@|GYU-iT6BXe4F2TgUQRv(8J>rNS2gWW;5n*+0Dy>)Tt!et`h4Eha+w&%4n
zu0JcSw4pl>3XFS0L2dWDH>cdfGR=eCxKB1mpHa9go>e>!9v0~9t8}`Im2@LrLSdn2
zTt#OoTFIC+1kpY(bhHJ+!M&i2C&E%{5~f3xbqb6BgZ<KQ0Ssbdt{*biut6>zhBh0l
zvt!9U`#GsP_B6pt$*9=-$cWXy21nj@Js7HS4gvY{AYv`uegto3=c@V``WGmJX%Xt`
zgM3n|k6o8_N5<?sW!+?FFGYoEW5@ufEgE><1Chs0$4dYbe2c2i3Ep*urw@BJ4QsM@
zm~Y~${a@Q+8a6-C^+h`9JhD6%cXgdNhV0MBxv2lG;A0P$I9)CZ%tTR|`Fyqqg3!C>
zchfWJuD?OZYzGh?8D;yD4P{m;Q5LGYB*O2Y1P`zC;$AqkQWEx7?WDP(6GZn1n_dP|
zZ=dk6G4kYB^RMGFsH{u@f1cW%H~3r{bW|}I_-3Ab!0_PL-zA+0VIVs!+K;a$n!BD3
zq71B<LBz?@WA9IFc~z~LmB5qxq<NdH7vK2r0;l9U1Gt3?<$ueSSn0I)Upa30s_&ZC
zsHw{rJl!N)qjtSC#XO|cvx)1%0>HFAG)Mr2*9hd)4OS{ENNS#T&^R3$cE~13t)&gV
zxltPI0zdgSQbyL+vv!<7mL)dT0U+g<--Gh~`z73X+WB&7pat;@G}X=>n^+|X*CZ6v
zc5J(mnDFh?uYd2g6o6~2^MTsf2D6*nZLI{nJbrsG86pRK8grmNp%K*stnpqGce9r@
z0PN+Uo3s#qX<=$cNVxPfhe%x+D7CIXfF=_ry?eP%TUKl5+w>K&c^?wkt-NV}FYe<d
zLoqX#o%R9Cg6|WeE>Dsov^A@?I*|l8FrP|;zcC_jkzNo}jk(*73_DQZa^b~~@*OlU
zi<wAQ7X73|U0V|=9ULa^%rD`bh9Zr}?;z;N(oruvC!z`X&M=V@#v+iVmFeBe9?`rY
z_62SyT`9{ExZnA`Vf@|Rj~SsRu58`~o40^EO!I$gny794NYpfT<GIA?5k2nhn5499
z?z$~!^7b5|9gZ}YhhPPPVPEHgQQhE`)f(QA_he;8;Na6tzm)~;Ppo6LNr}C!ZO=3P
zwln$C%z_cW8%EQ@BiVDWOw~qbsx#_jXB7AErxUYTe#2Ob%OA;Df#8k7PJQ8r20Le>
zQMouVw7~Yz<v-ekPMrQFcBh*%*jx+&p1>qOK2B<I-19X}Kb2oM1|e_Re-Qw*i+EU0
z+56{|1~z&RF_41%DkNJgo_#$Na}e$VdV#*<rDYttHQz+-@tna63Y)&xzk2|4UQiDJ
z(v22)oujAWe2uZx?pHN7$GXjs`uXhC&=@Zd>60lBLkYLjnfSiRNC-8R1k4j{*rA@_
z@J_9}Jm*jgpubWQZz2d!l!R04{p+-J$0&neiMfhHGe1>Xzf3yK4<^mR)Y1_HtC2l-
zw25H7&ZnhU76@65mMd?<Chje7Xx(v0viE1|9;;6+dYgj0MO6H?+iRsndx1j&h4?`S
z0w<5DJz%ag7WB>LUq{j|68$kBgBE1(faV2`M6p>hY08gL61*Z#5jm*@p#1H?QOd#3
zIfMXjv<_;Akz5i1w$UpJ{8gLM@U}GrNS{QXl~)74McpwE>1VU}bigq){$!J5=6HP2
zm>!{RosWq9mQMnD&g&n*{1Lk$w7!MwnWbGU0i;;r4c|~8X&zxSr>eTWBPctPnJo47
zd&5jQlm1n)lcASx8*95u`nO)GpW&}Zg84p&I?hR!Nb&T46%()4rX<M!SV)rbrxEK`
zdgsyO-p-Ze$9FW9tp(V!-FNxc6G6f_E9^f$bE}si|GxcCl-)<+ABsTcAC$}#>viu0
zKU3=eU~m^z6wjx_mMc~Q-o}I`O(<Do8nb2O(NI2EaMjSFkhN@V>m)@7Ic148pSpEd
zP7U{X;Yz)g{w8etHD7O=2K(_hRWo?a$yyv)<;ZGWdkiuLRU8=0a|mh8#)-J~M@#1m
zD5_&C41+T(JafBPT`i=zz1w!2J8s{HyT{xga=yiXj2hDg^SGec#kA)N3Sj@<L#%eU
zkTOkp;bK$uRMocQn__(W=uC(Ito~JE@3}s>i<!h|4ItI&llAZ5#y%kTjcq&ZoijXm
zjmA6vV=nXe1LHu}yDQg0L#e$RRidd()&AOLk?D(kNm<U%vr@nQ+{yVo0@%YFI<ecF
zMPr)=pmEUv8HhyQ)m5q@?_PHEuTH5=nkAPDmM?bP^y&$BarOl!Y3)Q{y&A+!G)A&6
z$#Dc`0Fvehj-2Ld;m0{&VnyQUT*cw=&fecIS<UkRWy+{aO6=(>KXN8*xm;s^2M@+T
z%=RBx&i|p5V+`5ma5GJ|cG)3AEu-(?SyT1&cN54Gtha*N%7C!{BRQ@jPmNabb(&$l
z-`>sONlNVQXV&b6uZCIo3g;K!QX-qdd%n(FLN(@jC72Jwz-BX9{0Wax1kQg#khQIb
z#F+bmBU1T*!kRTLsznWSyLCkjH_n_?+&A+YcYM_uch#^Zo%#y@@t+!P7F{n~&u&AT
z&b#{m#nq!Dbt<wV`Dh{0fLlO?BS7}8t@wkT#QMkXDTqhyl8pR;6~Knn&HewVBK;l9
z4GO3_1p+6nk1`)`BN-+{+rYCxXMqgg(G?3ns7j?&W5iM~h}!)UuXpen1cLu(=)@mP
zMli$09=ONalHKQw1Qpe*{aCG=KVgnuz=v$rIJ~a?Z6{5mR;)~JBMIW_hIJwShLzl;
zh!}VZgZy+JW<xt~J>*uhgl7wHbA%#IzD{1kH`5jryZg=ok`$r2ENI>U=a8<~f_)<I
zmgq|R(^-*4U>e&7wUcv-F?b1N%Hg5~d>}RC1MU5xcn}*r`7>wr)ikJ<HY8nPg5G*4
z^)65ilmaCqhW!X5#VXl@B|j*D!YbKn;`DC?Yf|s}CWim3x4g7v!rNKb4clNI+r)t#
z&_X37ktJLLG}j>H$htie`>5<SEJz$n^C{ezLvue8Cuo=io5(YP2ZZ|^GuaLNmfkJ8
zpr)x{fQ7i87iclaOM*nzTo0>UpsBG$R+MdNi)jnfzq(;rNIWtAp#%it3dX?sO)>oq
zrmWn=MP1qZJ3QRQR_yzEH3}|v-%%$kYN(A5(<c&hp(^;P#g4($_(MhA{eQqfT>E%`
zoL&cT@dD#%jpk;T(mKDU_E5?$KeiTs;6PcBYFPs6%RD3?5{n0zpw3p@qB*WoNUIoI
zcKyOe7?(HPbZ_x>(DW<_=#)0-UinnYaKmj?%J<ZoAV;UB9k@CcY3ND9*Y!;|cw27d
z|HO-B;<wB-3J<zS%+!a0k5$sUdVNh`Bh!&o?jnfg{su|>C))r)u<%j+*E_mOB5&>e
z9d;Iosrp0K?F9Qy<t1d(>@_|uC$<B_!*Xf6%BGNZE*khJU+AoGvmtaaoYRuBI9PAi
z)!#v`y~onltZos!Ev@<5s8^cVah4)S2-*s!JL^JEIQ+_K=L@mX<~HH)0MdQnlI}v{
zO*);x)FvHOI<I{WddhnDYir}q1Hz7SL||s*;!>Qk<+ZW_fQN&3(HUoA{nC+k{)?l-
z$4Y7-S-ZDt&3QW1B=@$u+aaUM!N7B#FykWZ;jc=dO#fFRvT@C7k*X+VPx4(sJldb}
zrCt<!G(WoY^}$3%K$c&B7N!wA2xWPX{)Va<ayVtSi`~Xr*9NW?a8GN>V%dSqA{|ZA
zcjK40SI6s!J8s?|Ih9>bq>&?s`PAwWx=%bn+4;uO&I>`)3Y*l8O9K7z2ZJTmuFGDL
z(zdUq+`kWA8-Q1|YZXN|MIu_xfhP<9C!pweD4VxNAs^}#l<iN5B9ziIN@ur1)j1Q3
z*-_dSq<&9qjReP}eH0?^gd3BPj0vEfpD_IGvPYJJhijHVA59o2$n@d7@}av4Hq<)N
zy}DubJw<LgH-^^&1j4VQMqN{B=O|<Ky0F^yprrP<cF7K2t^%6P=h5CzEMm=N9aC4=
zDIu4yry6rcFGmYPQ`3I|<T2;R86-f2X4he}d%ydD_`0Op6=+}YuTrAk-*=cMjmsTv
z<&V6fKHHYE>up|Jy^a)9@P-2*r;PqwbcKu;182=P%`<dOHORkj6)aW!HibWSpTIDp
zNQI+Ni0mQ=q9OGHcs5@<?lCB+>IOcG%0796vUnTh_e?5LCnB=*hse6nlCLcj_8Pt_
zo#ap_vPFIxY044%(rwxlvf{S{u0D3l$*eI;>T(3S)$DoqomNyz==X!ZC%Sy;#ACg&
z$qjtxVAPKPkNhQ(_cMvdg3Y4qTRS*H{ULZVvCj|3-+1|bfh!6G-twUCg~i<=Fn3Yg
z`;c`7nXm37rzxhD4AlB4DX(>BPr4^IRLT2+_bF~fh7lqz`YLW5y_aCmRonJ!TR^?w
z_UKQ@C$stMR>yAlm?~8)@~1XwslS-3`Cw`wKb;6ac>}-;x)28PM>CI*d#AJ$K1gQ%
z)hj{Zr99~v!(JF^r7F2bHiVDV$*SMvc>9*JKGhpQ;9*S6-MzdmBYZZwaoZ{&U~2w1
zU>aax^ZFYL@F#czjhI88YfRib9}a7E39<8!->2Se!~!!Qcple25!T-QPHEy2Ghgb}
zr9Jwj?3vE)rL0p%e;0aS5F%)=f{}_|;rx@~Kc%eu$~j;8C&`xqZOBjCQhXAj-^#ue
z2vS0@{~wz*um0a@KB%z1t8J1tDRKmHows#dd<%f;{4jHS7!cT!DAxY_QANsc8&y`K
zz;{|GtI7{brjNfgrgElcv95Ba8bHUQ{SO?;-kKY5Omgl1YVNBQ%3R(2rbJJ+dwkbI
z^J4XNU5Km9pb6J<?5A>~sXDmFKfW~pCh#s5?FUQ=C_SH66wcIxSNm1U@{_ml_nd|q
zf(hQ$!|Plx>5TO&o&?_n-~$HIKS@4>Po|ywot=#R0PkdXp^~gOraU4x>?k`=&>jt&
ztRt1EbL_BDCrROjo+U`;J&1^V;q(@Yga)G*YOrNdHvco9ID&PaN}DY+eZP85-Io;z
zmDMM64>6RoSAGp$hUmx=$B8e{OR&LT_52RRsEC>;XU98WKj&xy?z5-)PoRhN0j#;+
z8CgqIXq%c8+_!>e(90F-n=QN3NOg`EJR;t_b!-5~)%B!zkk9P&y1Cwp7#g5V{%*31
zd()wa=;YP7b=u^IK-}7+hZU43ZOuE$Y%#SfZHN!yz5s;+RB%zZ&Z?JSIRcJBDe2~u
zQm}Fi80~@X&@r3Xj_U%UnR!WBRWrTLPq2T06*swIBKk<hM4?68iW7T+>s#epUA2kc
z!`~1Ugxt?mM)E!c&lts<*VOSy(hHkWmo}tn>x`kWk5B|_adJ>KnjC(mE#e%{V*yI6
zI?f^GWZxA$zT?pb5b1qKw*Qt_wL&s)n-UbYQttB=UW8t{yl=+B_{)7|;PsA>Y^W{}
z$`9(twE35E>^LQI_Y4+8|MdXiX-u@DZ*|ZVUck<pqpJgNP0>dH?gvsn(3t>_ri;dY
zd>>oWzrMDDh+38#h}_|km*05)@?O$4R?C7n_RxDGA0`Ch74AHw{nTan4-r%J>r%*v
zr2VIwI^=<zj{<3?zS{78H4Y+$rR<^@+-#Se;88<^D+_-}4#EAG{Kdk25n@=1;h?s4
za@YTQH8Z>#c<6Rofd-J+UH~;gKK%+oP5iQ5vfmG<AzLY(K?xsVX>8sAP|i-GN%<M{
zh>08OK{>Xf6}6xT!G3lkApmX52~fA;!3~trIknyv4Hn~+vMZB1c33#q@ShMWB6ykr
z6H_G|`u<ZTnb$^?r-IKdHtCDg)ttx;etZ8m_x8j(8*2u8gQq{rbQ-5{1B@OPTC^m5
z&W_fN)-L(k==1G!_Wd{PHzjG#8zj`<zW8-L?;f&XPU^9;vut#Eu`0@x`}wzm-LWUq
zrv4Ys73!K7f8JO~+~}U<P0jHVa~9D((_B^o6>__*NU?Y~#o%-fy1c=r#Kdy?Idtsx
zt-{=W%@Tiozisvc(?I5Im&8bLb1tsajqBS@ZYklx)A)o%l5;)5>%<2}9rnyhW`)fk
z?fsj~*T<Ucap41wuG?SR?UoKA8(6n>!e0eO1+yvroc#<j@vm+nw;HvP5uMf0eJ8Fq
z(lA-NyYId%%V?`;X@6dc409T9YcK9-?kq4v;eP&$na#eF#{4jvWuce?I~$pwwZBt1
zG@)e|@M_T;p9Ux_Qu)=r^-y?lv1X?$)2UFrbLe3bE_{9&7p^WKt2Lj<t4gJ5NcWrl
z=T90H11_a^ufLjO*bfq0r#1e_%osyiS9RuM-QT+B855e9lTDovqwC!8+G6D;@}oy{
z_<aY8w$l33M68t|9BXyiFiHP4(c0s(tP2#@ZYgnE97%hY$~Lk6$^2$x=)lSfopWE}
zcZQ~FZq89JBk>Z~SU>iv1wzzst05R<ePvX6@`J2FnAk)GWFryTnC_jU!htH@ft{Vi
z)~LNsJG<3<bUUv-dZwps>wXz~qFEsNFxsW;Lz6V*V9pnEgb5<~*2k1b;xF%GUR;2v
zprlnPa8qYpVYSMKb&U#DQ@R%psGyB(7G$&kbM`d>|3@L)O^G=&vsIlagLNb5{8{^_
zxmkCP^n>f7oM3~7@*xQ+bk+B)lXp*E)2<jr3sZH_%xlk7H$-R7B|<j(xzBm&V0-D8
zIYk5X&dQJ&$Q1P5^se0B1r)){E%<dI@B5QOOGB@Nxk`)e=t^2)HsRVd=N<Ow;8gE0
z=7HZ@#KpxLaa^N565kqChv0?IuWA2s4C(B6lEe!jw<*lSj+4!(OH^odth?qBo>zy>
zus$##i4b58Z|j{wf?yWkg!?B1(c}l;F$1h1bGYjMdi5(W7}-<)%HX}HmRE^dSc*|q
z9qGY7YrJ(}u`K#g?Qa>x0W}RR+2x=@myKS#562%M9+=mN%|Dn8-PgN2=jb22#&9~D
ztj>GWI@wiz;=u~KlJ=O4vKC|YGLKmuw0$6Du*n&jIDIcR;GRM|=LQ<4&FNI*`(l4x
z-6~zHx+`!EG-)i|*s54vj$T{1M<YV68GC+m<wo#zlCn~2&yaw-KsPzy?CAD1J1}xL
zL*2~#3%Fy1h#9p!`m4G3hDF|Y38RTh%gI($Nf0`%kNcXwjuH@rx0f}mAspa&!;9Pn
zU;B|A^c&-=q3NO~vCNDD_uj#)(hK?|atyO%kv*pVV-;)Cb}!w`#or(Pe4$B1u%I(@
z#vGkFW2+2#z8{g272XUnwO8z7-JvQxV%cXE8NOKEa=NiRE0dr#-|<ck@xe$pMxb+q
zEhbap$&6vytwB;&Dy_8Fe<V?5U^!8rQh}o7W}YuZ#^t9kAE+&a?#lI+mp_}9Nf=(Q
zD&1Q>aUDP)71ypwFAx@c$VP6DU>)y|7ySHW>h;QlsGC+OeJ{S(snG#rEc2oJ90-~<
z(HPdX&2UJUffR`%pYIYb*!wS^ll{tifO?IEQs)ndl|?nU1)~`T+d=Ox50oy2kByHY
zEw+!M>!=^9TrFqaDqPc_M-S11&<1)}@n*ZJB9AS2U$ir{>uQ)VJf*pY^H4`w!#$_L
zC9jaF?r+Ui;s~;4Yraoxwq;o6lFWQUz+RC2+X?-(g83@|NV<PdnGtY#VFbHTdo`Eu
zEVuPtQ~6>WMHdI@E_*Zg0%voHHjgDY0(21mtGiE1X-kTeR7VEfOU2f|V*w#z&qhY|
zM&gxGdplkctgDM3ysg)m58(qNm9)H3mlg=4aHCzGXCWAWTVb0>fnCWNV|X+A$SCWU
zFFOgH*+xub;vJ1rp@_2b_rT-y)t4O(Pv>mSYjtuq7l_^nLfb%c%UL4HjE%CU7TGPA
zMRbWA{7yNuOaX+{h$C9)7RE}udl?}hKpNNF?-+@xGy1Orhv(V*rw9KrV5Tdife|Qe
zcdC}u4hTs)o9SvYhSYfVN;sI6Rg~3wJ=&V1nVSOnV~wV*Nji9&?H5CS?sE{L(F*4(
zB`RK%M{jE0C82wwyLC;uMCh!e0ipKGgmQi;1}J-!U8?(FJNny;YUTmJGsxd2zM<A3
z-9X9{Im<&YJNk+<MDM-(az9!!spXNLLRqFE10<(y31)gl3{7rQ9M1TmX55JXdL7_7
zY);hc-MwzTtzaiCmvo2>o;ElXP`zev#St1rhK!%l{8v+VfTlhvqUMM<3#1@m|Mm1H
z3VONZ!>V4gc1jPL_l}t37VJwN^Lv)^=og?(FfDUgU~ZDE`nmY~V!3GQX1D}BXzGBY
zk2&gNIHOC}+1I=ugc!sG;A!Spnm#~WQ}9g5VHvyAIBznjdo$+87s|O<dXH{9O|D7O
zea-?&ia)a}@q-J_O8P9k$6lIDF{j};{Ghi_UJ)}J!dMA&q*2SAE|5{pX%4n9|KdlI
zd$qzPptmXF>ZB{DPk=d=^4DWL3Ob?}%Z~}34rv&5e}-NTbZEtB9VEVXHMLq|%t=qQ
z_lMBDz7oL>Ny?NPx*TssZ?H3`aUPSzt9!R;X#?Hvj3QeyZF?s-_7QCK)4PcFM9c&S
z!b(%$YH08HN}&Wzs2LSLD^uymFsUQBxyg6Vxrfspr0}SM_jB~vBSlsft$1?;XC#|I
zV7WneMGpT2nc0qFZTa>Kd9hDRo4#94@_48h(C!Iqx<Fx4&&NeevtNaj3lew+j7O{R
zx}Mmg9JUc*Gpu`1W?T!N?wMLDH|z{Q@8wIobFArvoyCyP?buM5xqa^c<LW8{s@#?~
z26ChnkuC)(=`H~kuxRO)O*d@1QFPNK-2xKQA>Gm)64KJr-Lb#*ZuQ=CzyEKnn3?s=
z%rmo^*a6>IqX~D6({pbctKt>)6nCECQ>7H=Ao5KeUd1!~C~|0E+^-#u7TBz8rj72=
zQF}6%)-z9^F;$Xlk0Hm&@<U&gKMr$`CI7{=@CJ$7g#(1(aU9F|)PY4MxrjEY9y=ZB
z;tVn6$6Do)rSqKo&EomNFUm3VHp!~)uyQKe-jamgXt=FbTy4}_9HsbfHpW<SbUj39
zOnsu-$VN%LDzEESaxPJ9IkAY4dDbBwAt^MZ`*7)?m`|nrw6sM-csKM@<<+v8H*=Xb
ztn1nc@K!QRV49C{bPSGjmltm%IRdazzv!A7xL|9M7Use35Kr5bIHEe$yC^7KseNtT
zdt2;NapB<|F^<vB*(u$(P&H2bZFH+lcyuZM8F7r?vmTg}>LpHO*+#7z&|kltdxIA4
zVHZ4F9JY)7)7_{Vsn93f_ghT{wDTTBt?F6RkrLF)kg^2{1SmhN?pwt4wR6?X5n%jT
zV#V!tNQQt>8k(T~!hRxDov%6l(Z#PZ)>xlD`rGuN>S~Ho(NMbPNvH?R{KIR<4=Jj$
zT_XBwsORM*9Ry1J;}ex{7^jBC?G>G$4R#tI)hl9gB;`;J=4JPv%RDYp>AF%IPx}E_
z@_S7L8=Klyk5=89Z%cE}t$Lc*)aBZ51@Z_BXTnRxsv^xsND!udQQpqix^6<N#Qrmn
za9*W3;o~6x@-4q-KgtmnyS7?#C=ti~uZX{OD<N+eHQ<28L`+va^Gd7g(fAp66Ze4c
zio2)Ts^4&4?}L16V$8Sis;G#wE1%%bZxw|?MLO7ASPl-_DwFHiNwWPA7i{5_A3gaZ
zTNBMn<Kk{=PK8>AFynYgs;s%e(YD^;p}wC%xVgHCd>hAq4J7A<jZ{fxdD_u!4&9||
zGi{Z`s)Wn9olb8IC$ai$<so1PMek9+(L)asuIy4zsKp)=Zz?DrQOvC8QCbbzsP@ev
z8O$5k5El6~qD3H=M}$3m`F_zGI`yv0#U;?5zhfLIH2aHk1fKa8X?BEKzNJ3n)Z$^n
z9(MCd|NZPv>1V|}+5^UGd;^8Q3Pm^HpIf+Ebp}0?UBE=xaeZwcT?|d64=6T=1{3&L
zeMn9DjwFTdHeKg2RmxZ`=ZNc3HpPaK?c!6EfRoE@Fe3VJ$+F$wOQ630nbmh^`Vu|N
z@!lN+<8+Qpl}mTX`&jh<@O6fUn}bzO^+-%WRg~$>7ajHddks9tsOVO;+kTwe5=R*4
z9Lv8EikP4Z(`O9>-3?j<EI(4Lv<U`*0`^xCt*+70t;DT<oEamc$y}OaWk-g2(h1E<
zm@9`_gd&-*aQe9J=EQz@2Nni2JMcwV3Iv|%^}<+2Y$;XfKTpi7_q@E4?4CAT0+8i?
zCNn-{AwiD{ZjfWw_N*y4H8`v5s(g6=qWK4A`X;7UQBu^keGF#2-;ZJc5*K^D^~7^>
zOp$QwM85R)d?oe$DM}@=8Q!7ohXUM=C6AzWgSspjuOfA`{)PJgSy9ecGa}9w&;Z5;
zZoH{y1Jz`KZW06iHGS-Aq>kJyaW$b#w+DM-$YQgYM(jaR8MDu#7&A8XYtWB_G;aE+
zJR?bUYE^2k(>vuhL)O__^5AO-)B3Jds3Zyv^t(toY26MLoj!9hd1UWB^26z>3dQFO
z4KdnX=_aF`Vh6(OuqS_7Jf!6O=TOhV8O(cX_DEV~V+GDIZOQ;RxWH7QK9}7^B^j9)
zTyM*vLh@OowA{t*abESqPwH&M{wFsjuRsMQp!ETcG*x7)0-0oLul{{Nd1C)<S@Yuv
z5T<oaoR9yku-IPeS<|jn`%KwU#-#DScs}zBK0W!K(QE#t4RW~*l4yUwHWkv}e6chA
zL4EYHz*gePf8-3#f!#HG^bgj59+a+y3%FHqC!LC@-1!`zVKV;^Q%p4C+Ez(%2=O^o
zSc2LI!F#Ux52~z+GyH5cB|<I9+zuTVL#tcmq<!8dL&pkeV}Zz^N#9XS6dmD`URxFX
zkb^O}A<yC#JX^9ACAP`>yLbrNf#QUbVr3)0b+>#{Fm_A*xf?B2y>dOH3tnf8VyOBc
zXf>Xs+ZZKF>5SEF!Se}Uh;o!Y{Zjo@B{y^N&DoVE;lHzdS&MODV-&85TQF>DN@tz^
zxJv2EEY`xk>TbE*>tg?TOxhic%v<yi{`~OxkLBx)5;ONEH$3}YG=!SxtJC>j|FhIH
z)`d<lI{+h87r6?;n%0=$zQXPIWdCl$_p@}4<qnjU`v+J#U>?Lcm=?EBS+AkWgP`#P
zE{xc2{Y4zg-;+;h7)CQej>wJeN{f{eRFao*RiMh6Ai*8}&v{4ic$`R#1@6C@Q{A#X
zrdxTBQr8$&+yx0`7SFH}schbUxr2MWtmvTh_vQ*O(z?H5)Fk+KNqS(%VVc-{DCFl`
z<hC1T8Tp|!`d9XeSIRge!VZEZC_QM|E<7g#t`J}J^A<n1xiHJMfb{~BYylnI3>NHV
zs1ykFrr}m>d2Qoa<2VbBnM$`o@X&4({hG)gp+I09oM90#RR0KX5A4@^BvKk!6@{5)
z{9wE9+!mS=y1#tj|G1CHZQLSh_v2)4+06N^5~Mf+R9%oyp@8x!M5bPp<A|J9BVbc(
zKK+z8Y*M>(UlpA`49GRmEP~9yGfVg4(~ntPdOL?n3MYy*Q<OcolJVv8%mv))deCGd
zcChBc4kUC@Gy9BpO2eIZ$!lbymSZcDZ1_2zgOAh38>U6?)7w*J>fX669dV*WsOHld
zVE%!L7--&L`>L>Kw{z;}vDoHJVzDP|h4dY|dyHZ{qHliDk&5K86^po4G^lqgVFM{Q
z5g&5xr*h=|duF-43$qL{nWzJ3114bXz;2F@(}Z5szv^Dt&^c>*0~kf_?mm*J)&wns
zfoXx9`K^QwdLon&`z5j_BgW&{e!nE-3CP(Wz6c|!wvsodQ{jPn9O=fLZ<UmM9cJ8V
z6J(pi53u|GHSVU;hb10(q1%|;hAeTRAHs1_VkAl_U;`PQLk7)b+jZdL61eLH=R4C(
zZU1mY$ubSH$m#1CG8m?lKb$crq$6b%eXS=VUv=EG1^)oGd?FR0IBZJ{6&<$?A7POB
zso-zN6~QvYt*8*zv_N^oG&L-I8i^}Dte#>5BUcfG1~w~SqKR9gvSBP5FH1jYq2+O`
zU)x>-iK|#?2)i8q4ps(AaJbVu=X$FKahF})9)?+7%+OsQ+EzmJxoG2tQE|P%4;rG%
zD$+B<Ts5>Fh6d94BjMU*%$_D_e8J3b<a>WR(-x6^;!93>#Q7LM=-BGEXSwO@i098v
z46vjTCZ!p;XBrgMpLrtFC4dVZ?rW!^qwgtwG*$^WHa7(L>qLoBS?2@HEI|~q!JRca
z^g+P?lVD1lTHd`WUL~AAoN#x0jE_|03`dOP78gH$P?XiJjiGDk%D5`1CR3oxn00~Z
zv_@&M`^=)-Zm1<JkXR!ffqaSUKMX7*K!sx`O;2t2I%$_gZF!)dke=EiAhFI1bU;di
zL+xbf{!}(*&lYjEb29lISK<i2XY=#vhhYckBbWu{ajv(aJ-a<ZpTlN0C8Q@U+xNw7
zJk)YA&K{96Ub5)*qajp^JG)-kT&HBHDm(`|BL@42>6nJbU(fth04QVW8J(qE?%Kke
z3N@8HS&~q{XO09COKC?erK}69&~Y4b`QNkd`-k6WT}m9;g4{8sHwT{ZYyH~l{08-g
zVaR$j*49h8yttfFBz4Rmejn37kF`>!`^7#bU!7^;ag06#T`KbQ;C0LC(eTMEvPJ0*
z^osN{wxnKfe(}g(!3OBz2XHya6kV&xua}eh54VAC7sv}!EL)^E`qI<<2uLzavT}Kb
z8IcpHFx1Hdutv4R^VdwLl&%cBG(wV%03|>xp6a*rbY{x!){u<^_>kUNPi%z<^c~OF
zss!V~n3JhL$7|~YU##AX{OXLsZMsx8kJ1k$u1+REfutZgZ3M~y+}8!G30DP6ZWrog
z%Fh}tAFHg|8w=z{TG6D$bq1d!`i8Js;Fu~h&<jtpD#q{xCaNc_%I|zocv`e~yl^jZ
zWYI?!H|y|jlaUY3u*kP<NpYPxm@t*xQx)q2XwTsSEUUigLRBpr%9-1Uj~5g>h&%Rb
zjrt?9+N*Oqh8$Vk(t$Y-Igx6}?*d|bdN*{aNgLqA!vtnGROG-<9}qG53BX?Jg~Vtb
z=>*KqI5dz+J)%d-ERj>+5c><;t|d41ONw9Xx|CB{Q&uz%%CsRshkl*%I(Be~W~pYF
zvG`j@eL1;DSp<E8CLhbtj<ATdwRch0(pnXaCA3K!s|ggJO1M{<B3~b=%`Csd1hTQv
zD$qpuT%XS_U}edRu&JIk#{BTTU<op>?800`iJvgUjE5fG?Jx+@=OKpclFYe&XFy&=
z{j@57M5|}`F4&Nc54H&4y|hSG@BJcbs@J}A%k^nTsODX(s!Ju0#k<#NTa_8?RoZ7a
zO~!nnXae@e2v(1YrYr;}f|qSxpVYfHZc^GTkI01CKLS&K5Z!z+ZM|HOaYM*Smby++
zDdmJhi$kSrHa{M8g9v6!o?@+@0HCg23DxzJSRtOA<0y}ngJpdhc8qTC@=c4DuXfBC
zFPYm-xzaFEH*3jUtCaM#4~Js`^!OOjV{q_5(yVH#q5hw;$Pye=UMo3ih_ebi9y_gR
zY-W{Z=V+@I@Ssbs7|28F9AERlC;%%a4~PYL6e<~d470SdEYltjRa78hNi&z|#tU$;
z4^V4!?cI)%BnNJc!El+5t2FS|MV!-QKYiN7fPb2}hf#e5s+E87dxmBxT=sB%{by?)
z+C0H=z;v=Y@~x)cOyYX9^sVFQ(d+`gf@yg8@qQ4llIihPt<tEDx2%nCB*j_XY>B@I
zd=t$XA(j1!i3K*#j=Lbw*r8eYKx=Nq`UW#1xqyW!f+5CIV0n*`JoZ#aF)!!PPN3f+
zvg<yGlC%d=SD8+IhAg-mH1@YiT!DhH%V0~J>d3HwStHMlud<hU$)vBkk9VkC_{BJ%
z8msrb#}U~ht-M?J(5KQHkS!Lz(WLua^*@-%{<bY@9SKc=^bPH<XIo2<Fw8;A=ouSA
zr@yT@y7(ytIMQ?4_P&tUU6nXAs4`V1&OX5v1EK2(y<@4oS6GQ{N`#O;-&@9>4`wi3
z#j~Z>inZz8{!uSKxptGbGgIAfYp;V`o0nna1kR}W5Tg>J>chV@T^Y{i0LV1|a5uyU
zvLn|_)dFaW$*NlNmbSI9Mavm(;M>Srv{7$GZQ7o^H!QP1nGL^|E!-lPTS&eX3|LTM
zOegDyUVW^`5(B)O*HE8$86XI2Oa_eK;Fy-}g0)BMH|-G_2qDWl5fGY|H8mXgi(*1u
zl@IZt0KDCZb$!Z@`az|$PE@0uGUz)x&b|G3l4P#U6!uy)fY7c<<=oT}w7a#y@lN+X
zzWMgp%&?MKPqOyw9*~sJXGSdPI!oU?Kt45b-pn~qy9ZhJ$FKj&a{@U_*R0W6C#FMg
z4eijWg-EH`{9hd1G|38OBX%^J3@eEZRR~9tdLmJ)>9ve)OIp=zXRFAH@YG@-TmQ1r
zU01m@RdT$a;gg}1{O0(nD6irkk3hG3Cm6$~ekOK{w$U;5%={}zpt!x1#VNw-OEkK_
z3aMcutHhGt6dRfrp53rY<9{o=^9E0kDWZzWuEj+i*Om&(N0D`ybzafpN&X)2G#q^y
z8&awp+vAug_0LgCtxVWd;Kb7EA<G|dX2kKA3vjY<S4hB5wzxWbXd4{?W8=Ha1hEuY
z>&m|2-W@d{QD3;5{}r{KCn8Pqp1s?uk}ge&OqN9-iFW-&L{KMVT#5a#X=sxs6|@=q
zdAgHwtAt7{O9n^3MZ!6N243#yH^Fb@lzZUp-Erf@F{3<Vhg)Rqc^fbuC^R21%LI=R
zYKQ(@%J*qp$tBEQKt&y;86Y|?02|1+<N&p~miBV2{_(}869u&y8HQJrw+jdvirKjC
zRu9T;ID(Rm_QdWG`(d{)#SG_c!_%vvoe63cta}T$Hz;>XUSzhzzL34Yv(-@_BKu|0
zZEofQ1^+AWK19IExS*U~LGCY4?pke?T$10G1vQ2%ij(WUuB+9}d5>fSk3R@$2&Xg;
zCaZ%U(<aCg%)A|Lt<p>~k!l%M-{*il*PcGE|A9bqwXX5E9009K3vQnpV6iN5O5pCP
zcNnKfj<~+lDn~vT<T3RWko|vN12bOb?ltc0gSwP)*<a|qvVhV9n(cnRbAp^fX*NZ`
z>}|&eGMTy<g4GHTHmT}uK0irFDb>ccJp=sQ_Vl)wx6l>M6dH`Qb4(IWpw_~q4Q5Q_
z@<ZTc60hPnicvdodFtnrSr>bJ`2y)i7GPSJ&opvXpt}^(NXdg_u1N!iCGxa;aJulj
zkRqU|kIeb5BP=-pS2_0VmkB#wv?q~Exm~i*pvWk6Dgg(N5dr(Kc&`nV*ud8`nq;&}
zUoj0;1;l)Ue1#jKg!bao!Im7}fGGXBw<$@^$k?=EerYXj0N>|qS?&8*8-fohRGn8g
z)x=6gQJKwgwgRTUU)k=9P+QsW_|Pa+lDO=e2U{s^o@)_Fj&85hSn*fNUnV|!hTS)t
zS!}&VTV*QpCd<$t%I2J2iIZKN8D%2abCJ#wdHdxiWZuxeNC(H9DM!Z;8V-<N2}yKt
ze%HZiRk$`cyG!E1E$SxoxU?ALWSW5#S|)N0DcNRf>mvg}=@>94&+U5)fdJAJy(w0^
ztUX$aD=XnVC^7pJU?#~viQ8HBTr|p}r6ww_wrf$Z)W&g-XZ-!!JYPZBK(8f7*HXf4
zJFCr$OLuoub{p^VDvmVDyj9Pc81jXrk6phr)32#WM9k8(@5TYd4dF#*k84gAAI^~q
ze|1>?P>grW^<4*j=8um1o;U3xN$Vb~<QX7fw5U`b2v|{Y`me`#+4>+u?5}`nf8Q2q
zija$^usJGYwP9Mues0^5E0^gYDZTs6&Qpd;gY=P>%DNg{!2GyNs2zy!uVc^m&x+=%
zOxc*(#^J2^ptUu+4H}D;jrisvs}0#Q_7~)H^QRpmC*|6_-!;BFjlb~};rSD!*2LBc
zYeLaM;47mqk5>KF^3QU&xIjl=)!P`m<NjGRgj=h#3HL8*ab3JSq?4?7pHG`|c(9Aa
z|Ml0|k60lq5`I#YAIG+0IyDTbvD6a~18Ob+EKxiOX<?YmX9fMD>jNs~efUzV+Bs+N
za*=RE@nSsOR{?M>QHkl7C*RXn4ys^1swKy_GC41xyA3epY)WW0^B`8D!cMOB@*HDI
z(q8aENd>E@Td}r2fGq2UDdWF2SRH3rv+7AvuMxNqr0^c@y}yW(FeH4?#=e>C)sO*t
zxSFW*m$itu9yfTT1F^DZbFh;SYRDHv3_(6K+C`QXA-i8s=wpHb#D_oB7QykH*<>BB
zWK9*jV;I-T+i!VcrbBOG_sAf*zVq9-<N~Zh8P|ppb*_3>nOb5VcblDg{_=l`df&?y
z@d_!>R4yn1jo=M|)L|#Gj&dJ?AAPy8YzYOvEARG3duw6=W=N$Xcv1@i>*c_tHsYK`
zO})SP53sB$dpB6lz-u(@urR4S;c@uysG-=TE_9MDKR51{X)=mb%(BvM*1rafF!@h`
zrt`!p7+pc$r~7Jmgl^3oz|FeckE|wivkrYAC^A?OzR7p@Or^?HM*!+Yt_Zz$p569x
z5ov*5?b@8E;cS79BhAIPg(nfh<G=e+5Sr*3SyL0j6k#`9^+nz6(OZ)n&{BB~(LL{W
z&ykdxPq>fsq`YqI{t_}nEm!M;5SrUbo^FXIHfYel+6VJT?aim(xKU%$u;{bgX;-$i
zZ?%rEpVHduhfO`O6XnGU2v`A^Ti6yyEov!_$NgI_3i3eFHcn5-fUl6}3|*AU#$AFg
z3us8RT1B`ZE|c(A1Ht4~TY7>kGLza~ni$9Jv^f;*cTCOA4(37AR`$7;ZGhpwRt&i;
z_*jspc!@s!j?9~7uH*Tf0y?QoF^^0iMfF2xQ>_)wJOajYDlt%I8>@(hwxV@At;z9;
zCZ4q4$%Jzz7>+<way>E8r4OmN5=Th*oiMWv9>u*dkjx>$$3%PcBG*^&0t+@{?N*>G
zBgPjJ@p?SI_KWm!U?S`SuC4Jz+|s}!H)lyQQexKg%b{|Jk>C|HY?4Z27AC*+VC-@o
z#@g~a4gDhW*QC`K2M$FGU#8}CMIkI&s-nE#Q4eX0lj+W(LhLIvG_m{&+C>dKNeW7t
z8FE8DJMh+cTp8_sIPbHT3$rq)fOIlfT3NN|^Cp=T4VqVA3U@kY)bqp;pSD=B=iT!~
zuV2lZF)h_hK0IH%SjL8?pHB5jKJN%;*yAY(=5TyKL*winoDz2KO8w&K(^L?-w6#uH
zuExyDecUr%^PC}M^G--ER9Ihm$iI@}WoiNG128jJA<ifb%h(iGW<|?O!_#*RL~0y4
z!76I~KOHorecF*q;i~1F-#}X3a@e!iIyxoBHt=10tP~{}V_9L*awbUrl}Tyiy7vSh
zpJ-??vvWHwW1HbqpPj_0UNrEgpia<ID;y#F;fHy0Ypk$2a0vibB~Bu;ka@Kxv?C;H
zY4hjgeVl25CLtXQeDxMw`O3f}5@@eLwvy|w{C~ZIM$AiSwI!frW;3$S28%s4UNNU+
zNq=IzWacV9pce!}(bPos9Nf3avPppLmtL$aNNNYvU*ae?Y2j6W<5fAjy1}_=7m%fN
ztUl<$<v{ZFz&2LPAtT?@_A-7E7Ne!6>dG6A4l3d`#(zyJOwR4=kH4$<T=cyA>&ap0
zBx4Tm{mn})sa$mxsPGkDqCMtK@L^Um78JPCe0!&*g?vcVY@Olm>U3*{@}tHwHlzqE
zLJ}=-P#+#9xy7ZJdkvhZnM4!eJkn%s++b`R@U*jDRlE%~6;eme)rlrGH`f<!V}YV&
z0qL@JER?KM5RSF9Z<gz>dTgT=l_DXd>kmpjUYLfLD4N;e>VJc)-mz`2+0dd6K=%or
zPte`8(rAu5gX(zm32$YM%sphWqXfkdZ^Siz{McZzv~e)__AZNCV9p4Sk}X}2--uYs
zKe--~sR@a{8p3r~ax@^fE0!3vGI|=EcpgW%#@P41O={24K45}5ibAl;(8?6Qu0f_q
zTaV)b^{8N0&Jvy0O=K28PDv(L(Acx@)^0Fsj?Ar7jkifEP-mvZfAG06X~DAr8(^Cu
zycGq>x~8jvMDn>t0n<oeCZUyRBskF6AF})yu(!9d?OPM8ymuN$!LiH&23cS^9`(L`
zjF{l4V2sWVGN%QfXG=<PB=fMK-ZN?OxAojvWOl#?D|pmKaGsPBh`OdLMLa6jQiSUM
zC)eCTVrB?y{UtUi_&aa;)|!+|$R{*`Fn!WJF~*V+&-`S+<-ZD&g|cvz^uiC2b>O5W
z<IX$1PIm<jO@!uX_?KUo`s+)AqM<N5HlGX8P%bN><y$KOz_IeJ(c$yMP?kW+(qiEl
z1Lu}Id%+Sj9jG6@oG$kja<yc(w4q+nzFnF{v-xHD{J#5ADM9H?o1-llY`Dq=C<&0l
z(kkp>W-d%>BHK|6w4Y4IfS^^nPiST$67U0gjYo7D!}J&1GWM2RskAYHkoY1eBvoea
z`p3CJF7n33phyDV2Kv2t?UGd^zf_DlmvRSTrH&8Lco5EFm_Bpmy8OY4ne+n))odw&
z_<}kJ_28079QG_$4&YaIfwC3sDBgo^9k6YZqwiFY9YQK>nXu-JEl%SpV3$^LE#qg?
zbEp@qU@i8;n#RUq1-3?Doc!HEcJA(KlG!yNDJ<FcPPMT5`J{Z?JATtX5)nXvpoW)f
zi}6rJjYe+SJ_koHEtZ3wme%Cto(m%Y;UGXWQ|@PQDpTYkP>^>INYk6F!+<JvM|+S#
zdgKU4L(^0)oTzkE3z)|~rO9CSO<PWwUE6@IgjcsTr9(PDs;xEv;6H}qo`YCG!nY|h
zG_NP{=h71|>oPX)u&k0VU{h1bme<AJuB^AfGu!kG0BCkHcUW$nmhA4D+vYeL+UF+@
zS`&P3EHVZ!AKB{{5{jpH;E4uo#|4C)@~<RBYka78tIm1|HVmxV*#azUO=4tm64Y<M
zD49g`ddkJSYBTr=co*Lz+@oy98(WvQ_(t@Dal{NYI7m4%y!vXCzk|e$54bVGw|i#H
zIkKSTM9if70^P=W2=8d9<X&)uWsV6Emgh;CQz7$jTbr4qEEZ|nliP19GoKGyUfpP)
z89UI^8M;|{(Un09U+FgaWmrkNBt7x*wg6e$+$GP1Q!+5_YOl2wl+9I5wc4QuH&SPG
zHY!I*g~^XDO&eBs_8c4nR_G*0wjUYA+=kR7SG8VDkrm(qyvmWYDwyyWq95TEXIIfe
z8+RS-FKulCO1^L>t=gJB(H#6iV>ovHamCtfWJ&m`^H=#t#h?cSBu7`Xl}Z|orsVQ?
zk{Yy#(7bf-l^31CODmVh2sj))rW7q!!D<4?2ME3t)LWy{b8nTPrBRtN`H`EW4Diy0
z+9WU=#D<%bBkq=s6TR2e1NJ(0Sbdpb!R?kmeM~uPbI0FToPCH<EzQ^d1vPVkGgV8f
z<VLOy_m@{zUqxdN)KZ|KV;&y{N7$H&(6p`JiI8ivUAPq<*MU32v38v9D<-5YIsc<9
zD!|acS1lCYsgGPriVj&0`<_}3;VQM;TzMp(=0uXokg`m5LMNa754nv{dHos9Br@T!
zYRKNpdGOopeoLG>BIG;z3i2dro>LM-cmfACo74(b|2baVt#-ySso^YIMRR|FN~J9r
zFy=net7mX(N|q%=kcw*KV?_lxWPXlH`J5-rP7=+huBY6PUz`UGf8Zt@ig~qFu&6bW
zwX;b^uuMTS44c;ZO7RL-ls$TxUFzf<j%1?BT#7x@Lv;Svgd{$+nlbsd=b_y8mnv)d
z`2e^qZvw_YLlhYSJ*&CYR0^+<^fh;@xo=v+a}EJkc;Cl1py?(}vQX|qy-EIMn|T6|
z)(;&)?s;3Mm`q_twOB|=eRA&eja`<xDYt-_s0@pjz6n9{Hpn;&Xixc~n|QT2u%M{c
z<drLE4Kt;MDSK2AbeZY_f*AGYFEzjBfN5$pKXJDJ^@TvOYMv+(Kv4p-TBEEbe3!Sv
zenOxz3o-Hi)+IiN3(r>yvcI;#<!J!WB_J%rS~!<oN_e;MI@79~X_%lUBl+%nP7I&a
z<FAVBsY~a?HUvRM#ibC#Nvk492$BY-Aa{?KigDySCI5uPRSjG4P{3vj;+nk;@E|$L
zxwJ)8W49#e-4*X$=mquo!4uyS&sZN$ZsckZO4lBZp%+C^<=Si{%+~fjZ&}4CyEz3F
z09m@589R`Q<a~bWzDEreQ#V{l*tqr~wJNHY4FF?e#go;KwkQG>qTo^64+f>!i3Mdh
z^I$$%nyqILKx}(?MCO0Nq*Yo#4&Cmz39hQU5k%Kq@gYc9R4Lx2EUNYLTs;r~@rv@g
zfIZ*m&b@`dik``9L(P=n8~=;)g+Pys7x6Wxj(zII6KY_8?4nvJX3ZR$`)1}I&8hHQ
z1mT7qt<mi?JVYtM3@L9{3wt#n1DS8ifsPXG3!8RzD%)jgY-Tnh`Y+GV42J2Nr`VdC
zv+WO{O(iP%i}!7wgVH||y@Ac4;a9e%3cBI8F|<1ceI(ORgCw}X{{#AHoCA|D^yj`M
zYH>wzAFfv!X^e)M%nsC&_a5t2tDY`c?pUuVL+3fTvun8cT8q6Jf>7Xt5Gd|$cRC63
zvnAxVV~Z=vtG2HicGmyOg7}Z)QoF^H0tt=l3~4J)x~2T^T)*?A3D|_faEM*j>t`q8
zRy{l>tlmp<dEQd7Ejn~B+uu1M!dKJG>Tzk#KJ^-WlNn6>N3~fz*9tG!Nrh(WG{u*$
zS;%x7t>0aX2CP(Sc%FB$=&x7D&mn(#QW|{T*9H)>etwbGoX4Tn4x=Dv44B<0C=Z~O
z-5|X68*<ear-C5!D1lk4LO^+PCj~$pfvTc7he?|^>5ZU39U!mbjJ8<+7typrD`zVp
zMeJW&^9o0&fdX{I2qc}hp1W#QVH-;yA%$H&s@&~dsdU_R)<*&w0fkA5K2B5LBFnyb
zul+`L4i{jPXL*bc@Q<1`Ngo47F=Fe;d;cHY51Rcq+;;?`#=hDU<m)&6X4xKo)3t|e
z^_=@VVbg@EVDmQ}9zP6~XAm06JMAOc<h*MeEPq=dTnPN8VP+eFzwGp`qk8dU1rtp#
z$q1eJ;T}iP>067ZM-czjY=+dKv!&na?sc}MPOy#JN&$26u61iTbequuus*p&uA04J
z-V~+v+mT(Uvueact2Ajq>FgB;Pyti$2D@Awv7=<xyboO0b%adDBPM^*dTB{G6^K40
zy73geib4;fo8midb%evPK*xv%j;gebjR#g1Fn`VIZ^bm;rNq;xhCVUKc*7!x0}Y6h
zzBK>22XUwO3v;e;JQL`^<t6Fy`ul;s6@L+k_?1<F2s0$^^#PEB3*lzVksPKGu@FK8
z+alCKh5bdwFdf_8b)nI&MavnRWUh1fc-4$8;N7A?w*9?N<9#bFhx*drTW!FlV`#+s
zaku9m%?hhHKlLMe)Ywe_y!x-ePoSJ!FeK&Y*e$u=m2Bexo}Yb%1G?ZCPR9+ID3}Rl
zbfp*cl3lLu`2io#)^mb-WD@0Slq!qeWcxDsblC>ga0XUxzH*VFiKe7>MwG;bP1n+=
zV@YtiyOEk5)AkZrmqQZ&bO@!On%Qu654}0N^(dv+OA~YEqHodqFoSm%3y3)nXmJRn
z9E3&&Bez4K1ZCwZP;mV$&p>fHm+odBuFHz$VTt-l_g{^_!REnA_OM*KIv3N|xbGEn
z(6beP6A*t=<3J3^BBLz{&}G*NL2Sa$RjlK~G|SX7yak9|yIdSyD>~+y2Lnc>kpUGX
zGh_$#H=gHA-rsa7-H<J4JK39GOY{*=>Fpn~ZtEF+o<<Kx2aDQ%4`O!^`-4ujwonCK
zW!Pp(^Q!&9+%!=tbq?>&kq5=ee}b2Q%@zd2715ujew^@-=TV<rE>zJ7&#`Bsq27w6
z<G2V4zEZ0(j4x&PCtL~3?*>5K<gh~7_H~2NjPdb0A1Kvhgnk6?E!59pIF(3?IT=s7
z!h%R<iZPG!+^Vh2*kH~d0&jWC1m?-D=Jyk<nSiuI19UhjR(2Dnhd^x*gS%+iY|Oi6
zJssQerADN1=q$ID`H~v!p+-KpA7vxzEV5>ms!Z)c`E(fY7q@h(rS+`>{Y^B2T{+I<
z1!tlI=E4=$7arvQ1b<>>9L?pz9!{7-ZWdiSh628L7@4plAzpyTNm)f+#?)fVwk>VR
z)5LKWo(`<aRA5NRX#nvkH6PG*7p+UkmvB)Fo;SMszDhSbrqrbG4I3gkua8WMx4oXL
zmItI<KY;E!{3t%-uWSN##WPe@OIkKe<Cx0wwx}luYw^1dJ650MjZd0)`JBIXP&q?n
z`9m-`oo{l~Gu&=v56wV(8R~L%*BK4!@+!5-s&u_9ka)F7rjHq_RX$qOJONvC`Rv1p
zQ(XS|_r-hV!*b9$&YH-zZ$%)P<f1Wo>EfEfjPTr34;0Ta?}(7=bDq2j6g^92Baf0w
zZY>`(YXl1c^Z15Z>7q$O^+jBpWzVk$OR(cnRAL&KwXezIfG^Pt#`P>6V($Lomw{J6
zX~4c3Y|;B*ZgZwZT$!DNJgTV=B&0XpWT3z|{(OZbFcI>Ns)~CDUN9E+yG)P=o?p`^
zci6D%tGaDoQgP4|JX=P53BXr}wiUxpC|^QF1k}ohxae;ly^<KQ_}KA1RKt)}^I7Ju
z$TWjtU73*+SZ<xW@g=50aLXJE(RiVMz)Kw5(qt;~#HXOVI4RN{ij;#PY8nO*tU3Bt
zYnyE7WIP*zAM4mtg2c60aeTffj|;WqU0|1TEq-U*f>Pp8DzVG|rSDG8=x~5*a)`f4
zsUKbyv4^Gn<kn5vq*&7RDtO>+y~=7ZH{HemmuExi1@gCE$QKiP<jcg)kgZq62m!;?
z?$ip(xN!XK6I0>}I&?P`AVmUbhz%SLWg#Oi+a)0X<foPNW|Z7&0hH_PfgfN$KqbY0
z`5$~GUlMr(#DOmxOla_V8K?_yJJWgC2R~M!#qFpsko~I=?qDVK-#_GWdz-J`h28QB
z%9{L-KB!{X!{ps&@MT0eT4ZGApx!+QsXqzuN^;)zxA`H^YX3?p_EkOaqO)<8#sF04
zyE1gZ>@7m4DTH+HS%6V1pLCmnW+47R9YE1>7#XAvY=x5D(_eiIwutxklV!1K*Gish
zaT!`}2}DBBidgagh0=jd_;Cls6r1~W0s}xZ-l~HiD^JF#KyEvvW*GL!kqz`mcqsN?
z5*##{JOEn4G^Us>r$FJ6_mFnw17+vD&8|vt=bzWS4t8lfV^zT>As}EZzH@s27UWw5
zjDF2LBosX;tGKY&)(Fd(Q)>)vfe0HFCE%5`KlE=DxwqvUdSfyRR>|_UlVUDkW#T<w
z`&`sgu#=cyRqh+kHF`Gt#BWf)9qbnn-2#=>aqvgI(`n=vd21w~+LLHLVYVM6!BET$
zO3;pO(*;Ze3-H3~4YQWq{-m;)wzwjM3k9hOA5Ac4)Hez=VKXh>q#u>WvUdv+x(8Zw
zvHd%F^%#}BN(ZrN`R#yb9P>P2A_M5*Js?|kSU+5r+(Q9UA@Wjxl2xnO2e~QZRM4(~
zq)PM{tmSkAOh#S6h~F)$8Kk&49}u<tQGgdfvtzTL?g^pTbOJumia93?8Tl#Q8VYdL
z_Vv#N;19QL;bX-N+2;B1(3`eMaC;rvo4cyfR3c+?76s%>Wu2!`YB6XeFVOegD30HV
zAHLd+Nh@iUw^rjTL=Rj%#ZUK+y}f`_%rtTZlKZs;T@Yu4EgANb1ULK-o5E2ZjOQQV
zfPBhXlErQ*hLVOs4+AXZ)$6pnodsBHYRX{mqxnH$O=q@6{b3xSfln#{U#|5x#ZNjp
zC9dW>aJ&SJoMy%?s9p6Gr6#_?__HzTXZGHQ%SwHbmYLhcL~CIG3X)(ND!B*ePZ{wl
z2gD3CT2eD-2+M1G1)AiwHIy0T*{9&W%Q9HtQTg=um$F(Mo-{sHO`tQa-6J6B;zdOY
zlRIa;Q8cH0Izk)ao@<$iJ6s;;K1m9dYmnE^dshQ#oV65y_*M{cXP`)Bv81IFgA4_a
zfS?Z&9Tlyo=gPGKNDMIX+bd}8>~FvI-&%Zg#92^yFLmCe=fcX*8N^x2EoW_BllJrZ
zyMnWPm$9^?s{;QTTIl`2xosq<2AMfo3iS;x^^q*|e@E{S0K9FZos=}4yWV~knPqxm
zj*>@}laXM3o<cAT=Qx*Mz!r1{w(GTaPE^eRF6v~~ULpMuNgU~B#mOn)2XFR+D9+d^
z^_f|fX&#3npde{c3s%`8qEu`1wI|P>D(Vk|SfJ*{zc9jN9thxgx0S|)U(GI6#dU!i
zA#?vcBIz8NCc?w=_zuLoLqLplsH*rK1(VgyQjd73VU4#GtB=BBVY&BPP{O0`+@UOg
z>;ypr$|#~&I*s}znPpt@l%cMFxd3NNagKd+n>c6<Z<u{v{lXM0N-_fFJ8u=$%mW5@
zL3i0M8-d(Ceny;^K93spdxqW|;Y>dRt(Bp$7Yw+hLj<m+DdWlP$9D#zMP$YSS>UaU
z&DNeg2WTM_K~m82W9ue;asrH=9_kC-5NUNQPXiDKV8@_v$84(8x7{=2rIaT~5l4j4
z*3R}4l&b<@0ClLzouMTBfb^Ly@#q0$FVBMK%0o972ee=#K(t@CjxOWSkuA)`PRF%=
zuYe+hcLBdEyh$g?oJtH-(`=R!w3KawT|gLNfX3jAIb|2)W)LsA4MZQ&0P8^%ByS&j
zgYNwsW=tcK_0rvEM}#(Ogp~B@x|;kaN%RSBuvaWlTe{=d;B*mBYgfi@ISqXq<9k`+
z(@726VT*6x;9*8^e<W<_RhDHa+Rs#8JCOp1x!b@yRr5<LF&?Bhc=}YMVAv0)msv4?
zWWkKj{rWe<=jeL1CGzFxwYyN%_VQ^Uo*p2LdzJWzD=wBacVeuyKu{l&<zK(N_!8VW
zn1*ah%d1=-DS+#2hrWZjw|(*j8A300U~2qq<_;7yEUyFo>eGs~Wf^w1hxqVkj6jp!
zK+`Lwn+{?{sn}rrB`5<2<X}e~+y%1puWWwTdvJW%Q=&4$c{~VHDqT4`QY|Is@(;?D
zVv`4^@!L1luzfG9|2Kgj3l5#Mm5HVtyO#0hLMd*4ZH?KI=4|96Bh@a@#vD-krmf*=
z=R(flNRK52hRXAaVs15d@>FlX6t|#yIVbgQlF6O#Ge1GZ^7+mWlW6)F=Di!$tcF0W
z0#$*NP5ZM%WzUImz?k2tLh0@$tULyYda54Vf1xet3e(`L@I@6FouW!clH~WyGP29O
zC^Z$CpbKoX-{eXteN1jFsnq1pJWG&f1Q9LRb-<&8dj+zK;|F!yB902C=!*HCwR~j(
zAq3L*RK?CZtp2hxMd9HwQ1t9wimCv@G?O^P@0s$gNQvfDojMlF9AGn2xg)wU?M=&v
z9<b>bg9A$gI!`*Dz$0@*-o_d0@3;F4rifHYc8}Niq$D!b{+s;*?geNlR7e@o(q|aa
z!yXoIs{c1|1t^m{f+8Ydj!u>z_zI=OeW;AmL##YcZpAYRgjwn=*zxH*mBT%ABP<}P
z%iuk}e3Q<;VAx#%9|*Q;*6VLbQwHUjEAhrLNf25MNcI3|RS+x(XN8k;h3yW6RZ(d%
z!z|qba!yAMV|<)~hfxzxA^+w)gco6zIy-=8#UQ_o;~;Z}lF{2}kDm>?k0e558Ebr;
za9f0kWUgDG_T)u%OgrZ8IA*Huk1JN}I|<Nk)3tK=fh3>V6UA;#0lQ5DP-wG#L~;p&
zOXnbrWd$sp@ed-YLl-eWpPJd`bW|2mmtlljz-`kA+&VGYDY+^>I}Z*pGcY~l>#Y7g
zYNZqc<<LP4-9_=<>NeH_nv2){1cqyUB&;PZ{s%(MS_NMZZ-rqGiqn*#g!F~O_k)6G
zvieXabe7LI;~~a?81}q4$vz5wjsWzj?dt~}zITFBC2Z>HBb)%kYQB>LH2;5f1?@AE
zOni91<L$lz0-oA!{BIK_o>uV(cfLf2=po#guKE&*a(vwWYVnYV;F%2^mG#~0)k{t^
zfL`8w6{N!-kfJLQPNaTy15J(Lnob}gj_01=eE-BzA!^KdgNFxpH5|$yhZ(<5;;Ql7
z;0@c;RD_b?c<u+O$90e$@=r`?-v9lnCn#UabL@d-0pL^MQ5@VF`wFn_Q!D8Sz8Dx9
zV2+44RUD`%ZlgQ+jRB!fop1l{DZ&wv+lOi26H{5cte8Q9s?jOzJg;z*NQ~Xv8X&c@
zn9~CHrog|17_d2)Ke%ksU}@zVhO*{<oB}PY-~hI7iQ5^P+sHgbHoVW|wFv^3#YDM(
zvxaC}qxdo?kQi%@`g^Qed~PA^<<xTT%?s`yfPB1U2!)iklBo#vpwe5<eeM`vS5qNE
zXTT%sdJpjh9(2Cfp;!8wBd*_#23LqXxG^y$Fh_Z7VKhPHG8$f=MI9lgnC{aKNv%xw
z71Y=eOE!aISBA&$ZpV(As`tp(=Hw!c*1&CI5qvS{&|O8KJe)7a3FR{R7D<6X45;1M
zANp5%xb0Lefea77wy}4uW_H0)mf?gE`ki7YzD#~R;p#D^!Y$O!Sl9Ec4=Lq*eVSL@
zp4a!8FM+=eUut>-$9@x5NJ~A6Nf!?Q#JVTsF0DYkjTZ}+XN$1o!2EHQU=l9=5KHHo
z$-Svuxn*~F;hJs*;EDVfD%J$eUC#iZ6qKLXxa%2H@+xxu4IbI_i+=hWYAQs9n%cd9
z=XE}A!ch4?h!GUIP)vXb5}czupE+0hY+lWA=xgG_O?oSEr4QM~3>y1S5R&^ZF&9Pd
z2{V3k&`FugfUP4qlswAluxq9u=68}LSNx$7EZrYL#<#7BpEu$pf$ru8BP6QrlPkh)
z?`yMlDH4YGTe16<iRu#`e&nl^zmWD%!R<ltOq6UZTbz}S4v|mg0DumJlBSXd0UJR_
zQ6@eXvBi$OCtkj}RoRLEs^;fSIuU41RQ`n{VXv-2n>C=Vsgl>C6d<;Y6WzBBc-(?5
z`0G^?xDL7kKPW&YH?<?`@XfMavFj2@Hi2kYe$O<{uv-QXsMmI9Pu1!Sx{|C6(Zl`8
z*ALkz!5aK#;mP9A8lE5D63*o0fhIQaV(Zg6w)x-q((`XdF6tJ$oL1~=D>vz;!Ho>m
z(Wk11ua&drO|1^vE0nK7{}DOs^oPh$zbS(vbC*izR5W3Jlw3AJd=X9(4xx|$o<6fF
zppRfkHl?lWyN-@pi1fdC;peBzXPJ%D--Txvn622yeqQXQ!Jvx<&jVopA=-64K)uvd
zdSu_?@|vyi`4ropbCVxd&1|m$a5Wl%25t^H|G;0xmd0_MbaMyfdVB)FT)Kl34cLId
zc?AiX8-NL?JLK`>12L0N71N`X=I^^(7~qbrh1Y+nv6pMu;i$I^cHuwF@5Ua9#HiR3
zCLfB%|4|MQXNuz+`lB2w%7uE1EGZ*aw&@V}I8`dAORk3#um(AjciEP3=zDjrhdXxB
z+7NjIRZ{*B|5fW!7Z+MLL`?{G%VZYO2f6@`N2}bQBnCE5^66t#=Wo(dK;rY|Uxe3V
z<V5w^J%QD;-udbrj0cZ7Z&5#L{U<RmhimzTlIqJ){2C&f<)5M5oBLLT1fT)p^GRJj
za+-e2qc<Vp{67eHym3vcjVRbdKWBYu8X0S4ynX1EaW*=Y<A=w}h`~@ezOfk@noCdf
z7*;xQl0UC`a-Z0t^w!?Chm!j%WThsTuvR@^2^Uv9xb)(-Z=m#njG*$bG3D)npmNV-
zHc8?fxADPE9OiJbskGK#%YOWmoUL?A0p`K47(|8$TO}(7uA;qd{}Iv6>m9uyco`U8
z!2FZI-G7U2)i{69+X7zry;v8wJh14ddam8>$>F`a_kaE~g3BL;v=<`U_U^$qH!!h&
z`+klBo;A_a7{$T+gzV(Rs(AYItLokb;6Poc*26CyrC>S_wm8sMQfwiq@u!!4E})%o
zFeeQffi=%UuL#{wIo2<m^t3no!X5tmA3=^y!7E3dJQK4EOqqMDiKN-83A(@ZD`zD%
zu=xagf4^p2QIz+tc5D9kfAprhf=R%QX*ZVlvJ*4pm^VbZ6ev|$!YZbSFBCXX6FE@}
z{AG|HUagGIX6uQ8b~UW1eCkOXws|$v&w6$hze5WQ)(Ejg+O=itF5>u4I81D-N|u8~
z#hmRrzG%==6>PlMjF%;ZUk;x<N|yifjHDb1Z<54>7YcQwM&zosaxA1~^)q`w)CzJR
z!R%?u2-bg<y^H5vlyvLTiqz0}X=HHlld3Ca69YkX%cjC0P`dw+#PS^7gYX*KKjI@l
z0%&nXXKWoC-hOJ;)L9i`TEn^g0#DN-Hz(1<FG}_tspMOeh&6NA5(z@BRIZJ~5U;n-
z`oZiS?Xc3kDY6<x>K*MdZQP2$B0n{|X6yNahmPA*lLlA39_t^}@?j~<t#+V~67E$S
z?wRJ|n~YCF65>6T_NuK7B_N>T?4(o9q(=T69W;TQw%A6jGJ?s&H<x22P6Q*FBd=%3
z)5vw`F{(2oqqk4QTYre3KWJrb3bG`>IOlRyL%VldO^ccQYtPSu&GH&a=K~%@WO^g|
ztLKgk6!q;_qB(f4gjMk6gxlv#E-%~opo3i)-qf~*H|jY=I~t5f@a}b*J&J`RQ*()C
zGHVtHa4Q3g6i%;_@d@VI?K_VNfM&K}CZ(m}!2~WcDoz)z6DNdK&!T0&N988F$x+(`
zknc|a{M1EEhWwa@Ao5IM3G7=0PCuB*+cCrKk9s#8MfwlY_MFmZi5Mw*lw1m>ah=sy
zoMOCL^~@*3ezkgvoGJ)Sg3^!2`op9M<!$_leZKL^pS3mLw#mebh8*9*(_{n|4s7}j
z0)uQt<y{K*GL{b$8^Oge|A;Fq?ahR)tyGr{yDG^O7;Ue96B?EeCNipZ3Mb#kwfO;F
z(es<7Eia84jGdH+e(@a{PC&D}RZ>RcX5Lgqf6P`vJX7u0GKVcj-xWy|<RP-dkD=ZA
zgScEQGL3gL1MTs>;+3E#k%|4$qnO5%nmBem<w}etgA1o1`26xh1K+n4u)qlSf+;f9
z*2KGDNW2F^bE=no8<2cR#3aa(SF~@>CA^<Q^8ud~Iz7Q+qvWj7pU?hjaG6F6tcbb)
zG>2Qs8}#2&?&jC$@&=x6QbK+j)k&$Wy{mxR5Lo0`=-wG5^2MJq8AQ6ThDpyo6E&*%
z&T$bUw8peG7wP@wYuU%%*OtXkSDe;<30)`mBGI!dp~|)x@TqWxOb*?mmYApwyfN9T
zIO)Vfn<GYs?*_)Q(Uen9UtQq4YwUXKd7e}@`=SrrEr4~o;wS@TYOMJ}U`3XK>s)98
zQ?!2wh>7WwQn}f>t_YbrW}gOk^7r5;MN=efr^Jp@(DPsF^_&Ka-1^Gig`kA};S;6P
zlVyAyHV^U29S+>4z#^TqK~g>s<9$&Eo2Khv9zjU0CZY$}RuhwIBJnC1rj0D=bpnXs
zg7BuF-|zU-3*6;u_0aVj+))SJqrpCKuuX2o%&H`4E{bkvKW2G7ahMcsKQF4Fz28Uf
zPojtPwA^=$z30N__!1h9P>jWmf-atImg=r*&P7{9)-{xjQ_aw0G+mGfljs$TRMO|p
z0*1kL>a!jpwZeCW*0NS39V#-*kzQ3Ud_}<iRd{<EJMB2)00Vd>wg{12(n(R_TTKIY
zZGFabbepzqy|%<P@kpcQs@!NwR$Ap9-wn`F^;KIF`9~77{*})k8R?lSnV=o;a291$
z)h(YQs0m@B!XfalJ!4~^tmxXF6DE%$F>AKs3JN9@tXuYfWk3jM3-@lv5+sBQ>&Blp
zNhl>WDup~7UcxyyT6{Jmr)~FMj7u-*kQH{WYN)X<G<g$9wfRDFE^(M=a%s;`y;}vY
zo7njdpT2x4jp*g>l+Ph2uBV^h^9$tZ{^<GIa<EbBHrhYU&$N<rZNF>P5?M!HtGA4F
zeUp?jA0J7!71}iakB?F7s{24ZBHArjlna=PqM|ylR?J{Q<zs1A_loy9WKOPp`*ih*
z2lMsEW4BCgeGPN-qYpmT_dIH{q6U-wLF_4WYS@UG#Jq5xvv)Emm2dvWeEge}ANf5h
zWy|x27$&W&c9!dg7YnAFPGDn4_Wnnl{cp5dS<oh?PwIad+)-`{@Zp!^Qg(dHA3EHT
zY+Zg0j7NKhN9qAKa!_rnE}n@bhX2*`Wnyi3JUK)1vRsd<mb-k9+(^J~9_{7e4KUTy
zaajwdW7j`YY)f!0{H}lBdZkq5K=h(qWr#PA-ob9Xug%fw&&a*XrYmS~Rc{HcsHV`{
z97D%Ck~?4f4d%l4C<m)IvE<BDN`fM-SK^D}W{~oNE~0#VV6V(B`d;c-OI`T&BrcXz
zn!f!)kI`94!q(Y7I~a{)+isZqZ05;+s>SXWm5mBCd}YT5Uhe|;G=+Mf9D*1R3tczM
z5wi1$!JPo|GLoDQQ4V*Rl}6r8LuhG6wn*X{*LEk}y6Wg_IFtLzt<$d#r>Bv#@lGyy
z2v}1t^!KPrZ_uWZ&va{HgUPCo73!VV?$+4xpLDKhraT5!p>~LILiZQA2{Yjo%Rj->
z=AIdkwr_5}fj<9D`=M%M)n?6+hGy*J4b_vW#_u?eg<7~t>Lwz|?W&Q;p%(d*Bd*Cx
zG_S|GOB8n94Q18uj%*~ZmgcxmBw>|!n0L;WB#ZIuDOHbRvsJ}|yu)qZ;R^iSV^Nbo
z!aMxWkk3Ftf1k_Fwa$QGII&UgIALw9y<WHw0rc!wya`MPJB>!^_}z4_O3b&Xwi4-_
zUE68O0)Zl|LX9a2MGs@ilDTX6+q5vj{7lu>7rwdmO*PVLx<9_Cru!i*I^SxxAXg=Z
zn@L07PeKDaB0Sbl6Ecl&6gxb%zNtdd?-UWt%3HHw`>GAk$FB7sNV~`!tq5~J=`X)C
z+dG*v&*%U27P7c<(WKh@zUOBTeeC}{W@5Pg?)xILpunTbj!=cv%QMZt+K_Cz;rT-0
zX~gcw`?wo{c)rj&9^IhmLcS}h+qKMRN3$aF7Zhyk-^sh<CnQk8^$c`Ld#mc{+S7p^
zGNv^hX`(RRJ&gX7;sdN=i?b<+w>{;60C)S(hb|#RDWElbKxQ@LPO3uS#nF|?vN7Gj
zDbOJD&}Vd%zx~hmyi0n1(gK+-DKeXI)|5t*i5wizOvjj5xR+zlME>jdLgWTfSTiHn
z99W&$RPem~%8I!w9zWf|73kkwlItUW3rrvEVAH-0vtCc5R)s(bTo-iPt7GWz0csA=
zl2PDeV5y5-Jc?oBm+ob6PWS{N!4g2r@P9~XL@cOg=`=vt6clXR{`*NAm!o366G!N*
z)Z{?RV7V)K*4G_@p)C2pGWy!)KR)iiS2ok(`2*~FlY(2(*6C<jgc}pMnhY3Pk|TX@
zlR2*9fqm|nx#_I=UjuRnZJ1&HP{-0qK4dqQhWz~Z^b(GPKv%uYL@Z=ms~dZA&b7y-
z)v2#z(<d(pUbSf~_6v!lv7=U>pCbU6fZt+6fM(jm)3|v;!lzB+GehCuN6-2DnN2JD
zi!T<4TRQ?`Xa_$}U(Y;k3aHDnD~=|9gIa{0#I2rp1Q9Oq#?qGa{4vd&XsgfSc)OlB
zeIb8G71p%Pk?Qq(>@(;2v;RSG6<5)Qa{fX%pSeE}4kd-2&a<B^Zg|?)FKTsi-TEZ|
zRhS?-XL2DN&hGK{@tf<^(Eg+n)GRH$Yg=dC>io)Rv80C4@5{M(DWS$zC+pn7^!_T4
zceEg4UwR6r{e=AO)1YzyQ;o<Tr*&nT1f(1>t7wCZm6+?Fu(N|z?Z5rjIKELbm}K(g
z@n}fzyxI*foeVo}6<}-x*v-=Cb-%p@((EOOBaW22zic%*^kt^01Pjdy-#@($>%m>2
z#fBOmConFwPf1s8#LK37Pc}~6!jkjQyf}U_v;~xC*Sy5-_woJb_i`$(ZIO1?>uhZ9
z6YU0GZ8*+?*&tHF2m0tO!@T!xVDEk_&YTtL=0nxXpc=D((D3yl&(3RdWt7P*ziQzQ
z(ukvj*?oHZLf>96!?T8PzVHotdQ!qnX9;+8>xSdc)LbF!5b`XHf3UzGAA5(kt1rhi
z7R8;_=(3*sP%<66Cp|%n(fsW)xI_ep+$IM5=p{&BbYRkkd294F`FIpk3#d>-2?m;i
z-k&2!d`?+F^A;W{^yn#0b7^rS>FLwByeX|q4Cf`ZH>*>`<O#|4^E~kW=_lsUs;-7w
ze8{2Ta!Pr2bw@2zQm3!v2HN+v8=hO=%mq$Al2;tzQ9$3S!W8#Rf3K2$W6t``{#0-3
z!``22*SsEvX7s>+YCrVZc)rl@9(W9`?$8y#e9=&gyj^~`v{0=2W0W7ziuS2$^7U%G
z-mhap0XI=$mt(r8kOK4M_7kv{<^9~sIWNbhnlQgn-&BH*Hk<=Mc#qRS=EC*`_5E)^
z+Op*1g}RI;47W=k;x^a48*|0#yNfmia?zghBOzPiO~)SZ-h&;H^EUsk!xnbzLeM%}
zxW0De_+fdM`O4#s_P^q^YatL(|0D*QxGCf9oTGRt<UpB=$}aYm#}=;z<IF1LtI4}d
z2X{bz4f^Yqw0b7~)3bNO2bE&T&lV@1Jw)Hp9&eb<lr4YDC5wkYo)P;DeJeXbPnk7>
z!8RLoT;B*Lx#UZtK+B?{Sad2P@8=`4w2M*I1uLV-QQd_Mv_OBJLwnnzYipCkd(YVr
z?Ni-XfbO3Om?~-SSFB$jK>he>+SW*iOU{GadMC(Tn<N6XES;RmYkSxfGt3x=6mV;*
z``Xa*DSfW~u4Amx=sk?*JL|~nctd477wz$df?$>E%0da;IOHE<NVW)Ua;IfqexgX2
zX3M<!jJyjuh_IJUXym&3e@$I^JXPBl-<f_W)NL?jcFp7CJvVb9E;2-gOp&2Xx4O#o
zA`~~d$k-s|J|sypX1-iQk|EwJLq8V@FSGZG!hQQ3*L$5m&u5*z*ZS_Y*7>fr_vf=g
zB1QRDX2*`rGl!ZQ%{x$23?ErUnn}*Z^{>z6;U%UR@;w|t^Fc*AG2>$D{)@?x=Ao~4
zA8vu@WF1Ah8mT-yKvCdsn^{DgdJLl(Zj&ck%uF9_NeoIi8^I4CW9FyO#!O*N-$!Kk
zkl@!Xe_2)+@52J)aPZQdixgE0xp}ET#GHQmwP#}4FbXyp-yEA}RznlqTc&mH=)!A%
zb6zq3BO?Y+h!M9s5IikQqxYYc{^P1H&!}rymwHQW2s{qb_-6(zI8Ts=J|>rVwa|EB
z47%U+pI6G6%i273R<;0#al5P($<qUO*^8el@u=8n*BH&LnncGz_fa#Mwc2nCP+Tm)
z?T*y_Hjhox2lP2&+C=M(dn2lGn=!F`$Z)p<>NdU?40`us`z{l?4I-zLZpb5&*-SUn
zs`E`4gV(Q!L+qQRUqHrzuijrUueCcyZ0O{|3EgE7Rce#B;p5%OT7(5*>7O9Gg&~HY
zaCmf^F#I#t;KCVp>&sWx#6H^o58N{SUdhUD&gSsqsz*GcBbR7b<|nhd;7+n7H79HH
zVS(bhk!UbzD(tA<$P{)xo-B^D+=pax8HXzcjW#UvL1$Z1*Lgh(b*8G8<5>Z`#XG%I
zsU^uNonKEy=kP&PH2G2zBb+?RX!(u9Lxm8a;XtMEfGoLpY_(H9BO!^gR9>#wJ(46t
zX=r}*`;5lpN1pu@nljCJ50j|wTM$LcClX7?usL?xWKJwg$|*Kr85N-)AWvl1!gtl<
z@F~^p-Rz8PQz4)x|F+yw@=W2FNm55+3C0qxBYoc?KgF{9&LKrlBQY#X1PT5TDrFbQ
zvV2nQS2@NLVH`asKZ!Mp-3wg=$8PZ5yWe?{i>u}u7cV^bUr%9t*X;yRcs>)6Y?xk7
zl4#kqElJ9P^notAHT3r>E;21n>q?*-O$v^y04pg;BUxeTgRT;}(2<*PkUJc$5*!h?
ztx6p|!UhJ)nT@dc5PO#KpFM6u5^>88#)Yru?A1-#+yWtz>R^7u9n<|lO(c!{NkQ+u
zjQXQ=avVtk;;zPf@6s@XVm!`TDOh*)<~3MVuB$E{g7XlaTm+rnr>WK!_Omii(V6`_
zGrP-`8Ik56=k)W;G&kDshyV3G)OZKzFNQ3+J8VgYlwibm09r0kRz5h-T|(@lGt6hR
z1*WEU=cr~;d2};C)cJ=uTLo`eWeB^Lw-P85v8XsDam~Gf_J61LzZj$MrPL3qIE=ZW
z^>zvyuunKKzq0Z|+YxrVTqHeX>5}k2>^YFSQ?;zvJ;rmb<kpM}&H4G8U;d5@W!nLM
z=fBCyFF1MaKAWjQp9$oHZE`u*r@1p+U7t4x;n(Y1R7<&%g6}n?_wf6yaI%0Wwrz8b
zBa6ABlP0F|st6=U-PSbpPDz%&QHQ7daO+>(PVQartqdy}Phkc2MT!dPj-7LEkBD_A
znmyw=5mMm!am3NdMlD818jOA#wrZKM>Sny=`TPJEW6A?;-UROA?e3{r5+Wsw#3GqP
zAnw>9hQWTN#^KU+qoB#sU(dt4K!3*@!*lK=c16y)XLKh~WnidW-7rwqyO^u0kUfj-
zKo&p%S$gW9E-Dh$t?C;SjP9H}WHUqkMV{BSX{I}Y&0grO9%l<<JESnu?VK8@E%%md
zyUU9S6~<#<A`_e4xLb|Lg$v_5{Q#)=tztl{U9SBdK1)|mNQO-aQH>I4;pTsu>Vw5l
z+(@)YCE{992;88q$e$}*b)J;TNyCL+Gec~iuyGg-e;MmREp2XTTnwePW5pvg;Ryqq
zgdaE)4INX;C&23@br<7(WwV%>5-(o*LE6SK81Bia`0}|Sk7>QvSWKfbb(y0NAvA5i
zp88n}4x2(Gng}L72<J_RM5++opFosT9#QihfpVF2pqQv@SqF1Wl)BJ{j9vTNujbNU
z@M@b2eLafHj{!KZy)XQ$n|t+zOyk$0EMz1oY+?V6U%TE5QuK~j*WG4bUC&%XBwd&-
zTa0=f=OGj{zE2jHq%kGIPkTrF*&BPLSis}p;yhx$E!hcswn0|Msu!IY9uZe2Jf-v9
z4_8<a+c+*Px(65*pPtk==#gvJvgn#kek>?4i!NLM%;_Ie`BVm<&yzGlGyx>ND5)YZ
zq&ycCpGRdTSJpBj8Z<Sax1tic@NZ`}qN{XaMIpr$q5^;~!B25UX;MZpja+3;-?b+k
z<|6>2IIegS2v`3|d}lU0E4~WHLPTq*qqS<M$qmwdWl4+3f&rjeqZyDf?RY+<Z&X1<
zObT$Jl05UsKgbBW0npPEGK>|6ZUC<kq*h#Cf`#?BG`8LZ+SWU8Y`d#-xI9M=W>;j)
z>WI6Q0%1KDC$Xa$YGE-r=4)IY<>d|G3X6m1AlGF{f$#&+OCPG5d#U!hE#LU9DDz!Z
zKKWvugXFogv7>QY`uGx<NN=Tl)NsR?)03iEKGUn-q<j&KwG?VM(1epDq+97Lj_rfX
z0iUS+N;Ox>J%2wp9w=gpR5Q5%#?D$^RS?M>h;8yP`&Oeh<JO#psoY;(@`=k{T&=${
zKdfP9)uu4}nN=ie;lpD!gKi#RoSc5K+*Zs{$XUEJBo1~Iw!VB=$m|$!mBef-!NjN~
zp;91_cpn8Lile~%zj6%-OE6Wd2+|=uip|1)mPKEHW6U-@#_L~vPT4Dzr42V8$@MRy
z4c^<H!!P>7ibi1F(Q*H{yYoG=7!(n;jiGv~MY`|@#bJvrg((*O-dq)VH~94=84c!4
zBkWpT%6Nk4QkZ}rQ0g<Xg}ol_h7*z(WVh`1?M(a5FQ`2zzVwBgiHJ&0zOo1`nYmt?
zV#i&#{0zYt?L9|ZDT?szMHT6#pFG9EFA%oakGWjS1l?{s?n2_2PD@~Jge>POW5U|E
z{Q>Evdj-E3B2eZqVcTmTA;;^iDHMi@U}eHC|6k3z4apCwdORqe3H!gn!Z|O_g!o<N
zw*#;pVUm|x&-@gL6me$-_0@ReF@$r#N66W)Fo<jmJEpjZFiqZV<pQi*r-WRIwad37
mx4a7+GdEoj6iH%x@~RO?_-K9}7ADb<0q`bP#?OwpNB;vSH&06d

literal 5679
zcmaKwcQhN&+sD<65fVyMrKCtvVz>54LX99&YDJBr_J}>&8nH)>5R@84MNz9ITCG*P
zX0<44?^;#6_4>W<pTBe7Kkj|bz4tuNKhHhS_j^8Z7=yb&CT=DwDk`9kHVS(YJN~l(
z^cQ<eX|n4@xazBE=6lc6(Ko;r??9zt?`h}2uj6j}$N}qMYais@<Dg7M#W}2l(l8F3
z+_Yj&w9>r#V&<O3B=)^}>J8m1AkprJ&CCG60hiIs8<q5t&rn=Rx{|e=d~!}Bn)5Q9
zaN)9!;s!gr2(Z66fV-q2tb{s%53pDIUb8?w+^PU$v1N6hFJtO4_~Lti(3htJ=R)c3
zgDQsuLH&2m4+qbF4<?eyBCR%(Zv8e0NeCK1AIW%ef<jnew2`d@8_6sX3q40f>wiCL
z#DZiT`@6@!`1|?!W$KnZXnX^2+=d_hxD?}hboJ~h?Z3p^&%c2CYBPHWm3|C7?4S)S
z<=8>rwHV}maohw}kN+bB?OodAZp_b^;z<(fft-=472pgWXh~>V9TV@+f@jN9eBDb8
z7XHu2>hath5j`z|b;Ad2K;UB)cLZ_o3=_`cn$3dBvrK8=_c@&)Co@h@Pv4py{4-VG
zZ5jW&6>DrRtr<|%Fe?ncBXZ&-%N-M8DAk#!lh2}pj>hTyRLw-Y@j^l@;vBq_lsS75
z)qdTT8D@D}Dii_QlsRP&RSJqu0GI`03S)>yR&aVKQRp}j!xeZZtz;w73{iCK&bLCE
z+>)g!H+&K+40SZ~GUg@L=NTM^3f#ws*h)fa+1^TLfkKX0cOC&h^&$#734jCMlkosy
zmd-3tD>m+NOhmzi8_WaR-6=gM$YT}*bmNV`<n(F*iA3f}{k{KDjP?YGj<&lr<0qaJ
z?1&AO$D0eM7n(t|qXNGQavT9yQE!$HjKscf{2Awd=po3VD@1MI;`GCOJpYKuL|ox0
zKhFwls=?_dvPC+ZpyEN07q&-2s;o-}!tZGYLO6S$NPYjyPBg)6G0ShO3*Y4MDPzb2
zZAnghHuCnq1FbaE^$JLRPkJ)8jm!-YBesh)?>pA@5OxA3<=Q1`U?J!Hn_;zv{eIRg
zOFf{KJb(ijx*?h43sdXmvg??24dL#E3BQSwKa7K16Vfe7C{X5}#}S=h395Gr8tI#4
zrrXi%UzXQ+xVq%dG=XgJJ;R{?RK?)mMzlW`d>wIS2I$CY#jkO8)qKV{zRyiyxA_TK
zpQ2lmzVdp}WSg;LaU?Luyp_y8A4v1Y8KL-9=|}S1(8e%kW&{6^S&9Y3fBcboDg50-
z`Qj6Q;g!Y|dsX7SLNWgRDu$7&lu2dOtHL?%0QHIW&DjDT7KgaL<8ddx_`;gAe(ws7
z-bYcVLmTf4KO~Ht8r;G~ib2Ktq~*M&J~r~gyFUF|ZM9V2>rcS^<PyoqZNyl-Xo|rp
z#tv<~sQA92%SEk(rl^)e2vqv!QaiPnrYX@<wuXTyJmGHpU4=T5<Ks6veLG<Zen&9k
zQ)JM$-H912{MX%8zYQ~nDX5Dc1^1v*kHtlm5XWUFL+rvO=ifSS`qMie*x>ptfS351
zr^~D87q>{pza=Os8TRei`It?ZT)3}ex4)PPl1_Fehm)dZIwaonoF|^0CiXot?0#U$
zd5Adv*yoKC^y4PFMxCOA8ulM`^RI8#3wBzVU{j!kLT|MECdCNN=aDDAG_rx=3hu6$
zi1)J%CH^R5KRB~a|6bd=WO0y&cZNbYs->zXoc}LP!BQ$^+m^Jzm!h)A`YihVcA;wi
z9)s{xe;%b;ebpeVKBKl|>mpk5joFL|HXZ1lp&kaPeVQf5Uxs>C2@217<JtQbq(Ktn
zTO*j;rkcM(GFgd4kJF<F;~5()4{8)$@koHpKPIF^C2T6jQtj)3=bOgDXoQMz##R82
z5=Sqc`}wDt1q(_4HFX5u85hvNf3$_=tM#3quf>7dFce>so`9xUBtGlx&g~%@+&~Zm
z@e1<WZ&%@`0X*$SB_^z0AGe^SGIvF?1FyQKF#<h#Ko9KVHUxYyLRyOssGx(jiJ54G
z`Qq)~{YKx|c5Uf~Jb6<c=HWKrgJ*{0b@LRGo~<!0duMG0lQW_PxDN?-7A8ILR!C+G
z_4sk_eZ38@z*c!zhG2}34$K99K1O>S@Iyo>1YR`3y$<2<ge_-EPH`jJw^W~~ci27e
zHq_NKvhL(n=3AKXsTz~k^BOrRUNWM_+a<-d#$Y#SzV!v$q)+KCuVuLU8%AnsTRs5h
z^hr-5!mi5t(GY(Scx%=>*6aqWJ=_`%-{&?=mt1OC;1V`%<mp=RPFxrVUjGz@ca{>O
z&^8C?*X0=-A0g8~BgayHpBjPJ@y^*uIMl0q)cyV>`%Di24jwgadCc9rVl~j*gM{0T
zA6q8Os&y!=+Ev&iHf)^A4kIzqR`#Iipif;;qX(qHz*h@6-1BOEG}}%)RqL(K`(wU(
z#l|@c@~WaG&qonFH#Xmn)&X{HF^~K${Bvu7O%P{j@wSZ%`@#=Gh|SEJU2tFr+F2(T
zcrL`|{;d7=CtrnsD!a=V4<!#`u@ChXBVG#-<?;qkMk=9N%r&Vs$kMe<rB3T}34^CO
zO~X!7bl>*u3FAu6u7vt-@Y<c=?vivSLDGF;cF$a*eVWwG(gE}{#t_5+`L9w5%G-jP
zC@n9w!t!(6Qt^j4^&ChnnoIt>{H*ryGs3Cc9o>ee1e~Jw37ZeVJZ4z9Zd6pnbZ!bP
z%|#tEI7|PX`)tc=y8Z|1hx2t6>5t@BxO(N2%fGmGJnc@n8R|tJtE&99CWQ1pUr=7m
z=ow1W8xJZMjpKK|FCE81i=Fy;W9lwx05p1+WRbNnY-#w;JUJsx{?}3MPQIJPwg8FC
z$d0DFq<q=b)ak2<%mZmKlm@=us#9&1ydYl@Tss&$z%HfIL6d)4hh>^mT&;v-*W#(x
z-c4x23zgd^)`AE}lH}(uS|;!)9oKu(VJvy5+iI=m4;#juwwYH`YjzcVB<H$^l%nzy
z{PGrLLRm?4xIX>s$$xA10z{y@6Kl86p_m*8kBhNqam&f=36^8dj+ARQYpWvJvTX|g
z6o*}_2y=Dr5qcHHpAjp@1eJ}kWJrV&674HNfzCflqP!Gqm`kE|ELr1UFHE)F`9|Ss
zx2IBLY|M1uvna)hF~d3Y4C8=FTFAb_=$R*!c~eBm+a6<Sk<J49IQ@|ruX$te2X5fC
z9Vm3Y<%LSWqa<Wv{at1RZsvZWno<&0$IoB!@^1I`y}Tma<Q$X~!886Bsk-t;{a8Ep
z_qPz9SDCSBrLn|h9FwJKX_|;rS_jC+GjWc4AW(2>pSE2tVx&hb<zEEf5O|B(TO4Bh
zet79f*|}2N9YuaVacxpx^JNu=(ESw=_9T~oXT~dV)V+x>#-g2Iss`rIP9_fcL1t-Z
ze6D|FAb+TAsvDKg@}y{4addJZvYIdHzQ+YmAmLFHfwa~I)|0&tqQdDUC|||%0(39F
zfrg&C3I-_NCGCKWw-j==dqor;ka|kgY1|V<e*pCsR(fPwkN>8>5>2cM1fF{-sOt5W
z{Eh1on(hz1l~!@<9-@1gIz2oHJN>S_ZI)7f?TYFm^wG|E2GjS5!Z{C)$Sle>#18MQ
z+_t%oPijKw)uHoTsN1XbG#jln9|uWn(rFrn_Y9VzSPR~7BfE`dQj5*MsiH_Wm%(IU
zL%FUDj8?#}%!4pOzck@IR)0I2y=`d!Akki`Y{Rph{`Z<$Q9l5D`<je^wRVtylU6jS
zZOWl2kv7$_{Aym4?$v|KeUzZf1B!{ISuR?)yd=|YO+`qGjd7P*P12XJnOqS|SgED7
z`vNBVavYjDB?bW5r(z@~5mHgVfrN>&wNj=2dK%*$L&54NIbgN=U^o3BtI_6evC!BD
z?bbZ-D}OVqX8fpVwk1DYyRv0t@1{Af5eQLy5|}z(aIFfuA8}m&bDBj`;>jIw1FqaG
z^KI)+KtMzFp~vf+&cac7Pye)I2EhJD{x8BevfmnOP;fIv^3W@0B<tsfV=<C}cMAMx
zmsi<t{<3CLnq>>%Qqf4GR*Ih%BOR=&zaPoU8z6w_x9PvK;)>#KEj~a~X4Dv!a{ee`
zV0)d>M46CLep<5_RqAb4Qhc(b@g11dkpj`sArRP;h5S3=yfoYm2#;J-7(-RiP#?O4
zbg%gIx9<ztKALwu@s(~|^hN1Ph`qUmqk+?&h!TG?*=-c7RJ3<qzW0Sit9iy4pwXc?
z3xfry2hA+}HphND!|VolUllEVarRnv#W3cGwd$)SXBTtny4tGP^-&-X+C&;$%W4_*
zbc6<{){I^V@c#SfCZYMYaB1CfE?{PzNxb*Vo|0yUUd^L}+Yun?fLnC4jzVlFp~<JR
zxm-2L0tIKRy%H!dY?u{RRRw7VPkNQ>;@IzmAoe*-9Tp&Fr)}HjzNjX#jdsuOIPsjm
zo0I99MoF-G!yPA%Jck#tBV<QuC;<oh7~P$Kq!_cM=soH%<LfOmj83uPz$$X;!sBRf
zBYKD+r@a;t3%%886$n4c%Xe)*Yoh~P>;caGv1YQib1!l)c=`76%XAmV4l_hp&&KyG
z+kU33`F{q&hQZUx)ra{H*aH|uHy1nKoa9DgfupniH??CgW;L(#*9<0TG1B*X;g!R{
zFkH^9eJxU(@~Oz&r^j1cRBemNAPBJXB=4dpWHW#Z*}-dm^GW{Tp}so&?J2uPv)Zy-
zUU4V=bP|T3Ri0f|H%gWtGoE=~eV8}1{yQ`|UC0BiQ>(J>Gl15KrR#X{`anyV8~dJX
zC92B+V0Bj%N%1ue!<7pfA0|@W{pg^<{WUmSHu88rE6<U67j~U7MQ>c@lUnP^xxiTf
zzi!h%l#Pp{Ck!RIekpB9SokK)OzogpDOA;(==E2}jNw-j##lySot{-1`eA7#Pc?s#
zqi3M@C#OxG1*@D~F^q&tY_E(1BRt;fU3#WL8C>z<`Ku#+xLJ84aDSCL0#7bq!jxpW
zz)TQM(kjd>4BbL39ZDi|FZMa}2ffP<(RQI(XsNOOK%Ul6gN~2aBeb=)UlE#@TU_S`
zaL&ArLdNGRwX!nhY9htiE{^<h*J8&IPF46`YD+>Mx`p{va8nHj|FEJ;2#sE0-{-66
z7TG`O9aPjU&;AO~ut})k^7^tTpqejGV`xz3fh#)c3iA=g)}|tQuN5Xj3;}t>rK_{%
zwr?Jfuk9*m<<F0we;};?3*UM6;Iqmr@5&B0yU?L&fY2Xf88QgbE5yV#FGc>@9EOq?
zC~SHvu*vE3q!9)BVQ1R=;_Gb$R0Du`sizUw%^Hr^rT$~LRgzDi`&$!uY(sm){^0({
zpBD`ekM$vvNi88E2IJXs9~@(({8wec=QErQ%t}i6d|s_XCJ{5;SmMN*LF$N>Fxdj2
z&znWpNwbJ$Zw>vfu5fEMR|sp6DuBGq_%hq2G;=Yj!|p#isk8WbuD{;;hBQltyj*FM
zr0$<<m@2N;gwQI^9zxbDA<_t1P9|ls8TAfC*n{iqQWiPkQkH3REwO)QMH~KLSUC<t
zBl)gM26}QhNTYCrxjN<9D8|CNMF}KjktE}1fTGmv9qeZ<|8tvD+l_7sN`B6cpS>5k
zwWt5ZJ)0rzW4?BpPF4Pv(B4+W-a9z^dR+Hb=8~c<!$vdLUPz-vM-!w1Y<{i*sXl=E
zBS4eanbX-8?5F%C?r4t-pvS8NPL62haZ0eKD-V)3S{|8jqGIk(+m~%^%9iFBO{Cl$
zFqY9#95b$<=_SokF+lkIv5_?L!G5XLH>Z~q&eZkbYsEQnGId%v2raT11iS>D&<#Db
z9dk%6P$rs>A0G{<8&!O=5>`V<`PlAqV;d+0iVpVFBdZdv<t_ZeiCVu=24LGp6Tdk1
z3bLc!O<KuNp~6bP$h~)+m(aHljC8`-ma}QyzuC%uPQti2Pk%>$xwbB}zcmDY!XN#!
z)oU{{s`)<k3XnC8&h)J~=rhu!PUeg97`o!ZDl*Fi-<u5l`>@SGxFyyUzIHIF#oF-C
zdVsun511^=T35BSjB%R<tqu)gUL|ic@~$(NkFcz-#~+_Gi)XccnboYETW$fJw1z6y
zjgHBBx|LGbeP>VCO)R#LTF#{keUnxsJBknytTSZ_HgCS#!#}cFUoNZn(BGm5(Vf`;
zn!+nt)Gd^b{er3mjVMY&Qn|?&difi0fdIfUIQC$&qYI2ZqBYi@7p*79kpYtPU`P~B
z`r7e!bdsPQGM<pCMk!8jfis_n3vnPzx~g1yOAKty%CBB%wRAz(*5G@b9YV70_E1vO
z1RRZ)<A?*bcwP4wmoG3nynEE-O?Es3!7}3(Nb&BxlC^TZoAshD<};omsO=W6qVaD~
z-QtL3TsgNsU==!!xI7*ZTbpSvmt`o}2-eLt_+#h6{h4<E+vBF6V>)sI(m8po`hcrz
zlRf$`Q@+iO2-l!suX2WAw1p}Q5Gg$&uj139v*-bjdgqdhTfzWDI#QWlLsT<(`@$x{
zrq25LV=RQuVUe=1xyOg$4y(^jkfr~dpQ=B86}$vKBhPPo;dYUizZtlKBT}DhJqvl5
z*wd*<f6kW<^b*|SSIk}}e%<t)C$xa$i?7SKyJ58D(qT~8wInT}jUG-d{{k`648Jdi
z#<ZTr1csbj%HAbA)-ztZqEytqf60UWGu;szXZ(ek=R(ARG9A39I8NEh*<WW`B32h?
zY!{h&TSH;}1~D)~G_A#edr>uB=jIstOa1AN5G`x=JftS#ctecT_jpSA!nF{`!bL7B
zr7;#NX8gSM&>Zr)hSeg3HAf!6p&eUTSXiFB#^NfZxClok&YLkTsW3RqM=;_EDP^Mn
zw&J(8wt#LTOt!oj(X~wlr$x|XVMKSXa(etHtMC^O&3p<KBB{I*<S;bXeEo~%{02n#
zulwL%`df(*+8f5SUP?LXg02YUm{8p)Fd16kT%<16z5jjt$1>*~E1vL&U3WiZNjbxB
zPRi5++1NZ6OC7~7d5P@WWxsrV7d3U`(#+}c>hrXlw8?VFLCJo70{9YyYBIY7$=e4n
z_FTPA74839$pPh*_!lO@h^YmMhrLW(-co+j%%Umn^vlz|BFd@o!JEUfej6D`tYh88
z!xOp88&kL_omR|hhQy%VV570%z31uE7nsb&=<W*$rHj8To|8UR<_R-2Z<De9a$8ES
zB8z}{yVJ|z)k1u8su)VCcL}eS`?F6!Y*;HgDQmyK-l$}J85+UgE?bV_^70W@{x&z8
zP>9lx0f~QVs}&QZli(7C+4WInF(c~1G?Ay}@=Js6#Ta&S*M8tzG+=nyvS4C!u0HG7
zKX=aXY38nuJz&^FN?mu3@F1#E%R_S9N%lmfUjlL$z@X6N1%x{Wxw=n$=IRLiRFDx)
zC-B0x)S*v13dEu{-17fX(EmoH?UHAPVV9_q-f;^!OLHAu5MU}DO#@UF!Y1N>0Q+#1
A;{X5v

diff --git a/book/theme/favicon.svg b/book/theme/favicon.svg
index 90e0ea58..05dd73a8 100644
--- a/book/theme/favicon.svg
+++ b/book/theme/favicon.svg
@@ -1,22 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 199.7 184.2">
-  <style>
-    @media (prefers-color-scheme: dark) {
-      svg { fill: white; }
-    }
-  </style>
-<path d="M189.5,36.8c0.2,2.8,0,5.1-0.6,6.8L153,162c-0.6,2.1-2,3.7-4.2,5c-2.2,1.2-4.4,1.9-6.7,1.9H31.4c-9.6,0-15.3-2.8-17.3-8.4
-  c-0.8-2.2-0.8-3.9,0.1-5.2c0.9-1.2,2.4-1.8,4.6-1.8H123c7.4,0,12.6-1.4,15.4-4.1s5.7-8.9,8.6-18.4l32.9-108.6
-  c1.8-5.9,1-11.1-2.2-15.6S169.9,0,164,0H72.7c-1,0-3.1,0.4-6.1,1.1l0.1-0.4C64.5,0.2,62.6,0,61,0.1s-3,0.5-4.3,1.4
-  c-1.3,0.9-2.4,1.8-3.2,2.8S52,6.5,51.2,8.1c-0.8,1.6-1.4,3-1.9,4.3s-1.1,2.7-1.8,4.2c-0.7,1.5-1.3,2.7-2,3.7c-0.5,0.6-1.2,1.5-2,2.5
-  s-1.6,2-2.2,2.8s-0.9,1.5-1.1,2.2c-0.2,0.7-0.1,1.8,0.2,3.2c0.3,1.4,0.4,2.4,0.4,3.1c-0.3,3-1.4,6.9-3.3,11.6
-  c-1.9,4.7-3.6,8.1-5.1,10.1c-0.3,0.4-1.2,1.3-2.6,2.7c-1.4,1.4-2.3,2.6-2.6,3.7c-0.3,0.4-0.3,1.5-0.1,3.4c0.3,1.8,0.4,3.1,0.3,3.8
-  c-0.3,2.7-1.3,6.3-3,10.8c-1.7,4.5-3.4,8.2-5,11c-0.2,0.5-0.9,1.4-2,2.8c-1.1,1.4-1.8,2.5-2,3.4c-0.2,0.6-0.1,1.8,0.1,3.4
-  c0.2,1.6,0.2,2.8-0.1,3.6c-0.6,3-1.8,6.7-3.6,11c-1.8,4.3-3.6,7.9-5.4,11c-0.5,0.8-1.1,1.7-2,2.8c-0.8,1.1-1.5,2-2,2.8
-  s-0.8,1.6-1,2.5c-0.1,0.5,0,1.3,0.4,2.3c0.3,1.1,0.4,1.9,0.4,2.6c-0.1,1.1-0.2,2.6-0.5,4.4c-0.2,1.8-0.4,2.9-0.4,3.2
-  c-1.8,4.8-1.7,9.9,0.2,15.2c2.2,6.2,6.2,11.5,11.9,15.8c5.7,4.3,11.7,6.4,17.8,6.4h110.7c5.2,0,10.1-1.7,14.7-5.2s7.7-7.8,9.2-12.9
-  l33-108.6c1.8-5.8,1-10.9-2.2-15.5C194.9,39.7,192.6,38,189.5,36.8z M59.6,122.8L73.8,80c0,0,7,0,10.8,0s28.8-1.7,25.4,17.5
-  c-3.4,19.2-18.8,25.2-36.8,25.4S59.6,122.8,59.6,122.8z M78.6,116.8c4.7-0.1,18.9-2.9,22.1-17.1S89.2,86.3,89.2,86.3l-8.9,0
-  l-10.2,30.5C70.2,116.9,74,116.9,78.6,116.8z M75.3,68.7L89,26.2h9.8l0.8,34l23.6-34h9.9l-13.6,42.5h-7.1l12.5-35.4l-24.5,35.4h-6.8
-  l-0.8-35L82,68.7H75.3z"/>
-</svg>
-<!-- Original image Copyright Dave Gandy — CC BY 4.0 License -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;" viewBox="663.38 37.57 575.35 903.75">     <g transform="matrix(1,0,0,1,-31352.7,-1817.25)">                  <g transform="matrix(1,0,0,1,31062.7,-20.8972)">             <g transform="matrix(1,0,0,1,-130.173,0.00185558)">                 <path d="M1083.58,1875.72L1635.06,2194.12C1649.8,2202.63 1658.88,2218.37 1658.88,2235.39C1658.88,2264.98 1658.88,2311.74 1658.88,2341.33C1658.88,2349.84 1656.61,2358.03 1652.5,2365.16C1652.5,2365.16 1214.7,2112.4 1107.2,2050.33C1092.58,2041.89 1083.58,2026.29 1083.58,2009.41C1083.58,1963.5 1083.58,1875.72 1083.58,1875.72Z" style="fill:#706bc8;"></path>             </g>             <g transform="matrix(1,0,0,1,-130.173,0.00185558)">                 <path d="M1635.26,2604.84C1649.88,2613.28 1658.88,2628.87 1658.88,2645.75C1658.88,2691.67 1658.88,2779.44 1658.88,2779.44L1107.41,2461.05C1092.66,2452.53 1083.58,2436.8 1083.58,2419.78C1083.58,2390.19 1083.58,2343.42 1083.58,2313.84C1083.58,2305.32 1085.85,2297.13 1089.96,2290.01C1089.96,2290.01 1527.76,2542.77 1635.26,2604.84Z" style="fill:#55c5e4;"></path>             </g>             <g transform="matrix(1,0,0,1,216.062,984.098)">                 <path d="M790.407,1432.56C785.214,1435.55 780.717,1439.9 777.509,1445.46C767.862,1462.16 773.473,1483.76 790.004,1493.59L789.998,1493.59L761.173,1476.95C746.427,1468.44 737.344,1452.71 737.344,1435.68C737.344,1406.09 737.344,1359.33 737.344,1329.74C737.344,1312.71 746.427,1296.98 761.173,1288.47L1259.59,1000.74L1259.83,1000.6C1264.92,997.617 1269.33,993.314 1272.48,987.844C1282.13,971.136 1276.52,949.544 1259.99,939.707L1260,939.707L1288.82,956.349C1303.57,964.862 1312.65,980.595 1312.65,997.622C1312.65,1027.21 1312.65,1073.97 1312.65,1103.56C1312.65,1120.59 1303.57,1136.32 1288.82,1144.83L1259.19,1161.94L1259.59,1161.68L790.407,1432.56Z" style="fill:#84ddea;"></path>             </g>             <g transform="matrix(1,0,0,1,216.062,984.098)">                 <path d="M790.407,1686.24C785.214,1689.23 780.717,1693.58 777.509,1699.13C767.862,1715.84 773.473,1737.43 790.004,1747.27L789.998,1747.27L761.173,1730.63C746.427,1722.12 737.344,1706.38 737.344,1689.36C737.344,1659.77 737.344,1613.01 737.344,1583.42C737.344,1566.39 746.427,1550.66 761.173,1542.15L1259.59,1254.42L1259.83,1254.28C1264.92,1251.29 1269.33,1246.99 1272.48,1241.52C1282.13,1224.81 1276.52,1203.22 1259.99,1193.38L1260,1193.38L1288.82,1210.03C1303.57,1218.54 1312.65,1234.27 1312.65,1251.3C1312.65,1280.89 1312.65,1327.65 1312.65,1357.24C1312.65,1374.26 1303.57,1390 1288.82,1398.51L1259.19,1415.61L1259.59,1415.36L790.407,1686.24Z" style="fill:#997bc8;"></path></g></g></g> </svg>
\ No newline at end of file

From 39ce82b7a59de8adcb1626151b1ce8fe7b7a4a8e Mon Sep 17 00:00:00 2001
From: lesleyrs <19632758+lesleyrs@users.noreply.github.com>
Date: Fri, 2 Dec 2022 15:02:29 +0100
Subject: [PATCH 589/884] Add Ctrl-i alias for Windows (#4961)

---
 helix-term/src/keymap/default.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index 118764d9..c0d17a87 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -198,7 +198,7 @@ pub fn default() -> HashMap<Mode, Keymap> {
 
         // z family for save/restore/combine from/to sels from register
 
-        "tab" => jump_forward, // tab == <C-i>
+        "C-i" | "tab" => jump_forward, // tab == <C-i>
         "C-o" => jump_backward,
         "C-s" => save_selection,
 

From d0bc38d6fa60e36ef317e8bbbaa11aeb30470ecc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= <matousdzivjak@gmail.com>
Date: Fri, 2 Dec 2022 15:06:35 +0100
Subject: [PATCH 590/884] feat(lang): bump tree-sitter-go (#4969)

Update tree-sitter-go to latest with updated support for generics.

See: https://github.com/tree-sitter/tree-sitter-go/compare/0fa917a7022d1cd2e9b779a6a8fc5dc7fad69c75..05900faa3cdb5d2d8c8bd5e77ee698487e0a8611
for full diff.
---
 languages.toml                 | 2 +-
 runtime/queries/go/indents.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/languages.toml b/languages.toml
index 4eb8a4da..9664d93a 100644
--- a/languages.toml
+++ b/languages.toml
@@ -301,7 +301,7 @@ args = { mode = "local", processId = "{0}" }
 
 [[grammar]]
 name = "go"
-source = { git = "https://github.com/tree-sitter/tree-sitter-go", rev = "0fa917a7022d1cd2e9b779a6a8fc5dc7fad69c75" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-go", rev = "05900faa3cdb5d2d8c8bd5e77ee698487e0a8611" }
 
 [[language]]
 name = "gomod"
diff --git a/runtime/queries/go/indents.scm b/runtime/queries/go/indents.scm
index 8bfc7c3f..f72ec9e8 100644
--- a/runtime/queries/go/indents.scm
+++ b/runtime/queries/go/indents.scm
@@ -5,7 +5,7 @@
   (type_spec)
   (func_literal)
   (literal_value)
-  (element)
+  (literal_element)
   (keyed_element)
   (expression_case)
   (default_case)

From 59b886cf5e89dadfd73d93b638b2c552ce5537f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?alex=20=E5=AD=99=E6=AC=A3=E4=B9=90?= <alexsunxl@163.com>
Date: Fri, 2 Dec 2022 22:24:00 +0800
Subject: [PATCH 591/884] nightfox theme: Use brighter colors for diff scopes
 (#4966)

---
 runtime/themes/nightfox.toml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/runtime/themes/nightfox.toml b/runtime/themes/nightfox.toml
index 131cab19..c4cbbce0 100644
--- a/runtime/themes/nightfox.toml
+++ b/runtime/themes/nightfox.toml
@@ -140,10 +140,10 @@
 # Diff ==============================
 # Version control changes.
 
-"diff.plus" = "green-dim" # Additions.
-"diff.minus" = "red-dim" # Deletions.
-"diff.delta" = "blue-dim" # Modifications.
-"diff.delta.moved" = "cyan-dim" # Renamed or moved files.
+"diff.plus" = "green" # Additions.
+"diff.minus" = "red" # Deletions.
+"diff.delta" = "blue" # Modifications.
+"diff.delta.moved" = "cyan" # Renamed or moved files.
 
 # color palette
 [palette]

From b677c6a019f893c7ed8b9b84d136c50e5445315a Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Sat, 3 Dec 2022 03:05:15 +0100
Subject: [PATCH 592/884] Add logo with text included (#4973)

---
 README.md      |  10 +++--
 logo_dark.svg  | 115 +++++++++++++++++++++++++++++++++++++++++++++++++
 logo_light.svg | 115 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 237 insertions(+), 3 deletions(-)
 create mode 100644 logo_dark.svg
 create mode 100644 logo_light.svg

diff --git a/README.md b/README.md
index 3555b539..b06e8222 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,12 @@
 <div align="center">
 
-<img src="./logo.svg" height="128" alt="Logo"/>
-
-# Helix
+<h1>
+<picture>
+  <source media="(prefers-color-scheme: dark)" srcset="logo_dark.svg">
+  <source media="(prefers-color-scheme: light)" srcset="logo_light.svg">
+  <img alt="Helix" height="128" src="logo_light.svg">
+</picture>
+</h1>
 
 [![Build status](https://github.com/helix-editor/helix/actions/workflows/build.yml/badge.svg)](https://github.com/helix-editor/helix/actions)
 [![GitHub Release](https://img.shields.io/github/v/release/helix-editor/helix)](https://github.com/helix-editor/helix/releases/latest)
diff --git a/logo_dark.svg b/logo_dark.svg
new file mode 100644
index 00000000..f6e94f1b
--- /dev/null
+++ b/logo_dark.svg
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   xml:space="preserve"
+   style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2"
+   viewBox="663.38 37.57 2087.006 903.71997"
+   id="svg22"
+   sodipodi:docname="logo_dark.svg"
+   width="2087.0059"
+   height="903.71997"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs26"><rect
+     x="713.02588"
+     y="-304.32538"
+     width="3615.2336"
+     height="1864.7544"
+     id="rect14663" /><rect
+     x="972.073"
+     y="151.15895"
+     width="2140.9646"
+     height="684.86273"
+     id="rect447" /><rect
+     x="897.0401"
+     y="217.45384"
+     width="837.72321"
+     height="631.59924"
+     id="rect435" /><rect
+     x="825.67834"
+     y="157.61452"
+     width="1496.2448"
+     height="861.45544"
+     id="rect429" /><rect
+     x="798.3819"
+     y="-42.157242"
+     width="2236.0837"
+     height="945.90723"
+     id="rect315" /><rect
+     x="661.30237"
+     y="48.087799"
+     width="769.15619"
+     height="828.46844"
+     id="rect309" /></defs><sodipodi:namedview
+   id="namedview24"
+   pagecolor="#ffffff"
+   bordercolor="#000000"
+   borderopacity="0.25"
+   inkscape:showpageshadow="2"
+   inkscape:pageopacity="0.0"
+   inkscape:pagecheckerboard="0"
+   inkscape:deskcolor="#d1d1d1"
+   showgrid="false"
+   inkscape:zoom="0.28409405"
+   inkscape:cx="1904.2989"
+   inkscape:cy="633.59299"
+   inkscape:window-width="1908"
+   inkscape:window-height="2075"
+   inkscape:window-x="26"
+   inkscape:window-y="23"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg22" />     <g
+   transform="translate(-31352.726,-1817.2547)"
+   id="g20">                  <g
+   transform="translate(31062.7,-20.8972)"
+   id="g18">             <g
+   transform="translate(-130.173,0.00185558)"
+   id="g4">                 <path
+   d="m 1083.58,1875.72 551.48,318.4 c 14.74,8.51 23.82,24.25 23.82,41.27 0,29.59 0,76.35 0,105.94 0,8.51 -2.27,16.7 -6.38,23.83 0,0 -437.8,-252.76 -545.3,-314.83 -14.62,-8.44 -23.62,-24.04 -23.62,-40.92 0,-45.91 0,-133.69 0,-133.69 z"
+   style="fill:#706bc8"
+   id="path2" />             </g>             <g
+   transform="translate(-130.173,0.00185558)"
+   id="g8">                 <path
+   d="m 1635.26,2604.84 c 14.62,8.44 23.62,24.03 23.62,40.91 0,45.92 0,133.69 0,133.69 l -551.47,-318.39 c -14.75,-8.52 -23.83,-24.25 -23.83,-41.27 0,-29.59 0,-76.36 0,-105.94 0,-8.52 2.27,-16.71 6.38,-23.83 0,0 437.8,252.76 545.3,314.83 z"
+   style="fill:#55c5e4"
+   id="path6" />             </g>             <g
+   transform="translate(216.062,984.098)"
+   id="g12">                 <path
+   d="m 790.407,1432.56 c -5.193,2.99 -9.69,7.34 -12.898,12.9 -9.647,16.7 -4.036,38.3 12.495,48.13 h -0.006 l -28.825,-16.64 c -14.746,-8.51 -23.829,-24.24 -23.829,-41.27 0,-29.59 0,-76.35 0,-105.94 0,-17.03 9.083,-32.76 23.829,-41.27 l 498.417,-287.73 0.24,-0.14 c 5.09,-2.983 9.5,-7.286 12.65,-12.756 9.65,-16.708 4.04,-38.3 -12.49,-48.137 h 0.01 l 28.82,16.642 c 14.75,8.513 23.83,24.246 23.83,41.273 0,29.588 0,76.348 0,105.938 0,17.03 -9.08,32.76 -23.83,41.27 l -29.63,17.11 0.4,-0.26 z"
+   style="fill:#84ddea"
+   id="path10" />             </g>             <g
+   transform="translate(216.062,984.098)"
+   id="g16">                 <path
+   d="m 790.407,1686.24 c -5.193,2.99 -9.69,7.34 -12.898,12.89 -9.647,16.71 -4.036,38.3 12.495,48.14 h -0.006 l -28.825,-16.64 c -14.746,-8.51 -23.829,-24.25 -23.829,-41.27 0,-29.59 0,-76.35 0,-105.94 0,-17.03 9.083,-32.76 23.829,-41.27 l 498.417,-287.73 0.24,-0.14 c 5.09,-2.99 9.5,-7.29 12.65,-12.76 9.65,-16.71 4.04,-38.3 -12.49,-48.14 h 0.01 l 28.82,16.65 c 14.75,8.51 23.83,24.24 23.83,41.27 0,29.59 0,76.35 0,105.94 0,17.02 -9.08,32.76 -23.83,41.27 l -29.63,17.1 0.4,-0.25 z"
+   style="fill:#997bc8"
+   id="path14" /></g></g></g> <text
+   xml:space="preserve"
+   transform="translate(663.354,37.565425)"
+   id="text307"
+   style="font-size:4px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';white-space:pre;shape-inside:url(#rect309);display:inline;fill:#006400;stroke:#006400;stroke-width:2.66667" /><g
+   aria-label="Helix"
+   transform="matrix(1.3113898,0,0,1.3113898,142.0244,48.21073)"
+   id="text445"
+   style="font-size:4px;-inkscape-font-specification:'sans-serif, Normal';white-space:pre;shape-inside:url(#rect447);display:inline;fill:#f0f6fc;stroke:#f0f6fc;stroke-width:2.66687;stroke-opacity:1;fill-opacity:1"><path
+     d="m 1242.0723,515.10828 h -60.4 v -123.2 h -113.2 v 123.2 h -60.4 v -285.6 h 60.4 v 112 h 113.2 v -112 h 60.4 z"
+     style="font-size:400px;-inkscape-font-specification:'sans-serif, @wght=700';font-variation-settings:'wght' 700;stroke:#f0f6fc;stroke-opacity:1;fill:#f0f6fc;fill-opacity:1"
+     id="path14794" /><path
+     d="m 1399.272,292.70828 q 30.4,0 52,11.6 22,11.6 34,33.6 12,22 12,54 v 28.8 h -140.8 q 0.8,25.2 14.8,39.6 14.4,14.4 39.6,14.4 21.2,0 38.4,-4 17.2,-4.4 35.6,-13.2 v 46 q -16,8 -34,11.6 -17.6,4 -42.8,4 -32.8,0 -58,-12 -25.2,-12.4 -39.6,-37.2 -14.4,-24.8 -14.4,-62.4 0,-38.4 12.8,-63.6 13.2,-25.6 36.4,-38.4 23.2,-12.8 54,-12.8 z m 0.4,42.4 q -17.2,0 -28.8,11.2 -11.2,11.2 -13.2,34.8 h 83.6 q 0,-13.2 -4.8,-23.6 -4.4,-10.4 -13.6,-16.4 -9.2,-6 -23.2,-6 z"
+     style="font-size:400px;-inkscape-font-specification:'sans-serif, @wght=700';font-variation-settings:'wght' 700;stroke:#f0f6fc;stroke-opacity:1;fill:#f0f6fc;fill-opacity:1"
+     id="path14796" /><path
+     d="m 1605.2719,515.10828 h -59.6 v -304 h 59.6 z"
+     style="font-size:400px;-inkscape-font-specification:'sans-serif, @wght=700';font-variation-settings:'wght' 700;stroke:#f0f6fc;stroke-opacity:1;fill:#f0f6fc;fill-opacity:1"
+     id="path14798" /><path
+     d="m 1727.272,296.70828 v 218.4 h -59.6 v -218.4 z m -29.6,-85.6 q 13.2,0 22.8,6.4 9.6,6 9.6,22.8 0,16.4 -9.6,22.8 -9.6,6.4 -22.8,6.4 -13.6,0 -23.2,-6.4 -9.2,-6.4 -9.2,-22.8 0,-16.8 9.2,-22.8 9.6,-6.4 23.2,-6.4 z"
+     style="font-size:400px;-inkscape-font-specification:'sans-serif, @wght=700';font-variation-settings:'wght' 700;stroke:#f0f6fc;stroke-opacity:1;fill:#f0f6fc;fill-opacity:1"
+     id="path14800" /><path
+     d="m 1834.4721,403.50828 -70.4,-106.8 h 67.6 l 42.4,69.6 42.8,-69.6 h 67.6 l -71.2,106.8 74.4,111.6 h -67.6 l -46,-74.8 -46,74.8 h -67.6 z"
+     style="font-size:400px;-inkscape-font-specification:'sans-serif, @wght=700';font-variation-settings:'wght' 700;stroke:#f0f6fc;stroke-opacity:1;fill:#f0f6fc;fill-opacity:1"
+     id="path14802" /></g><text
+   xml:space="preserve"
+   transform="translate(663.38,37.570044)"
+   id="text14661"
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:997.723px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, @wght=700';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 700;white-space:pre;shape-inside:url(#rect14663);display:inline;fill:#2a292f;fill-opacity:1;stroke:#2a292f;stroke-width:6.652;stroke-dasharray:none;stroke-opacity:1" /></svg>
diff --git a/logo_light.svg b/logo_light.svg
new file mode 100644
index 00000000..cdd5ddb8
--- /dev/null
+++ b/logo_light.svg
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   xml:space="preserve"
+   style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2"
+   viewBox="663.38 37.57 2087.006 903.71997"
+   id="svg22"
+   sodipodi:docname="logo_light.svg"
+   width="2087.0059"
+   height="903.71997"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs26"><rect
+     x="713.02588"
+     y="-304.32538"
+     width="3615.2336"
+     height="1864.7544"
+     id="rect14663" /><rect
+     x="972.073"
+     y="151.15895"
+     width="2140.9646"
+     height="684.86273"
+     id="rect447" /><rect
+     x="897.0401"
+     y="217.45384"
+     width="837.72321"
+     height="631.59924"
+     id="rect435" /><rect
+     x="825.67834"
+     y="157.61452"
+     width="1496.2448"
+     height="861.45544"
+     id="rect429" /><rect
+     x="798.3819"
+     y="-42.157242"
+     width="2236.0837"
+     height="945.90723"
+     id="rect315" /><rect
+     x="661.30237"
+     y="48.087799"
+     width="769.15619"
+     height="828.46844"
+     id="rect309" /></defs><sodipodi:namedview
+   id="namedview24"
+   pagecolor="#ffffff"
+   bordercolor="#000000"
+   borderopacity="0.25"
+   inkscape:showpageshadow="2"
+   inkscape:pageopacity="0.0"
+   inkscape:pagecheckerboard="0"
+   inkscape:deskcolor="#d1d1d1"
+   showgrid="false"
+   inkscape:zoom="0.28409405"
+   inkscape:cx="1904.2989"
+   inkscape:cy="633.59299"
+   inkscape:window-width="1908"
+   inkscape:window-height="2075"
+   inkscape:window-x="26"
+   inkscape:window-y="23"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg22" />     <g
+   transform="translate(-31352.726,-1817.2547)"
+   id="g20">                  <g
+   transform="translate(31062.7,-20.8972)"
+   id="g18">             <g
+   transform="translate(-130.173,0.00185558)"
+   id="g4">                 <path
+   d="m 1083.58,1875.72 551.48,318.4 c 14.74,8.51 23.82,24.25 23.82,41.27 0,29.59 0,76.35 0,105.94 0,8.51 -2.27,16.7 -6.38,23.83 0,0 -437.8,-252.76 -545.3,-314.83 -14.62,-8.44 -23.62,-24.04 -23.62,-40.92 0,-45.91 0,-133.69 0,-133.69 z"
+   style="fill:#706bc8"
+   id="path2" />             </g>             <g
+   transform="translate(-130.173,0.00185558)"
+   id="g8">                 <path
+   d="m 1635.26,2604.84 c 14.62,8.44 23.62,24.03 23.62,40.91 0,45.92 0,133.69 0,133.69 l -551.47,-318.39 c -14.75,-8.52 -23.83,-24.25 -23.83,-41.27 0,-29.59 0,-76.36 0,-105.94 0,-8.52 2.27,-16.71 6.38,-23.83 0,0 437.8,252.76 545.3,314.83 z"
+   style="fill:#55c5e4"
+   id="path6" />             </g>             <g
+   transform="translate(216.062,984.098)"
+   id="g12">                 <path
+   d="m 790.407,1432.56 c -5.193,2.99 -9.69,7.34 -12.898,12.9 -9.647,16.7 -4.036,38.3 12.495,48.13 h -0.006 l -28.825,-16.64 c -14.746,-8.51 -23.829,-24.24 -23.829,-41.27 0,-29.59 0,-76.35 0,-105.94 0,-17.03 9.083,-32.76 23.829,-41.27 l 498.417,-287.73 0.24,-0.14 c 5.09,-2.983 9.5,-7.286 12.65,-12.756 9.65,-16.708 4.04,-38.3 -12.49,-48.137 h 0.01 l 28.82,16.642 c 14.75,8.513 23.83,24.246 23.83,41.273 0,29.588 0,76.348 0,105.938 0,17.03 -9.08,32.76 -23.83,41.27 l -29.63,17.11 0.4,-0.26 z"
+   style="fill:#84ddea"
+   id="path10" />             </g>             <g
+   transform="translate(216.062,984.098)"
+   id="g16">                 <path
+   d="m 790.407,1686.24 c -5.193,2.99 -9.69,7.34 -12.898,12.89 -9.647,16.71 -4.036,38.3 12.495,48.14 h -0.006 l -28.825,-16.64 c -14.746,-8.51 -23.829,-24.25 -23.829,-41.27 0,-29.59 0,-76.35 0,-105.94 0,-17.03 9.083,-32.76 23.829,-41.27 l 498.417,-287.73 0.24,-0.14 c 5.09,-2.99 9.5,-7.29 12.65,-12.76 9.65,-16.71 4.04,-38.3 -12.49,-48.14 h 0.01 l 28.82,16.65 c 14.75,8.51 23.83,24.24 23.83,41.27 0,29.59 0,76.35 0,105.94 0,17.02 -9.08,32.76 -23.83,41.27 l -29.63,17.1 0.4,-0.25 z"
+   style="fill:#997bc8"
+   id="path14" /></g></g></g> <text
+   xml:space="preserve"
+   transform="translate(663.354,37.565425)"
+   id="text307"
+   style="font-size:4px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';white-space:pre;shape-inside:url(#rect309);display:inline;fill:#006400;stroke:#006400;stroke-width:2.66667" /><g
+   aria-label="Helix"
+   transform="matrix(1.3113898,0,0,1.3113898,142.0244,48.21073)"
+   id="text445"
+   style="font-size:4px;-inkscape-font-specification:'sans-serif, Normal';white-space:pre;shape-inside:url(#rect447);display:inline;fill:#2a292f;stroke:#2a292f;stroke-width:2.66687"><path
+     d="m 1242.0723,515.10828 h -60.4 v -123.2 h -113.2 v 123.2 h -60.4 v -285.6 h 60.4 v 112 h 113.2 v -112 h 60.4 z"
+     style="font-size:400px;-inkscape-font-specification:'sans-serif, @wght=700';font-variation-settings:'wght' 700"
+     id="path14794" /><path
+     d="m 1399.272,292.70828 q 30.4,0 52,11.6 22,11.6 34,33.6 12,22 12,54 v 28.8 h -140.8 q 0.8,25.2 14.8,39.6 14.4,14.4 39.6,14.4 21.2,0 38.4,-4 17.2,-4.4 35.6,-13.2 v 46 q -16,8 -34,11.6 -17.6,4 -42.8,4 -32.8,0 -58,-12 -25.2,-12.4 -39.6,-37.2 -14.4,-24.8 -14.4,-62.4 0,-38.4 12.8,-63.6 13.2,-25.6 36.4,-38.4 23.2,-12.8 54,-12.8 z m 0.4,42.4 q -17.2,0 -28.8,11.2 -11.2,11.2 -13.2,34.8 h 83.6 q 0,-13.2 -4.8,-23.6 -4.4,-10.4 -13.6,-16.4 -9.2,-6 -23.2,-6 z"
+     style="font-size:400px;-inkscape-font-specification:'sans-serif, @wght=700';font-variation-settings:'wght' 700"
+     id="path14796" /><path
+     d="m 1605.2719,515.10828 h -59.6 v -304 h 59.6 z"
+     style="font-size:400px;-inkscape-font-specification:'sans-serif, @wght=700';font-variation-settings:'wght' 700"
+     id="path14798" /><path
+     d="m 1727.272,296.70828 v 218.4 h -59.6 v -218.4 z m -29.6,-85.6 q 13.2,0 22.8,6.4 9.6,6 9.6,22.8 0,16.4 -9.6,22.8 -9.6,6.4 -22.8,6.4 -13.6,0 -23.2,-6.4 -9.2,-6.4 -9.2,-22.8 0,-16.8 9.2,-22.8 9.6,-6.4 23.2,-6.4 z"
+     style="font-size:400px;-inkscape-font-specification:'sans-serif, @wght=700';font-variation-settings:'wght' 700"
+     id="path14800" /><path
+     d="m 1834.4721,403.50828 -70.4,-106.8 h 67.6 l 42.4,69.6 42.8,-69.6 h 67.6 l -71.2,106.8 74.4,111.6 h -67.6 l -46,-74.8 -46,74.8 h -67.6 z"
+     style="font-size:400px;-inkscape-font-specification:'sans-serif, @wght=700';font-variation-settings:'wght' 700"
+     id="path14802" /></g><text
+   xml:space="preserve"
+   transform="translate(663.38,37.570044)"
+   id="text14661"
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:997.723px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, @wght=700';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;font-variation-settings:'wght' 700;white-space:pre;shape-inside:url(#rect14663);display:inline;fill:#2a292f;fill-opacity:1;stroke:#2a292f;stroke-width:6.652;stroke-dasharray:none;stroke-opacity:1" /></svg>

From 224a024d3997035d04bf7b2f7424a472ff9936b8 Mon Sep 17 00:00:00 2001
From: Anton Romanov <theli.ua@gmail.com>
Date: Fri, 2 Dec 2022 18:26:01 -0800
Subject: [PATCH 593/884] Update zenburn theme for git gutters (#4977)

---
 runtime/themes/zenburn.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/themes/zenburn.toml b/runtime/themes/zenburn.toml
index affb9f56..63f4ac72 100644
--- a/runtime/themes/zenburn.toml
+++ b/runtime/themes/zenburn.toml
@@ -37,9 +37,9 @@
 
 "ui.virtual.indent-guide" = "#4f4f4f"
 
-"diff.plus" = {fg = "#709080", bg = "#313c36", modifiers = ["bold"] }
-"diff.delta" = "#333333"
-"diff.minus" = {fg = "#333333", bg = "#464646"}
+"diff.plus" = {fg = "#709080"}
+"diff.delta" = {fg = "#464646"}
+"diff.minus" = {fg = "#cc9393"}
 
 "diagnostic" = {bg = "statusbg"}
 "diagnostic.error" = { fg = "errorfg", bg = "errorbg"}

From dc00291b4888f7ffad43fd544259227d0dbbf6fb Mon Sep 17 00:00:00 2001
From: Luna <rinnray@gliroid.com>
Date: Sat, 3 Dec 2022 03:26:10 +0100
Subject: [PATCH 594/884] Update Doom Acario for git gutters (#4979)

Edited the diff.delta from green to blue.
---
 runtime/themes/doom_acario_dark.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/themes/doom_acario_dark.toml b/runtime/themes/doom_acario_dark.toml
index c38c93ee..95dc78e0 100644
--- a/runtime/themes/doom_acario_dark.toml
+++ b/runtime/themes/doom_acario_dark.toml
@@ -41,7 +41,7 @@
 
 'diff.plus' = { fg = 'green' }
 'diff.minus' = { fg = 'red' }
-'diff.delta' = { fg = 'green' }
+'diff.delta' = { fg = 'blue' }
 
 'ui.background'= { bg = 'bg' }
 'ui.cursor' = { bg = 'orange', fg = 'bg-alt' }

From bcdb475b71b0fbabce57344ac8d2575c23b1bbe0 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Fri, 2 Dec 2022 21:09:08 -0600
Subject: [PATCH 595/884] Fix transaction composition order in
 History::changes_since (#4981)

* Add a undo/redo split test case for crossing branches

* history: Switch up/down transaction chaining order

The old code tends to work in practice because, usually, either up_txns
or down_txns are empty. When both have contents though, we can run into
a panic trying to compose them all since they will disagree on the
length of the text. This fixes the panic test case in the parent
commit.
---
 helix-core/src/history.rs       |  2 +-
 helix-term/tests/test/splits.rs | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/helix-core/src/history.rs b/helix-core/src/history.rs
index b99e969f..1aac38d9 100644
--- a/helix-core/src/history.rs
+++ b/helix-core/src/history.rs
@@ -131,7 +131,7 @@ impl History {
             .map(|&n| self.revisions[n].inversion.clone());
         let down_txns = down.iter().map(|&n| self.revisions[n].transaction.clone());
 
-        up_txns.chain(down_txns).reduce(|acc, tx| tx.compose(acc))
+        down_txns.chain(up_txns).reduce(|acc, tx| tx.compose(acc))
     }
 
     /// Undo the last edit.
diff --git a/helix-term/tests/test/splits.rs b/helix-term/tests/test/splits.rs
index a34a24b7..96ced21a 100644
--- a/helix-term/tests/test/splits.rs
+++ b/helix-term/tests/test/splits.rs
@@ -161,5 +161,30 @@ async fn test_changes_in_splits_apply_to_all_views() -> anyhow::Result<()> {
     ))
     .await?;
 
+    // See <https://github.com/helix-editor/helix/issues/4957>.
+    // This sequence undoes part of the history and then adds new changes, creating a
+    // new branch in the history tree. `View::sync_changes` applies transactions down
+    // and up to the lowest common ancestor in the path between old and new revision
+    // numbers. If we apply these up/down transactions in the wrong order, this case
+    // panics.
+    // The key sequence:
+    // * 3[<space>    Create three empty lines so we are at the end of the document.
+    // * <C-w>v<C-s>  Create a split and save that point at the end of the document
+    //                in the jumplist.
+    // * <C-w>w       Switch back to the first window.
+    // * uu           Undo twice (not three times which would bring us back to the
+    //                root of the tree).
+    // * 3[<space>    Create three empty lines. Now the end of the document is past
+    //                where it was on step 1.
+    // * <C-w>q       Close window 1, focusing window 2 and causing a sync. This step
+    //                panics if we don't apply in the right order.
+    // * %d           Clean up the buffer.
+    test((
+        "#[|]#",
+        "3[<space><C-w>v<C-s><C-w>wuu3[<space><C-w>q%d",
+        "#[|]#",
+    ))
+    .await?;
+
     Ok(())
 }

From 2123e91e56caccf60b9285f30bc2f2f12952520a Mon Sep 17 00:00:00 2001
From: Aleksey Kuznetsov <zummenix@gmail.com>
Date: Sat, 3 Dec 2022 19:24:43 +0500
Subject: [PATCH 596/884] Enable auto format for css and scss files (#4987)

provideFormatter enables capability in LS and
auto-format performs format on save
---
 languages.toml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/languages.toml b/languages.toml
index 9664d93a..d214a082 100644
--- a/languages.toml
+++ b/languages.toml
@@ -422,6 +422,8 @@ injection-regex = "css"
 file-types = ["css", "scss"]
 roots = []
 language-server = { command = "vscode-css-language-server", args = ["--stdio"] }
+auto-format = true
+config = { "provideFormatter" = true }
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
@@ -435,6 +437,8 @@ injection-regex = "scss"
 file-types = ["scss"]
 roots = []
 language-server = { command = "vscode-css-language-server", args = ["--stdio"] }
+auto-format = true
+config = { "provideFormatter" = true }
 indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]

From 326a0dab069b65463db90e2647287c1e5b6b66aa Mon Sep 17 00:00:00 2001
From: Jens Getreu <getreu@web.de>
Date: Sun, 4 Dec 2022 03:03:42 +0100
Subject: [PATCH 597/884] Autumn theme: adjust some gray colors (#4996)

---
 runtime/themes/autumn.toml       | 12 ++++++------
 runtime/themes/autumn_night.toml | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/runtime/themes/autumn.toml b/runtime/themes/autumn.toml
index b13aeef2..fe80261a 100644
--- a/runtime/themes/autumn.toml
+++ b/runtime/themes/autumn.toml
@@ -10,13 +10,13 @@
 "ui.background" = { bg = "my_gray0" }
 "ui.menu" = { fg = "my_white", bg = "my_gray2" }
 "ui.menu.selected" = { fg = "my_gray2", bg = "my_gray5" }
-"ui.linenr" = { fg = "my_gray4", bg = "my_gray2" }
+"ui.linenr" = { fg = "my_gray3", bg = "my_gray0" }
 "ui.popup" = { bg = "my_gray2" }
-"ui.window" = { fg = "my_gray4", bg = "my_gray2" }
-"ui.linenr.selected" = { fg = "my_gray6", bg = "my_gray1"}
+"ui.window" = { fg = "my_gray3", bg = "my_gray2" }
+"ui.linenr.selected" = { fg = "my_gray6", bg = "my_gray0"}
 "ui.selection" = { bg = "my_gray3" }
 "comment" = { fg = "my_gray4", modifiers = ["italic"] }
-"ui.cursorline" = { bg = "my_gray2" }
+"ui.cursorline" = { bg = "my_gray3" }
 "ui.statusline" = { fg = "my_gray6", bg = "my_gray2" }
 "ui.statusline.inactive" = { fg = 'my_gray4', bg = 'my_gray2' }
 "ui.statusline.insert" = {fg = "my_black", bg = "my_gray5", modifiers = ["bold"]}
@@ -62,7 +62,7 @@
 "diff.minus" = "my_red"
 
 "diagnostic" = { modifiers = ["underlined"] }
-"ui.gutter" = { bg = "my_gray2" }
+"ui.gutter" = { bg = "my_gray0" }
 "hint" = "my_gray5"
 "debug" = "my_yellow2"
 "info" = "my_yellow2"
@@ -77,7 +77,7 @@ my_gray2      = "#323232" # Lighter Background (Used for status bars, line numbe
 my_gray3      = "#505050" # Selection Background
 my_gray4      = "#7c7c7c" # Comments, Invisibles, Line Highlighting
 my_gray5      = "#a8a8a8" # Dark Foreground (Used for status bars)
-my_gray6      = "#c0c0c0" # Light Foreground (Not often used)
+my_gray6      = "#c8c8c8" # Light Foreground (Not often used)
 my_gray7      = "#e8e8e8" # Light Background (Not often used)
 my_white      = "#F3F2CC" # Default Foreground, Caret, Delimiters, Operators
 my_white2     = "#F3F2CC" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
diff --git a/runtime/themes/autumn_night.toml b/runtime/themes/autumn_night.toml
index 2f398dc9..d01f5356 100644
--- a/runtime/themes/autumn_night.toml
+++ b/runtime/themes/autumn_night.toml
@@ -10,13 +10,13 @@
 "ui.background" = { bg = "my_gray0" }
 "ui.menu" = { fg = "my_white", bg = "my_gray2" }
 "ui.menu.selected" = { fg = "my_gray2", bg = "my_gray5" }
-"ui.linenr" = { fg = "my_gray4", bg = "my_gray2" }
+"ui.linenr" = { fg = "my_gray3", bg = "my_gray0" }
 "ui.popup" = { bg = "my_gray2" }
-"ui.window" = { fg = "my_gray4", bg = "my_gray2" }
-"ui.linenr.selected" = { fg = "my_gray6", bg = "my_gray1"}
+"ui.window" = { fg = "my_gray3", bg = "my_gray2" }
+"ui.linenr.selected" = { fg = "my_gray6", bg = "my_gray0"}
 "ui.selection" = { bg = "my_gray3" }
 "comment" = { fg = "my_gray4", modifiers = ["italic"] }
-"ui.cursorline" = { bg = "my_gray2" }
+"ui.cursorline" = { bg = "my_gray3" }
 "ui.statusline" = { fg = "my_gray6", bg = "my_gray2" }
 "ui.statusline.inactive" = { fg = 'my_gray4', bg = 'my_gray2' }
 "ui.statusline.insert" = {fg = "my_black", bg = "my_gray5", modifiers = ["bold"]}
@@ -62,7 +62,7 @@
 "diff.minus" = "my_red"
 
 "diagnostic" = { modifiers = ["underlined"] }
-"ui.gutter" = { bg = "my_gray2" }
+"ui.gutter" = { bg = "my_gray0" }
 "hint" = "my_gray5"
 "debug" = "my_yellow2"
 "info" = "my_yellow2"
@@ -77,7 +77,7 @@ my_gray2      = "#1a1a1a" # Lighter Background (Used for status bars, line numbe
 my_gray3      = "#323232" # Selection Background
 my_gray4      = "#7c7c7c" # Comments, Invisibles, Line Highlighting
 my_gray5      = "#aaaaaa" # Dark Foreground (Used for status bars)
-my_gray6      = "#c0c0c0" # Light Foreground (Not often used)
+my_gray6      = "#c4c4c4" # Light Foreground (Not often used)
 my_gray7      = "#e8e8e8" # Light Background (Not often used)
 my_white      = "#F3F2CC" # Default Foreground, Caret, Delimiters, Operators
 my_white2     = "#F3F2CC" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted

From e9d0645f66c6254e82c2b50000eb5660c128f26b Mon Sep 17 00:00:00 2001
From: PORTALSURFER <41680373+PORTALSURFER@users.noreply.github.com>
Date: Sun, 4 Dec 2022 03:06:40 +0100
Subject: [PATCH 598/884] Adjusted hex themes for new gutter diff colors
 (#4990)

* added 2 themes

* diff feature fixes

adjusted the skin to better work with the new diff coloring features

propagates to child skins like
- hex_toxic

* fine tuning so it all is a bit softer

* fine tuning to be softer

* added new version, lavender
---
 runtime/themes/hex_lavender.toml | 31 ++++++++++++++++++++++++++++++
 runtime/themes/hex_steel.toml    | 33 ++++++++++++++++++--------------
 runtime/themes/hex_toxic.toml    | 10 +++++-----
 3 files changed, 55 insertions(+), 19 deletions(-)
 create mode 100644 runtime/themes/hex_lavender.toml

diff --git a/runtime/themes/hex_lavender.toml b/runtime/themes/hex_lavender.toml
new file mode 100644
index 00000000..974c486c
--- /dev/null
+++ b/runtime/themes/hex_lavender.toml
@@ -0,0 +1,31 @@
+inherits = "hex_steel"
+
+[palette]
+t1 = "#0e0e0d"
+t2 = "#121311"
+t3 = "#2b3444"  #
+t4 = "#61586f"
+t5 = "#686e73"
+t6 = "#878480"
+t7 = "#897dca"
+t8 = "#7b89a3"
+t9 = "#bcb6ba"
+t10 = "#9db2b8"
+t11 = "#a0c7cf"
+
+highlight = "#ff2e5f"
+highlight_two = "#0affa9"
+highlight_three = "#29bbff"
+
+black = "#000000"
+
+selection = "#290019"
+
+comment = "#9aacfe"
+comment_doc = "#0affa9"
+
+error = "#ff0900"
+warning = "#ffbf00"
+display = "#57ff89"
+info = "#dad7d5"
+#
diff --git a/runtime/themes/hex_steel.toml b/runtime/themes/hex_steel.toml
index 06e91d01..7a2183f8 100644
--- a/runtime/themes/hex_steel.toml
+++ b/runtime/themes/hex_steel.toml
@@ -1,5 +1,5 @@
-"comment" = { fg = "highlight_three" }
-"comment.block.documentation" = { bg = "t4", modifiers = ["italic"] }
+"comment" = { fg = "comment" }
+"comment.block.documentation" = { bg = "comment_doc", modifiers = ["italic"] }
 
 "constant" = { fg = "t11" }
 "function" = { fg = "t10" }
@@ -20,18 +20,19 @@
 "variable" = { fg = "t4" }
 "label" = { fg = "t4" }
 
-"diff.plus" = { fg = "t4" }
-"diff.delta" = { fg = "t4" }
-"diff.minus" = { fg = "t4" }
+"diff.plus" = { fg = "diff_plus" }
+"diff.delta" = { fg = "diff_delta" }
+"diff.delta.moved" = { fg = "diff_delta_moved" }
+"diff.minus" = { fg = "diff_minus" }
 
 "ui.cursor.insert" = { fg = "t2", bg = "highlight" }
 "ui.cursor.select" = { fg = "t2", bg = "highlight_two" }
 "ui.cursor" = { fg = "t1", bg = "highlight_three" }
-"ui.cursor.match" = { fg = "highlight", bg = "t1", modifiers = ["bold"] }
+"ui.cursor.match" = { fg = "highlight", bg = "selection", modifiers = ["bold"] }
 
-"ui.linenr" = { fg = "t3", bg = "t1" }
-"ui.linenr.selected" = { fg = "highlight_three", bg = "t1" }
-"ui.gutter" = { bg = "t1" }
+"ui.linenr" = { fg = "t3", bg = "t2" }
+"ui.linenr.selected" = { fg = "highlight_three", bg = "t2" }
+"ui.gutter" = { bg = "t2" }
 
 "ui.background" = { fg = "t4", bg = "t2" }
 "ui.background.separator" = { fg = "t3" }
@@ -76,8 +77,8 @@
 "markup.raw" = { fg = "t4" }
 
 [palette]
-t1 = "#0f0b0b"
-t2 = "#161010"
+t1 = "#0e0e0d"
+t2 = "#1d1e1b"
 t3 = "#5b5555"
 t4 = "#656869"
 t5 = "#727b7c"
@@ -95,11 +96,15 @@ highlight_three = "#d4d987"
 selection = "#032d4a"
 
 black = "#000000"
-
-comment = "#396884"
+comment = "#d4d987"
 comment_doc = "#234048"
 
 error = "#ff0900"
 warning = "#ffbf00"
-display = "#57ff89"
+display = "#42baff"
 info = "#dad7d5"
+
+diff_minus = "#ff0900"
+diff_delta = "#0078bd"
+diff_plus = "#87a800"
+diff_delta_moved = "#0048bd"
diff --git a/runtime/themes/hex_toxic.toml b/runtime/themes/hex_toxic.toml
index 3cd878be..33bfa6e5 100644
--- a/runtime/themes/hex_toxic.toml
+++ b/runtime/themes/hex_toxic.toml
@@ -2,7 +2,7 @@ inherits = "hex_steel"
 
 [palette]
 t1 = "#101719"
-t2 = "#152432"
+t2 = "#1b2a32"
 t3 = "#4b5968"
 t4 = "#8792ab"
 t5 = "#6f91bc"
@@ -13,15 +13,15 @@ t9 = "#b3ccd0"
 t10 = "#b0d4d8"
 t11 = "#ffbf52"
 
-highlight = "#ff2e5f"
+highlight = "#ff0a50"
 highlight_two = "#0affa9"
-highlight_three = "#d7ff52"
+highlight_three = "#f8ed8b"
 
 black = "#000000"
 
-selection = "#290019"
+selection = "#382e1e"
 
-comment = "#396884"
+comment = "#61bdd1"
 comment_doc = "#234048"
 
 error = "#ff0900"

From c13c6d56b6eb0e117cb92ba4011155b519befde6 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sat, 3 Dec 2022 20:07:17 -0600
Subject: [PATCH 599/884] Use logo for contrib icon (#4982)

---
 contrib/helix.png | Bin 1838 -> 15785 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/contrib/helix.png b/contrib/helix.png
index bef00b98418a3fefcf56a5d45fafb1403e26e996..a9b699a4606926465926e8020eb5ce94cffb2ddb 100644
GIT binary patch
literal 15785
zcmZ{L1yEd1@aEfH+}&M*6C^+g?hrh<TL^A}U_o}V;1b*|NN@=fba6`vA-KD{JGa08
zRbACx)z#M4d;7L}rf1%CPk&$cL};ifU}I2V004lkq$v9i06>Ua5P*h)xEOyd{eZY2
z*+{8M0YGgW=7R+?;y0a@;yYCU@O=RQ&=3H)Lp*}+0Kg|60N67JfH!FXK<b*+qA7~_
z1I1EVK^A!a?~~VFl8AVM?y6|u4gi=0|9wH@ivbUaho~M(s&c4XSP&d;5eJ&ZaR3l~
zuOus_?LBwc?v-U?-SGTu`e$i7%P#$uVlEz9=?<yJcRP0P$y{Gzq@c|pQaJ)edUR7_
z0yvDxTqr+;30hhziSh1YDQc5}i@c0ZjwdAKRoaD$nDw#E<CFIXX<0h{#PnI4KL^*e
z!ww&}e$8zkY}Zfw=IDfw@wwY$=amFgm6bI`4yqxG!YUd#4POb`6A}_w!XoCNv5Y;?
zTZS`^6)ifp@_602bW(AW1~+u{TDpEP6imMI4^ADl1W*;qWJ)Hv1UM1bzo?F#>kkPj
zcrgmDdHD!EhqV?pdf;@Q)GXxXxSswPNaMRrC_PkGWPR%!3H;#0NW**}*`x{;FMB(u
z>~=aa@cMayrJ(U8eSYbV9T=d4pTghaJ8Nyem-35xXZY2oKZ%J`QPH-D1w)d98U7t@
zMCU*q#;BD}fV7%r$I)!NSExCk8jmL|W&jwHqp3iSu!FmWh*4<2>5z$jP&N6zp`<SF
zWF{^B{sIMLyXm@u%21*0!Jtu$#vA}6*RoF&f9x#$ulM;~Rq&W^`#LliA_3_y!;V4w
z7WDKh<DJZ>ONi!tTKt&Pg&@eb2<wKyHTCr27*r@@RRhntq~R}NiI7Ea4_;yiDzQ*H
zkQX?1w9TO@MVgrWB^4j~lLr2$b>-7S!8}E8i5kg}f5aqt51<4pR{j!k`O&SPr~T-N
z_Q#O5%h%fVql&TfzKxUo?m1u#lXo&~8k-k``k%tIkOH_0lws><d+4nCY2wVnf(Nzl
zxk7UA`!K<{95m-sjzzx8CKD;2gd>0l4u5DhxbwH7EA#N+xHd)bKp*KOkJU%ji7RFg
z!DO0m(!GiF;A6Q{{FBVgw5CQu`~8+ASzsw0AHIoptv`7V?GQu~P2(*Jiz;TOk&2_&
zMykMQfLoAtRCeQ!vJq7obbk3+-G<+gY$DA7+;0cN8StI;HWTyM@HO_`{wDQOhKo!x
z7(aE;)6u=n+o6R;!%fUf^09sh#)S{GHOx2PHBf72E_`PKj|q;$OXQkmWUEkPDdO?5
zTvvV6c^L77X54Qrf+dlpz~;PTXvR@B#yS#liYP>9K3mnh!b_42z+s^T4|=nWy6H>g
zun%vgk<tXL1^$(=NaNWAP3H`d(dyj4aiuheCBn?|J<(mYS4uP)e;Kt3*t?5_$^vit
z^WlCWt*~dHQUhNU@s`B<<%Z-fIKPYEz9)(bms$mxyN^g*f}RNV?Hq5IqrCHe9fK%C
zA^;C6kQ(4DzmW=80C0&O;?sv-Sa6<JfRLmFK@Q7je-wZyEER$-h{Y4fDG5v#z{w(5
z!GynE8GzsWDFwI0dCqOfqOJ8Z7oq}@1;61bO+HG2<{f2ze|?Wca#}r=MV_SH63`^K
z-SBuI%>(wYF|Efc>;$|!1}b*r+@}mi5DO_khBXp{WU!-0`3^EkFo#=)Ce3c2D5Amu
zWdHdLrKPWv=CYwnDr>+JD~%-AqA6)<d1HT1a1})tiK^W(5)})4C}>1#FmCu@G$HR5
zE(^4vKvX1eLRp&t7K1*t6q9-J(O=)oT~%WUBV%r>k79N?U<vm=x7&F9DEQ+!F>@C<
z2nDC#;rNl?RN6FC{O!TAgY#T|9r*d$&dAh*6$RAm^Re*y{0s!QE670?$Wdm?(H)4R
zhkHpL>0C&gLznaP)zf$n-MHU8cOiTNQ03zse2@EwaOJ$&Kl_naika#g@8u2wXvb6>
z;6yqi+N_T(mLpb5<#C@|&-&~<9>dDM)qeLzDi=eN9!ny`f$Sd%PS<8=?^nc7a*0k{
z;4ZT7YYS-E$8aacn+m>?|D!4KUBlFzpDAzN+k6A3vjB8a!S1g7FXp6?@0U4P4GBQu
zv2Rx#z}MeqFHPjiWzX~Iv4i*1Qho^?kZg6<5wCB%`j}9K3{JwoA9_a-IrHgoD!l>A
zsS|5(4St7zDy_nbf5SK|r{!>Rh8*ClH6Bx1pWfstqB~ytfqn)OuvrTyhIjt!KrIB=
zN@!0RPl3oUxFDg(K^JIXPuWYT>g_L;GHj8U+x;fq>*PvSlEUAtSOe8rkcH6sn|&Pz
z282Kq)`@|6#pwo)dBS$)c8^B-t8?VxZWIz@FUtwR{;zwfP4RDw;OuJ@?Ux{7)fI*n
z{qTMM2l$STJt^ZIgcN)ok{^Id_D;7{LB@J3R6uFgO(gw#SkNy~S_gCrOGFMp=0uJy
zOyv$x6op!D^Q=&;yjn2~{oFTZTQN_o_=R4=P?X!AGAd=SVP0Qrn)W@*H%_E2MV;&*
z<xvW<2LC?EH4u>mI16dPGQ<oZl%C+1v<)%P(v@>E`|EZ&=k&{@l^A#PF<Asa!B2Am
zU$1S+zKH4!?S+Kn7QxBk3Vy$;p?&u6o+V|rOwLK|r<2_l#|aA>dEb>iYepTTlgI&|
z&S@p0%Ezf>&fxc?UvZfNsIY#4kED8{puvqU++E5BAJmL~UktVL2bv#c9HxyWZ<dvU
z`Y{$FGa<sU8>WFqYX_i^=C3VFEwFR(6&Cm|D<<q&irGPQB$}<fHpg}G6N{XaRjT{%
zyF<tMsc^C=Hq0?NCD-u#1;;O4n)7-Gy#|0M1lf3CX(<xbkH{<f6RxXM-YOy6dO4Rq
zcSaqBl||PYujc&hu5mi%iO>NP7T4o_Y7n0W<lNf0cJdx!x7@wcT<-+e424*l{Vtw?
zfK0w8QFHBn7d8h~bW)QU_u<%bo%E(g5|{JQsVWC@eDSy%tQ)qWH5bxaB0xt&AJs8@
zE``C0jEAy$nmrNvWZxCeV`YfFeD^W>p0JG1%ZaP*2wM_OjH8+Vp{SYvQ7gPjff5}d
zJKgYm3LGcvq?GWH$hAFu0pv%)93$OP&2!#8sgl*qX@5W0Cs6IQUY2T)kCo#KeDQ|;
zBxt52-M@~Q>u)Ad1`VQs7+&-)0<8s&C5lR*TqNg#8nn$|Owu@HMl5P?EdCNvsoEyy
z@&G&1bF;;_c&sn1fjjW_YRB~mY*llf%*&Du*ko%uE-8xxcgD@-FqFJ>%|Y|}lV#{G
z%(HOr85E+DT^s458X#(azm(#$-)O~Wq1?>E7NQ=sgu~hW+d*Xq$?|iEpw*pyFGe%<
ziO6i=b0gCAU?4^_Ni$_W%_kwLs(72f<A^cR>Q&B5#j`VKJLEYU5vro5QiqN#iA1ec
zw&upVK3adlj+~42Bvi%)BtJUykENZk<xzNXrkxx;ocE`HtP84!9v7waGPnE-DxY$+
zSt@S`Z}{eZ3G`&(aJLe9wFyV8nLO0KXav`oe;1i=%$MS7f}|!Kp#DfEFh0Eh2tzJw
zlSupssU7Xyl>6Yh?$}c<IL+sEsM}kg2ew5XoNay`D9(G-M2c$30RWGv+2QQrc=ooW
z5G`1stdm|e8JY_5YL4_^APk55*@60o$LenV*Ms4-AY1nHp00|T;kt(UYT;V(*%A_!
zdbG?$^BAM}O1hT41`#hbxe)KeDuxX^?n&imLK6KL4w0v9I#qjOsX=AJD3a_2yFlBc
zawFlrqbJe8J?<K?{PLImz!T!RsmRuu@IxBOI6MGKuBBVZP6p9swvv6uPDA&LW|I0Q
z_6pRgXPqBbH+N%iq|8mS;A-B0d~Ujg6A)fTS5P`khd+w)Vjab;H(3^lgjMIBbNb&4
zT2#^<4c|e`z{SAxOZ$7ve%%$p&^~ZAK=!ugRqaYx?V)es?MvsL55}V~pe!l!ggi?!
zj(IDeH3A?a<u8$l2=kG}(nV(UC39xEm2lJYC72sshRGdaEgiTjybRjH<TQR0(Ag>a
zJn0mUHf1Q?=iQCoeE0BYRlejBi2%eZ&z;jq0g@&T!aEgH>lJ`Kh>C4*?c;z~EX?!S
zucP91h>@7%EdCY*I?3`~_c?vT86s>u@;!}6$l>fpsKD{BSS-fo{KyhnyGUDB;&<jz
z328$NZvl;$sFzd6ideE*XolVi@|nfpTHkuJ{i0yBliQ_S*DxS!)Kh~i>kl%KWdQm{
ze_`q}c61pUUZGx?uQ;xN*V;kE$eC`7p3Z{Z4*AmZ7)k1HsI*q;F&MsTmgh>QMeG}l
zB??(uaR6@1es=trByp=H)4Ab)!LV(Rqs%XLw^g{b`DcW`4_|HWE&p8cQGD!WwfGzv
z-UiZ2Pgx7u>NI>{cQ#65>Vg7yrSeynp^O7bLc<z);ksL<R&KxbF!PTX@Nllc81mzv
za>ISvBymc;S|JAeo|c3eU!YwVFihv&<jwnJ7_Ix`*G_9V6Jezjt73n=k6GW*+3BN~
zQiM?C()G_iUBFir?L>{!*n`26i%cpWMJ@o_4<y9k>pyWt%!NTlFHn{wo=YuzI|R8`
zitu7>cR3x%*ch4n5>+DlcJ9NF@20nP43g@mLPYt?*O;l=Nn_(*W<^+4cX^ZFFB!p-
zGAxg|#wT+JwO9H_<XLDWD{hAh+$PfL%|mPQalwDS?|FQh4S9xa6e2bVB9%~u-P6ZX
z(N8?gv=s-3QMAUfvL+Mq9!b3rZ`5M->Ml%TV!anp`xWjeJlRWA3G!0o(!L(TMYMZS
z5=`qf)a{>Fo9a+s6MOT-(jcPBdyD=b6wx}`y*gA3jBc$9W+f%Z9vtR$0&O8*aW9$u
zZOOlWeZTt5A2^Ur)t-VTiThz{VgL^*sz}&{RdwFVZ3(`6@uTVo7v=(Ge8EQATRsI{
z^WnDltDRz<8k6U+?#(X)E_j-CsAKX0zC95Kjx(|B@86LayR;8A!>FFWL?N%o1+ks8
ziZ#AWF2T;fnCTc=3$&qteU|-Z{_&JbBiS3EHXlZgOFXTZ$0My72Hg0!OYo+LUhNg5
z70D-S-mP|g3rl5kdwRNc33-;Bb&_db6H`JPD^GjlL%hixW(=&w4#>;=LeXmMy?u(u
zLQI3QuLt?pqf3!{Cku`f+R`UBR*v;n84kRN<&TlMeR6}*cI6-`B2i7kvaFDi7Y|e#
zBn|#9$_`n}e^}hLnVD&Kg1;*oKMH<Dt*S|*#juxKsq4Xsoh$w?NM!jB+SS}w(C7@y
z-f&iRm}B+*ST3L|3j6h$gH^1U;5g4i`O$eItS<;$gEwg}OQExJMpg_oeMN}!`=43e
z*zM1KrDuJkKQn)Q6s{Pf1t%S6R5r;n(*c`)teD2}gh*)KMEp=G#;Fr7lh7b;Frj{d
z59PMp`hkj%BliiDD{h+6E!(A2#mlS1Non~K)tdEIgE^gXI6;MAy9t6h0W6dD1eP;v
z!1XOg@lQP-jg*k`qSA#YbtvCVK+>W6@)v9^g$Mdw+ILBQdAQ69mx#O1fjMI@Op#Mc
z&y;!F{@(pWE>75!S(m71!iPGW_lL$Y^pD-SmA|9!wrh^*Uf+p4&M#6C@|Q)dxQbrd
zETy%Ft6IWl!V8qbCrn-GJL;|a^G&c`+e;c$Q73vt6YuXf1{AG1Eym^=jlTr@Vc(#*
zDwaIpBa6}t6!iApeo0~oK<FM!b)sMn)A!d<RSrr;bE~*sri}n(;nCmAYbjQgBBfh!
zzxzG%HY4!S_+R?8O6wNLzodYgufINzB#dw9S7(c28>22DPeia|e4E%7QNW6xYve}s
z9)7d+4HZqR$fc24D^bu=z3UJ+3;b>F;RBa-OZs)|>*f92x%=}F!CFu=ax<|7BZe-L
zI%F%FhN8jA<She$&+k5-X!{08PWdi8rydgVI&Njh>v406Z?R{X?bem~JH67Kv&bx@
z0;rlk3(igGcM3-qz#ACuh>b^+OyIHFv)7<SGaAT<=|05HirVkKe}T}v$8gvKS9#cD
zUJ2w4=tECzl0><V0(@Tl>C-tCn|67L@Ym%0B@@lhcqiS_A*M(A3wB+0r5qwxDBoCx
zTZ&YgL?h1Uhuq<p7$ZoYjCmw)**TXf#{Z#^9Ofc+tayWZ-Ta?ZFuAugcpp?EZbPR3
zbc#OaoDsf_+l><9L5M~}w;ZWE7Ho$f<mNPHB!}@(Kpm-;qdVR#=TvAz@GypN$3k~&
z$ymh=CO@@r#;C%bFz}a~Ej|o&FH3+knl{Yr3U1Tipf3$lI5qZb-`I9ZcS$Q9=U}CJ
z19JTfdX1o<@FH_DrSy~6hB82D_*{oR9W=Cii}Sboaehq)I+yMK;*+RrFuNDV!ACLb
zq+;pFBIUTKxidxavJeLIr53|i$BY3pzR$4)P3SiQ=K2#?eL*R$!V3m;_bSvsQz>dx
zSLYWuK_{f<F!n$q`szIbwu+|2{i=JF3BB<}S_5fq?asDP?cta)6pbAgXPmBAE2X7}
zQP|){UZ(47l)Auj#s!0!`*W{+9DQ_Suj$<9lj&-|vqUPxf&+H6)Q5|2rPZZIib!+}
zWo9$sW`=77Fe<wRy5H&Wp&u;xr9zB($jqHp5eNT1vpNp7%(Y)F&Qc-==<c1L0|pWm
zvgB#+8aG5c&U*+8I=Z=;5f-p@|I&%^7!!FvK@gc;;X~<snh46Y#f{3s11#k6F98d(
z%X_<kme_~#7+X`^ome&Uoa5ZB{$V1oo3QK{&<)Ld$jvD3=VArKniAqW-mDB^HU~GI
zh77wJM=$&INs47py$<w(9W3t+wd=<@p@|%-ai623B%hcM*W^{fX*skuGBD!#hJVpU
zN8Ig+WFt@|>~`NXPjF#gPCr?E4JBR;HJ167W-bgWX!P-=(Aa|t^=j<H5<}_ew?GP%
z<agDsdbU43@2($8s@s`X{!a7zd28e=gdz{cO!pyx(C^KIsDjd$&kJ}=gbn_+l9G_3
z6T^CusrjVP6ZpcTR}UK2%iu_&(mFQn01|y?Zspznupo0JiVTa<?wc>j2nqs!y3KGT
z_Qj4KyLS#j*heO3XLu?s$G~WA_Qxw8^u{gQCkN_Vff(CS&s&pn$>mpA9G}nC4K}Ou
z&w~4*t#8H7awM(HZ?A9%<R96n@emF2=~XYvmrh-V>)|DIMdk!MVEB3?mJtfbh&0~6
zBj@1!a;7EE=y)m#mOvc8RFYaRU8qy_2gP`u^2(dxU^vY9>fcSI<X4OZCGF=zl4U~9
zxi@qLSgXs#*`O?0-Uj5CAB>m8e+tCBe>PO85twF1Y)@#!XY>d2B06~sgiqzYC47{w
z-zgTg5@N5XGrWOp_=8?!OQ8*jSfGFpCAH)Jm}uWT-ckmt!RGjJxAk^9gMO#wbtl&r
z7FTe<ZXj2y2AcGUz~?hxorsrGr6-lNz3viprvMK0*l9uPUlo}B^YOnPIcq*w95-@o
z5`jv$r$*6PoBhG|1*l+C?=8MW&eHd#xA1GMe;ohL-p{QsefsnxHa2c*1qV+eDhj$A
z_lnm;R?NZ{Z#x$U$%z`r_x=CO&OF}N&$UZM$459<PonlnWTrUD-@Qn{<)ZPJ!pi2K
zt$_MKDv6f}MdrE|OjK)H@r&>skQaEDN+fN-go@&S8vhy=w>Cy>bso`sGfpR5EOPe|
zHsRkm>r695tCEW+U)^5zn`jy>@P4Iij6tj%?ACI8^<?8`0=C&?G2OA<=8zn5&3RJH
zB}6mMxqOQZh7TC;+XBTw-d{$B!d>@{Dk`X^%<47g7x4)|Gq`$Hl|{0C7!+$9tW@vn
zIOYwDMII!VJN0T@(vRvtZ9H|Tr#s_wJ?LU-q<f-EIe8z}lB<_P1^&0VH)>gvb6+)t
zn6*^SBtgxgX~_z~*9xM|6vr<pW53U>WL)@L%(tk>cAl?p<iH!+B~Ny!!~lo|8BhxG
z@#M-=8g~XrX~Egn#=Rue-WAUaBD^~0er8r{=T8~ymc_`m(MMco@{9%fVQ9j;-swwc
zCU6a|UVBS$P!j0!{oeS-{YIR;HO0};@_%@uYl&}>>UZFx%v17<S7uZLzW0T_!Cgff
zbFn(~bUD3E#f<oXF|9bhoRi`Uqc03SXZ~l1oum+<v06wgr0&mT!e@*BCd}+6$o&>I
z#iK%@G~!e-%#;hzYkxp_VSRNttOXmiTO0O>E7@^bEU?sjO735bDff)QXxe6uyjYCY
z*pqsWCWJOR-d(=(tpt9V7)4=fOA+H*1flUmpK)0u<~qm{P@j-EZT(!g%ezJ&X4i&%
z(B#BSS*(pSTsmLfoT_b0(D`Nqzx;ouTy)WdW|P!L`ksm7b0c+tsfZf<dDqET-e~JF
z)G55hu72g%eiq&leB6_rk_FP1ciQOiUdy?H@EuijHvMxz%Jc0J92f4RK=b6F3!Yd<
zK#i4fgbOFngc@l&>n30`ywyiT-*cy$+BS!l;Qz#%Om6;{7>9q_{zB4cr2FN$6@In{
zrkE*EHtp1>1p_KT_-s0pe;9rt^~WdeHh%G4X@WOg!hBldTqc`*v_-i;=Ta7$m{cAt
zHBwBBz#dHhPJ+#liovwu-8)}XUU%|sib9*6XFef|83J1!EyOx<L>1ohXzJRN<js7G
zX9&&kK__@MKzSfsv1*~dls!Mmb#~Q7@O4?0=bx!4Zoi}?v$wYABG?PIs{!T&C%KYM
zDytXQ5$9T5e7T%YfyD|KaAJohtrs8|MwO|$0wp#J$gC*Sxr3%R3c*7kX;>>b=xIf1
z_}_@=iJE<0e+_VF7|N8cpjU5U@`+@Rx5CKb+dB;Sg7>|*?S2=_0lS)D*U60OQ&CzS
z<vbK~Xn|RG@~-?^K!2LyilBLf&V3~Q`j&0fYTaKamrt&T*etx~L6fEUe(GErg*){@
zek3eNR=eMLR9sIVq0v#-iLV2nFUUY?oy8>D*(12*q3S=9b_0H}nAix7AuXVCYS+d^
zQ0#veFB{J45!n*u(m%M{{nK({QSlAG$iN~LhB_&ro{rVFEg3!PU6t)+P4U1q>cTH(
zX@TIciK7Z~;?NKOV$?(bvDGn_G7Nyrp$@eVG%|_il5qVV1hGtYLVL3tLkOe^G=vrZ
z&`6nf>aUkTmpNaS9*DK{ccb>Zw_f60RwW6Xk7xo)`2r6GwdsjOC4Sg|^uAK<H>3){
zEm!p5x=0i30dIPWzFh2INL>A+G~UiaWJ=H=xcL4`GTbC_t*#bbC9~>$Dfp$fZrAgP
zt+^+EdhgI2pIQz}p$s{3Dk#o$1`mf8sIJr}K3Ec<#xOhFu8+6)!L9F4k4L)YSnvs&
z6&mT0XpkP+t5DY6mR2oH_gcfUWk$aC1?Kf$t+%fI6w*Lu3$Y!(C*Z-|p=~hXrH>Lx
zF{0b)i437=@!VRj+*?X#o__hU1o>adR6L5bt>lfsFr=BWN9hOA`=S{4%X<XKK}S_{
z6ob}G<gsR)i8Gy;eC=B%A@T;lHVdtXbprWPgLbeHdECffHT%x5BWRah3G|gUI#ENp
zdf0!ysCoE2?79ubS`Gh5mZn4!XhWckyRt^wSO6O@O-e1=Fp?)|>cnnCSwLE_k9I__
zv{VhJEl&6Mc2i+5uhI?MaL5ZZGo)}#q7sYmso+zwe5hgnV0oKQBdo!C8X7&I&}V(g
z+{WMPhWR|<sFQmOPnmP_36iYsBzwmcWoF=OfZcPj9*)K(1CK>@ezz&K_J*6~&m%Wo
z3Jsh?Bza5n5mxlEMR7dgnwk{|L?K}~v#B6?D>%VuxwCwOTc-Y6*!~{S_qD^miOVMu
zio=vI3YjV{?<r`kE+JF~Df+w}=1~c`QL{cU%t5X~)m;$<h;}5}X#c(ar#X)T|GjJ=
zw?e6H5=1|yzU0{A>oIY4Nn*(kNZWq;p*Ws$&*g{`fV1#EVHztESyYExM6?CF!~b@u
zLPuNMI|QQuL-Flc-1=~sI=x-XTxIV&01L0%f{EC_asuK7na<$3PP*hXw3G&O91hPP
zzjdw*fcm9%6=T?r(qUH@63fI%d9W+}n;Z-;0)QL&x5&PqEA;?TFsH^vfK=VoHw~Q%
zjQXher!QOl1a7mSnks@29%GKM9Ly|SDuM?8_H=y=X!G;#VQcqGkWk(NcNle9kd#lE
zIyna_sRDX$OsYgoEwY}qIg!p?xGROT$6YOx$bAB0R(3Y~XpG#1@1rUk9HM!XaGZ<X
zWQ6PEICE0Mlx?Q-q^gQ0tF~ocOUW8$R`oZ=1*kKofXDdWbu|6OdZ5uqTV+3~$UT!<
zT{~MlEl4%JA`@}A&MUB;lfk%BL@NQzP$KDf=`3gwbZ9#krYMRr=0eGsEn+7;59ORx
zhz_3<2b{C&F$!s>*dKALWdC-(tEp7g!;PEk2x(%$hpv6#szKUJ4W9}!ul=UzK4gJv
zn!8NSnf{0u@5!CcYR^X4V}qP7HSW={gTS$`XVDjMS_V;;qWbF(9QS0N>rgsGTD%P@
zmR^^jl<##vNMd(ny~iS5y?abX@bukJ2$|+VP#{1Oeik2zWI9|l^te&FW}q%K>XQ~7
zh<9s_+fSzb=~ahHzkmr>Z2drpAOhl_o)A?D512@bfrAK0RwA!S1~LpEvIlrN<aAh(
zJ^>J&Ye5tLKt$H@2Lf#s*g#w{hyQ5LY=rHy=aW^vu6RA}m1=rNrpsxrDWuLDyi?L!
zbgY(_x~!n98DS?cQ~k8Y@Bz1m;G%`)V9F*|DEM@et5*C?cvLKFtcd+k7KJoX@L1M}
zvfT@R&ahoLDc$#8Z8Vu8wkk}vD$jv*a24Snu+C#*_(mLmFdmE=JB5~7iz?Gk`9t-K
z3%?qReZeRCqVx+N_%uCR_uLox6&=b3Vrm4CKiU*tK^e0SKOjKX>FeS7e1S*-puoSf
zspmnYHBKDS#z^%l_=#`K5quYAnInddX#?+X6=kHn&)(T7d?xq?C1tkXzf7PSKjo~=
ztQZNpk+&|pqZQC|3AtmuCKs|=CCYnEflfq@QND-SQp8lu!B+fXAPi;2)I9(ATox}c
z9~-oKMh}V4|2uFyIXN7^VAa;LSRz4>ZCBJrr?8%LL#UKd*};hMN%yCNd03vA&neZv
z#xMV6@^tjALukR*<zKO7u5phk#nS3!n;GmeVVT@!s_~zx@U7u_K&ZtgvM}j%>hoCX
zA%}0$GI51CQDlvUp3KCQ2O=H#Cfzviz_zZ1#b()-dqz*4DrHFgR6gfUI+9OfrS9)v
ziObZ0dpAdRrXS|fLGSWiDR`)-qxpRqqjCeoPkP>|Q=F4@oELg~mLTSX5HHU>+2nT$
z_3xA{N>#rwn~fWm<-ujFg*hRUnfJtMfgTXM#I;yn8OGXAr&$>(|NQ8+Mb*jT233sH
zorgdj{w@|Q8i(@>{61Qdyl!F;MWhudo-yP6U6!?xmZFyFvSG0(LG!y6ZJjDe`-sdQ
zgwl1ZkTQPE>Q<p;Th?j!fZ`)tJP?hd-*)XYUJJ`=&oY5q7u0d`Fo(l`+#)hQT3?iq
zRsdU0)_Dq<y^m7@KmG1g(W~x%6G)8$B&A`v<fq_E=}|uqMvi`+Pw6p2desbrl-hLE
z0MB6Lv|({3mbM+O1N69nQ|m7t409`+tU(nO!TnOx(XxwVaEfGdA(uB_EIxki(iw^o
zSX%^f@_jS=fh0P(-0XP?=*I50%{@7kJ1B04&@JyJ+OiGWxbC)EDIv%X8L=w)^?~qf
zDx|#b4Kj&aqlnE9f7<jK3%WhrRQXzvL14_*diwcH&e;_xzl13$h5bxfvl3ZPH?yhR
zg@q~&k276seUu*WET5NcIfu^q;A&g(4O`O}z?)3JwCq0$oCrTn^kq(FfD7{}a1{*b
z=5xEuPLYk@RJ#Qz2vgnU<dx8K%3gYr{M(?kUMo|b3936QJjBFKF>aw4LNkP>tonW_
z@)toDvTl0)F?ziRLC-gLV2L1gk&QH(6#eRWlF^)>vO`4iv>6z~SH<yS2FiKaM||X2
zB2QAi52hCRcvbTL$|$48?FqzIS1-X)+&<uS;su%IzFP<s!5HDnK9cuGBjT?lX74i$
zUG%r1U&X@Ct71Dxo^=U8-l!P)b%j5fN4@y>Tlh@bAulleh#uyNQf_?e`+ZZ~bG{dS
z=N=f2i+)HoYjGQ8kG=#_O>F;0m->N8w*!+l?wxQ|;m6QW-J<?*Lktr9G~d~@Qm1{s
zuaxg;jcqt)5*r*{FzmQJK8Fs_tz?38Yjc*uhh6GoLaF=F2x%9A%yRvJl*D}IdWSK1
zP|1d;?|YOmT0sWV)nSh)D;`PF8aR7sXxT#(eg+chR%rgf1Z@spgTKk!I`o+!Ft*Rg
zmAtb5lBLM<qRUHqXNWzh?3(eb4rV&thE?EPkenn^gCVoDL%Q>HHp`XD)JjIxQkX@#
z;Yl=ewYb*y^+D+J+cgj{3-7yatxtiEPg%8B^+Uu_sG<fJ;SF=|bB9Cn4Q))A%WT4V
zsCR^0-!1mwtO#KU-Gz02A>m_->-U3U`VJli80|KI$1*xv>u2i<hrS-)z3wc$0F8pw
z62zA(L**ZtopY8{RtTA_TMp?l7jQXy_hc-YI71@CU5~ut;^rC^cap*8#Cso)^sB$$
zuRp}{wW*r~j9NJCjrI%dDk9c!ELa^p{rzJT+GRL2sDWOqQ%KzYo}q9WUD91@w&nR^
zu|Nv>Z5_RgkN~frRbi4KG6JBneL#d$(H}W#$Td?LEiBFi#E$i=+k3TuUgnmDCPD}Q
z(Yl}FOq4%_{e}3n;kZe`4w>H#mnD}MePkE^5YF{Fn+p$Lw$9!*1@Pg$%<d<_P|27U
z5xkj`=0ui+X$Y_|usazK#Q0ddn<xrS6qw!gOLt}q%U8Lq<W(B9X=oyXJW96zf~nHY
z=U$DSYKY0bDRz1m0(3B>AO@>F3sqj4adG}^o;=sTX7&JVVuKh>9n1$)UhoNLaz0$0
za=Ny&bI8sdcKa2*G8@(l^iY{-BxbH9f~NdxYbcwDbe(xJHA}63wc+@eJAim_gHuLO
zh}TjEVja`9l*{rX;y3({X1h|f5BAc+!cX&nKfl-Zu@K<`Oh>w$QY*&?W5WcQPJ1R>
zhqI6Lyc|l(it04-uAu`K(E5=K(Z8n#?gGTv;h(78S%FmAKzJ_agCN03#>t!s@?Gkk
zfx}OQMakbya!|j#_n3W~cTL<U0j+0k&p%E4R%WxYW)hSIZ|Bs)DXTu>4Bx^Di=mNd
zs=JrQuAk~|=HGIPL4(;vGcZWX7mmqwBV5l!+68IZVI+SHIx&(2P_UL~2FFxYliv3r
zzzXe4P?YwiC*z0Kf>N@#o<~~?a=8eKc?SQ_yjrq*?(#6cwKVs{pQ7jo=?ybNE2Npf
zRCRXhGX??=)ItVy*-cmh?GgCZ0`D}<!e<I*YKfb%^@IKjP)N&Z^jA&L6#scvoM`Mz
z(f0+yd3K5n_uNyq+8%SCHkUr-3_AME??>paYr`><LG$j>#%Aiz)Jj>)Y8lXF2&R-S
zBqaz6s}GDnIG|;%?ZCF_)Q$=#(68jY{4LOtFx1SD(N3zDT3@kDJ+@dsuPsS*H$hx#
zxD3w|%1|P9tUH;HMYe}J5VxzxzcA#Wt2O3%IfQsYYrCKyHLX<<!S|^avU_#;quf$g
z-rXMf>~LnRBC#%^x~7>D5e?Yat@u?+O7h0qgz+uJB(XTan8BUe`HecN0wI`H5niNA
zmW)?T8x`A)V@<t`H5$49w3i8PgIqS|<zJH+51;glfkf&}a#8cZ--9++gfhPSRwfLK
z{ST#%2=zGm*nIwyB&j@$&K{C;-<Z~&v<A_*IRqT;PLu0?K&u$<oG1~eja4MS&0z79
z2}$@QJQB7DGTB7>QG9&0oNl$z;)~+==TLQ7)s|3r1s4u>xTLpY%CnwPdsp+X;iA;Y
zV+ym{eYzz(%e`0Xm;WESD*gJ);Eq9$5Pq|2Tz0QlpMIm2oP~jPss;GGl?iwK5NV3U
z66n6hk#y;F3ZoHj?s@f5w!qz@Qe2zPOaD`B42(^?d~xNLI$7}?%uiGMmt6xC=NWs^
zo%!H&$HB4Rs?jrJiUwBk2($Vx->_-JP^YBHgF&yNM&Q#DL-TpW^kIQAsW?O<|JP$+
zr^)YC1Cfk_B)?JxuZuaO5f9ulrw{KDOcVYUzyaHj%?MoM|MNQ_T0Vn~KA5yP{o!#P
zfrRw_uDi@X`&w{7Mz}78EtK1lClgeC?sY=Xp_)$qxl^w@kGb`VMO=+YBox;W<^?Z0
z=7taF;{9&&G{bU=Wn0cfxb^n0rtbHn-kz8}9AY`kBpNvcjY6}9Fgv(x-ttpGX9cf$
zZx~9LV?e!%Q2uXG)CFiAmIW!736&%FN;hpx)Lf&fYIRGD#1-_T#s~gVI@Z!}c#p50
zotFk+fpfGPFpp8b_fZ`GxLnW*IzpOH-<-H7WljvfsdYA`XHERPl9c^=yc{VnSxKE;
zq&^dmx7maK4rH??8f0bo&kNOggzuvXVirIYwru|<rB~5UwIX$RhEU9E|CYP#M&P<Y
zlfHyS+R$h6>g)!!=N%tCOdt&Jf?9h%+6*z`Mmmfs$(<ps-K^|P_K@pse$z&QO9s8p
zsHp$)2OnOvh3c1pX<17aIzyA#>CN%SkvT$t;O`GDg(8TW#=rWj^}F#H_Fq!QwYQX4
z$j6Z}r!E&+%+ROhoUFTzc9WZ~u_s@~4^QWF(L)O!k%TeRFsP^-{N1F8K9cuP_KeKD
zstYPUYyXod|6gouNJAQIubf)7xvn7V<k>BL!4A6l4{#<mE9){sm4clXkwinA9KkQz
z#0v0yyRW2}9m#aMa-PU5+#~`qt0A3$Gl91bDC$cIa!L&C?2<(081e-LNZ;27yPrP<
zS@~&<Z+t%^cJ;RvyaU0jq8bwBTwN&FyJ;iOqofktoOxnCSBl1optNbpc{Vt<G1%*i
z2k1|vPL}VUf@^N-CKYWp3abn%c3k7DLCf&pGs?D*f-&u*`k!T4(+WumT&Ht&C)d_4
z4Dq27<gZ+eUbK=WZCWLE^=pn<A)5~!d~tQ>U!1KE6_<aF-Hi6Sk;Uw@4FksQk9<#C
zwoIJwdHH`p3QCpV;nOZuw$FwQJ?8CLmY5Y}nck2^)i`6MD4S|&5F-i^tp(UQ<ER9x
zg5aoOh*Zb66uDsZUQZRwuEH*{by-&s+yqEK7SV#xlX$o)$PyiiJW0jg0wiWF8Ff;@
zwsRfC%Qqo{q6BGRKXNieZI@e~z-V=~N-bg<jJ_njQ%oN<zH!;KGaP~CS2ZNhwX<L`
zr(WS)v=d&*#Nk0RZ7LZ!6G>dmG(2kPwt+-g&wrIq;nMEk2U5yDHb%3S{H$0+M3_UM
zKyCff6VgJ8Qr5f*vQ)=^9?Z3*(4th)NP&J;jK)32Eq=6RlzzN_T`Y?+tVHj^DrMfz
zzAnqU8@^a7E?)elwxTvh`L1{)wCy*3G?|)j&zlt0nPa5p5F9)QQ1jFHfa2%KvVymv
z;lIG##n_Yn=q|;_M-)42580^JXzgk-=OV-9aDq@XjI*!;GECUZ1%VIV6OEUwmRtY=
z>8}{e4NFz^9-goai8_7DSC3R>9QjVID=)rSgiyW)ZiO+;u)vZcA0?%Y{%_btT}2Q>
zBzOh`zBVgBrl}!Hd`sfWe6;X#)dVlpF=Ak!ad^g9M@{RenImEez52&T#x!=pp4%n|
zf!Fv+e^vF)Ll7iHn|H$MUtb{IAe}g@tdt(Ie~`__Y<F^Hqg2qTDKUGG=yw+50Yg7J
z)v(Y4WF~W#lN*AJD#?jhI$4vI*1nH;0oY8RijO57vN}rw!>|k4X98T&E#}9)qLNdg
zl*9pyH6|cJii~@kpU0)|3v1dDeLAP#vPy-b4(~R@609}nwJTmF-#bzmj3P{L$U2gH
z^q7_Y1g%DLHBfG-F$*XZp)feTy+%}0JBDxa8t5M}va_vdf9-pI87@ulG{aLCWD_SA
zj{W6|tzWeR(ghL6Sa{*e-;LgAjx2eX!gHDsgRm+}%UL{G6M<PCx^${q+|LL<&27<>
ze{5JhuT=^>L0-=)XXZkL63(Uzhe>G{CBp|I-G-jvt@z3y+f|J$v<u&>l-(=!`c*_m
zTFe{4B=VRGo*b7h0d>DDJ);Z}P>s-z@+=cwNq%)6-v&gcw)WJ@x5yXwn{mX)U-lM}
zH$ZHR%fo-+mw6=+OwA`wX>k|77vgp3Z-?~*7NDh0oa~lAQOBg2Pf2PZ(nLW?7XJo6
z=7=59O~q9)O+QgQ<|tz5UHXW~J8Qfye$_C4>9tV*B?8w8k+&^i7{wgK`==ER>7%gN
zhGYHr-p=!WWm>lktu3c^z=e>+6Sywg$yasRRGs845SYpqjpGH=Y>3+x;LB*JnEvVc
zb=~pkw!|ywVengxh|BZ<FIP0zWLB@jEXal1Z-$j$I++EHTptnjs<@fZpSMZ38xCJC
zZ!P2bI!T#n8#H;PpzF{~*V&K~x|;&myRzR|f1^U_5WG<d%?-1wVON^Hz*!{ePOe4=
z*cf;au!mU5qTGnqs3aj{9KS@zB-8mIe)`7DyZIVj3Q@kK3_Q@fHtJ+Eog}$b7Gu(v
zq2#HB7`Y8;Og57kp*va8@#w7N1f4!(lC=rbu8~`>F&e!tEWY+jLL}r_UV{0FN5MzL
zgAujH59{k`0e$G<qy_l|uQ=fS*+tlTYauJTdEEBvR=un6YpEmfs5F}lX917fq<lw>
zy~)JYe>Lnxqz&*m4Yj^OY<MhIvcB|au1HF8g~$&B@y1AE+V9dF3*Q!>es2PSazB9^
zj1!hD)P$NqEFO|(9a(4O{xZ#A3fZ@>-6!`o=ckK$&&Zq*bdjr7TUFd#idq5s4fSxh
z#`jaKlsxN<BZ2$e;?H+7`={*_OSeWCkH{S}XXKBar7yWZOn{rd4-=>d>s5Gr2aw-(
zs~u&GozE%10ON6yl!8bsFTKd@-U)RgNkGp7UEj4X9sE)dqPN%NMT=zkg02F7A|xZY
z?CXyvg;8p@QzuXZ>@+W0gRM(0s8m&v=-x~L%B}<N8f=xHoZ~;7UB`*!35lQoRaJ~a
z%Im;KSA#bw--~L{T!s#W|A*W23Ig$xD;lvf40x+-nDCiD1B-ufvRtzxOC(V2ual<o
z8B}r*Q3R>PinCfR6dFQOs<|ne#d3l+dagJlA@0g|!l7w^MRoW+aVjG2DmpQ!7qTN>
z2Y-Z1JNV3y1x-yX4(T=hnRLM=q@BS?7qyo%o?W2}sdwWiTq3;uLcnhd>WG>V(If;r
zj^J*;WEuEK4vIh>qh>u};!#R=*Y<&j8$INk?Tq)~);w%Tang!_b(ph<!H%lr0YM^y
zZ6q@^m#9RHIH=B&zeCyAICyxdk2mu5-|9t+LZ_jbIzNdEGy5>64Bzd(T5jHhn>@z4
zZZT%oVB~=Ca6LqMAUCfx2rf}c2t6VEcZzqZtpW;UWJkBQqLgvHKPhU`W+9vkKRcFB
zK!1*w>Jn8tvVwB0&#qgpB042>qiMVJa{Pj&1%bbK-WscHZZutT&D_ehemowGk5G<1
zf#)EWGi^I1zb0+VTRGBN)c*<eG$x-3nW|akLzK=7O>SHU(sA1(Pn9*X-4Y_nF?_jQ
z#jDoeb+?{7d>W`wMQ&K&7Y}g9_$me+U3Y=MN_q);=8&e*oUqm84uBHV3P)R8g_)o1
zrjmnp_Gx^vM=A9&4kG9J8MgVsR@kmJy0T8nUlgUG5F5<@;ydUi8W(S)#dsTGVWZP?
zxGM{k-9`*i?*SmH-(KMxp#MS=SL6G%d$@z^m!EeB=eENt6f9;$oThN2fVRRMir|SE
z(lIs~p_p4ValKqE1Qz73TeP`hbzM*rs06F%3)dGs*a-Ua0}1`QUqV+is?-6Z?<+!Z
zAZS!xnATg`p9stUxg$r(T|InxZTSmv?hOw|KlT8_w}r)8)Df=c8guR{UZw8LXe4<#
zCs_pqb?o1U^h-LO)fHEIs<cKd+3M_p@U_FO0mAs~76by2rU)m{EcyXQTStseOh3?c
z-ZybXJ$cB-EVSOQOh~qrpHa0ak_B{=%IJ$KmdATH93tI=tNEMPk-QqkPP;DkmrH(3
zxGSmZzOe8>b`D%&yg0gN4HY4YW^TWYa=`qopjD2o8*%Ei5*kh+F825zmm`=G=s^US
z`FRu4(-jD>h|B8bj~jYEJe3|sqk-C*J>RQILz@uUGgx)`-cL9qLqB^YQW)me<wD6*
ztJ`)6eg&BXI68<}W7a~ObhQjCFuc6zIHuS0AImB5l-vM+mt<z?4MD=PU0M%19$3+@
zrqma2#DMbaI`va@>6=iN8m~nxadBs!xHD;GS|S{(OC4b|ME||$F*0RXk_(O<&4%04
z_2+HEz`zPBk*tVv!2)*gAYy%FQHURjo*7SA?+B+o0SJmH^fJCX3T7affj9gUxu0^=
zoY%eh;S0(AY>v4}u3S1Evhz`ghG>Jzc>gSCTDkno*!<)zn>io58R&^qF^?6+;%xH%
zxG(kO#dWr5v`D|MMWw}T8avW##?=FD`8;hi%`_Tw{@_j}4P1WZLsD);jgqD|5+Q41
zCxSeHSZsz^pt<(<yiNSQPI>NyZJpxnOUli8Lxea%@ONw;2@bx7jY`}oK1VnO;tmmW
z=DbwdEfTpm=^IAZ@jJ@L{zim{4Mla0(Nu#Jugibx^So{=!LtFO<rT?T&7;9Gk++}+
zGj|11=OxePjuX>=t$rRea!Wa{mHjSd2Vc@P<zM{?|E~s)SFP|6z1IiVoV4nxqjDi;
zk4nyq?9x^+#yGzBcCq`cwkP3txdtb4HGT+}>hJlj^)^_hE43#916>L@56VvIM(pEc
zLCr&(K&_iB$yvYkXf%=f7s2688B~x7eU*B`hiaI<AzLx{WDsHoeoDPU_myVBQwHIs
zdj7=GU+y>iNvI?iOvd+}fIBUh=|Z+|d_81yU7n7jvEKz*=LoeUnlQK%aelxB!4l<R
zPz>uD$K5~HQa9srm4eMW&w4a7bAbinj!0sJOpY7`G{e=c+HBQx3*RbrI>1H*VilUv
z)g(7u_Y!6S$QRbYpZ+EvD|PExB}RkW+Esmy4G83f;>9Q7s)HN7A7a0hcK`&VltjFZ
zqF)I*n*TE*l=m*K`_^P3SR#MDB8w-hRe}#o6GX{+5>l3fn-${#Cm2aF>Qm!HUU_g(
z>sBu6O5>~nZU$Q0+DwyqiYGJLW3AV}xKHPPStFN|t;4u3-IFyZIk_%9+_yt02b{%R
zmKsXtAeXuIiMlADsH^%_|G36CwP?0dA?_#J+oO=0ab9^Nr;Z#D?J)Lr487OWK;`!D
zfH6uud#M4+uhm02^XAf|$nLMlqT~&;=!Yw#ygfHPCCgFBXZlD}Av;a5f3QtSEktE=
z_6!Cv_O6Bzip`9c3f6+AE}zx?&C>y3xiNDaAvmtn&Fp^o#``*)C#9k8u<G@<@rjFz
zI0OzLAkFVG0%|E{<=;#=-F>H<SGCF9BPIT!H&61@WnHPN+72)>pj+$bM{Hl2>5HQp
zxrFZf#udFPL0MWPq8)&qBWcrZQ`C#$8l(9k-w=+<-IPtb+G6Bdgw6=Mssg%duR}Ji
z6wLANY$@XBe&pWK?`*^5+RjZiy649jk${!%TPwwgE@q5G$gP+wiF2MD`e108U=jT5
zh<$;e&?;ac=={1VmNvSK*=R8Tq(IIFAaqmc`B~}|4H2uOaz8zo{1&Z{N6!#c7L6iC
z=#7&gQ938dwDKuXbaGPcjB!WD&qs&L=Qks?xjjf6QCPYQuU$0n_DI@KjibfCRQT)c
z8;x4?lGGT%k#A)~%gnj*T68C#(7fezP(#a5E(-+t^Anr>56pFA%cU`c+{_%rPB4ud
zR=r@@n)CV<7mA2ukwN9^47n(7)-3eh5=k|JJdp`Z+6Q(O4>M>-qHaiJGCM_p;HFTA
zC$V$IEEhZn5h@G%{y-d{)%GVytfC3ta#!>xk&;%QWZ%@xOc|5oq~(vMn+aw8rVx$f
zEg#R;9N8lgpG1Akj1DFAeP!l%fz65htq)gw=cTi|H@mAg%VYX`Tsr!EvY+k?cqwt^
z;3Rkv<{{W12otjkWEwZu&#Ht(m#<gjXiPj1O^Z{ePYJHTtQhS|rhd*aHT29vla#K`
zHw+<OFQ38JhOy@0Bhx@`QBHJL=zR@l-53D$_SnuWPEJ}Qx#f$Ml*o5=YZ)V1=zfWT
zl`OlpOyKx2ho74_L>&Eby_UCIe}$n=beKA~qE&x-8xb~&@WhHcmlafceG&fhh5GS$
zV}T(QPo$%a&6u``ldn|__|T9L65VLZh=#e0cT`~9?|XW%b0~!&hN>??1i-{}&@+7c
zr3SJ5ZapvxBhg}5o7UAZxsgp{=K4nw3CEC-rqz!1FCVvW*rRP&k0Ef%{Ov&6REZig
zp>*~ugm&>K+zUSAt^onR&}4}v1|gy@=q2lQ=z*y3Bi!Vj5TiqPGM~L+{|L3jX9AwS
zx#A2n!;2C2%la(wW+978v9vx1aRiy!Lr&l0y@iMM8>^4jhzr2S!^g+P%g4pTug&}F
z&8t^$`1lcV*&807m>jD=|CfLhqU!R4&;MWGp=Ta(;u&E5KRtNZIa#}VSU9=<zcPYv
Z1cd*0C!iF+euNC5B&Q}@C2bz`zW{%&l6L?A

literal 1838
zcmYjRc{r478-L$1jWH^+WUFiDSQ4^?7-bAI#N@MOOV-MoEgH*_Wg1IlH%JP(n!|}m
z_+-hTv7AC2bYvTyj9pA*$&8sZzVDxNZ@=gH-S>0ff85vgq}f`VA4A9@001~furR&K
zN7A9gVf;upy3r2+U{U}cZ%e@AQFp>aeFK7g0N`wHTrS3fZhWf8bM%Uts{A+9*PQZ;
zE~1hVW2zG6xZfqOM`*SD5H8kLRME&H2X=L3_f#dOH`E@lC8PGhuS-nolDraEQ@t_u
z`<G_q#yV!50pi*Rbk($A{;k0kVqxbg?vjbG;HV_6ia#}V`im%3MZ>;vOl)j>`uB4i
zcN4NaF8H1AR2Cc3rZ=YPr&j6(CvF*qB}w`e>^+ShqY8^*!`%Zm<rc~PkfDsC<uSvs
zq-*Dhbt7Fb{cm?uy6qfCRXqRDb(w$L<D%y5vRcYXE`Lg^ABZT%TX>zY%t7HyB$e`S
zC|s_#ewZxrtq;RVto4+CgsT;kHaKZ}A2zX_$m`k&so``->!?TwwtAdeyd@1^hh!Gd
z#Ud|R&p}yO0q2-0&ldtZWz_M>>p$R2Q!tI%sp5J;w{<|kCMD=YEwfUExz)**iL*Zm
zpM_uo2N~Dd=r~|x%yAQjMnf+n^4r(Hudjb(a51AR8-g)e;Z+OtTx<SXU^gwzP5H=|
zpZK-}J_y~haJdTr8VZLFM*oJ5<dcF#f|Z%z0`#c3fp*}_hYoy7hG=$;hz|`8_6Z>Z
z_;8;aL?3TdQ~=Q*WlpfNb-sUG3ILA42&N_u(UadwUfq=^NT+xfiNC->O@hP7A1vI4
z1IdO_xvLuMOs;xvZkVz`l-SXTJoML;cXbjsMIGj+)0SHX)?dp(X7IZMTMkyiPT+yj
zLEH>IyO2Nr-}3CX?#d>PjWlXfl6)0M{dvLD#vTgSU;6CU)2TVDK%#!r=h-MKIf_5G
zD<2kIXx+~O`dC;{QC)FRaj*)7e~v3(On7q|ODq<)Jt89u!jP7-S6VgB|G;}k=joQd
zsuY4WALI6N<nHZAh!buRC^@G7qOt8}{?Vsm8FL8*L^)#?+f<scKe~7U#|+pLAVlTG
zQ+}jVLrAODO;lP-{CZ=|vhN!=JCISjjTh&zGSV+erT4t1nvb5ms@lo*;1Ndr#JR~;
zbhC0<-HSDh+YPQ2a8|^7-c0@ht;%xzEiJP06Z<RPGSyIs*YNnj-LWjvgxu4jba-#V
z9dL&WMcF75)4lCNlsqTKQuIW8yHYB=gCS<Bl!AOx!%%+5D~GN$#tiw)D5qXQbOe(-
zs^2?pNC>s&HI+Dp(k9eB-LPH_R4F}&$b0%{=JeCHW7G^e2-_t#z8+IlOBEhPICUYs
zuJB4!cv8&$5TV0o3-yxCA)tT{lIiv5Zv3S08qCBAXjmDV9rD{jYIddfyWj6eXnA*p
znvq-|tyWghClcsYvy-)7dNTsFB)$Hq!e)FA(q^x^A1NN-#yH=vn4g$++Q~fa+wny8
zPH^w%DTLOY_Rt!Gzxt#=(azgHJ8sTyaA=(cgL=c>JL7E#6aca1u1>>(97#nrp3AQ9
zr1@oXp!LsR&Y<U_6#xjo;3-X@S&=f*()e23|9_)I0g!Lcn)tc@>nY3lXOR5#f-rLc
zY79Wp;1<2lb@OaVO(wD=WZzpMAIpG~0KQdHiiAIOO&&IWn&pzI;V<x80WZ1cmR}G9
z@lnJU`sUhcKYoWx!?1U1ye2ik5mh&l4Zyve0sG?8&tey+_AwJi#E~9BT<-!I=>60R
zEHthOId<-^l{KT&-pb_F48*h1CrGNIy=ze}V0fVUv=sW+S!}qARY{3d-Gut6b@gs`
z{oU|e^@a~SlrRJ1_I|E`<4EDM$4<tQ=#U*7<{s_gs7|6@+q`AvCrhg%OO)ldz5W5N
z;x#Y>T8&ftGSEp^TRe!xM9?VvFS>*O^Kxx<;H4nLV;fue-%O2prY(QXmq|3V>56$A
zPlS-YwM}%C0TFFv&16*)l>H`FgwJ^Vl~@=P)9fO0F6T?z-?MGgn<egmB1?_a04G7Y
zNeOyjPG>f2NY!{yi6zfz5N2gUuSP!qeFbaqsHlcPZ=vtvNMz{H2bwR#F=9jdqavm#
zjywH8S>mU*_JUED+k|<)W(L$TK<GvNJ@#(iWuF<QK~hTg^G`fh*t4~<H94QfxkiEG
zMhWIbCjR|y6J#wwNQW?#=K*n-<BYFb?WJYg)c?&sTP#3%P$7GCp7(^1R<9p^Ca;$U
zLuLSAny3S-OQ_B~DX_h?JgRmlXLs*$y=FI5Jhl!ZVd^ghZC15Qxw(|i37wk#Y(g6K
zPTk%I^X=oEvFdJVEo71QaL8KjjWXboAl&X~Y?}>9HOV6YWQfjrfmJ7U|NS%Z&tne~
Xz<se_CN5=!^d6=NX4a;)I4|-)Mr}=w


From 59cfe95776238f047131e497124c97d69d838c2b Mon Sep 17 00:00:00 2001
From: farwyler <1705805+farwyler@users.noreply.github.com>
Date: Sun, 4 Dec 2022 16:45:31 +0100
Subject: [PATCH 600/884] Add support for single-line comments to scss (#5003)

---
 runtime/queries/scss/highlights.scm | 2 +-
 runtime/queries/scss/injections.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/queries/scss/highlights.scm b/runtime/queries/scss/highlights.scm
index 89cce494..8ba00a88 100644
--- a/runtime/queries/scss/highlights.scm
+++ b/runtime/queries/scss/highlights.scm
@@ -1,4 +1,4 @@
-(comment) @comment
+[(comment) (single_line_comment)] @comment
 
 "~" @operator
 ">" @operator
diff --git a/runtime/queries/scss/injections.scm b/runtime/queries/scss/injections.scm
index 321c90ad..350ea9e7 100644
--- a/runtime/queries/scss/injections.scm
+++ b/runtime/queries/scss/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content
+([(comment) (single_line_comment)] @injection.content
  (#set! injection.language "comment"))

From 417676953bce6a4be91f4b8da35ed0e361b585ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Mon, 5 Dec 2022 14:40:41 +0900
Subject: [PATCH 601/884] Add basic support for common lisp

---
 languages.toml                             | 15 +++++++++++++--
 runtime/queries/common-lisp/highlights.scm |  1 +
 runtime/queries/common-lisp/injections.scm |  1 +
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 runtime/queries/common-lisp/highlights.scm
 create mode 100644 runtime/queries/common-lisp/injections.scm

diff --git a/languages.toml b/languages.toml
index d214a082..325a39df 100644
--- a/languages.toml
+++ b/languages.toml
@@ -878,14 +878,25 @@ source = { git = "https://github.com/ganezdragon/tree-sitter-perl", rev = "0ac2c
 
 [[language]]
 name = "racket"
-scope = "source.rkt"
+scope = "source.racket"
 roots = []
-file-types = ["rkt"]
+file-types = ["rkt", "rktd", "rktl", "scrbl"]
 shebangs = ["racket"]
 comment-token = ";"
 language-server = { command = "racket", args = ["-l", "racket-langserver"] }
 grammar = "scheme"
 
+[[language]]
+name = "common-lisp"
+scope = "source.lisp"
+roots = []
+file-types = ["lisp", "asd", "cl", "l", "lsp", "ny"," podsl", "sexp"]
+shebangs = ["lisp", "sbcl", "ccl", "clisp", "ecl"]
+comment-token = ";"
+indent = { tab-width = 2, unit = "  " }
+language-server = { command = "cl-lsp", args = [ "stdio" ] }
+grammar = "scheme"
+
 [[language]]
 name = "comment"
 scope = "scope.comment"
diff --git a/runtime/queries/common-lisp/highlights.scm b/runtime/queries/common-lisp/highlights.scm
new file mode 100644
index 00000000..e11eb788
--- /dev/null
+++ b/runtime/queries/common-lisp/highlights.scm
@@ -0,0 +1 @@
+; inherits: scheme
diff --git a/runtime/queries/common-lisp/injections.scm b/runtime/queries/common-lisp/injections.scm
new file mode 100644
index 00000000..e11eb788
--- /dev/null
+++ b/runtime/queries/common-lisp/injections.scm
@@ -0,0 +1 @@
+; inherits: scheme

From 03ca18b377c1dfd78e8ff6bfac6d418de237923b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Mon, 5 Dec 2022 15:02:13 +0900
Subject: [PATCH 602/884] Update language support docs

---
 book/src/generated/lang-support.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index b1fde001..ccfd18c0 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -12,6 +12,7 @@
 | clojure | ✓ |  |  | `clojure-lsp` |
 | cmake | ✓ | ✓ | ✓ | `cmake-language-server` |
 | comment | ✓ |  |  |  |
+| common-lisp | ✓ |  |  | `cl-lsp` |
 | cpon | ✓ |  | ✓ |  |
 | cpp | ✓ | ✓ | ✓ | `clangd` |
 | css | ✓ |  |  | `vscode-css-language-server` |

From 1e31bc3f77040d4a3663b8b6bf72d8d3a632b88a Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Mon, 5 Dec 2022 14:18:42 +0100
Subject: [PATCH 603/884] Reduce log message about diff timeout from warn to
 info (#5012)

---
 helix-vcs/src/diff/worker.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-vcs/src/diff/worker.rs b/helix-vcs/src/diff/worker.rs
index b8659c9b..f4bb4dbf 100644
--- a/helix-vcs/src/diff/worker.rs
+++ b/helix-vcs/src/diff/worker.rs
@@ -185,7 +185,7 @@ impl<'a> EventAccumulator {
                     }
                     // Diff failed to complete in time log the event
                     // and wait until the diff occurs to trigger an async redraw
-                    log::warn!("Diff computation timed out, update of diffs might appear delayed");
+                    log::info!("Diff computation timed out, update of diffs might appear delayed");
                     diff_finished_notify.notified().await;
                     redraw_notify.notify_one();
                 });

From b0f20f13e3a606cba35cc70144f045a22b5b38bc Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Mon, 5 Dec 2022 14:46:59 +0100
Subject: [PATCH 604/884] fix git diff when core.autocrlf is enabled (#4995)

---
 helix-vcs/src/git.rs | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/helix-vcs/src/git.rs b/helix-vcs/src/git.rs
index 82b2b558..432159b6 100644
--- a/helix-vcs/src/git.rs
+++ b/helix-vcs/src/git.rs
@@ -17,14 +17,17 @@ impl Git {
         // custom open options
         let mut git_open_opts_map = git::sec::trust::Mapping::<git::open::Options>::default();
 
-        // don't use the global git configs (not needed)
+        // On windows various configuration options are bundled as part of the installations
+        // This path depends on the install location of git and therefore requires some overhead to lookup
+        // This is basically only used on windows and has some overhead hence it's disabled on other platforms.
+        // `gitoxide` doesn't use this as default
         let config = git::permissions::Config {
-            system: false,
-            git: false,
-            user: false,
+            system: true,
+            git: true,
+            user: true,
             env: true,
             includes: true,
-            git_binary: false,
+            git_binary: cfg!(windows),
         };
         // change options for config permissions without touching anything else
         git_open_opts_map.reduced = git_open_opts_map.reduced.permissions(git::Permissions {
@@ -61,7 +64,29 @@ impl DiffProvider for Git {
         let file_oid = find_file_in_commit(&repo, &head, file)?;
 
         let file_object = repo.find_object(file_oid).ok()?;
-        Some(file_object.detach().data)
+        let mut data = file_object.detach().data;
+        // convert LF to CRLF if configured to avoid showing every line as changed
+        if repo
+            .config_snapshot()
+            .boolean("core.autocrlf")
+            .unwrap_or(false)
+        {
+            let mut normalized_file = Vec::with_capacity(data.len());
+            let mut at_cr = false;
+            for &byte in &data {
+                if byte == b'\n' {
+                    // if this is a LF instead of a CRLF (last byte was not a CR)
+                    // insert a new CR to generate a CRLF
+                    if !at_cr {
+                        normalized_file.push(b'\r');
+                    }
+                }
+                at_cr = byte == b'\r';
+                normalized_file.push(byte)
+            }
+            data = normalized_file
+        }
+        Some(data)
     }
 }
 

From f712d316e5d210e95f9d297651f1d753646c26d2 Mon Sep 17 00:00:00 2001
From: two-six <twopsix@gmail.com>
Date: Mon, 5 Dec 2022 14:48:20 +0100
Subject: [PATCH 605/884] Update Acme and Nord Light for git gutters (#4999)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update acme.toml

* Update nord_light.toml

* Update runtime/themes/nord_light.toml

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>

* Update acme.toml

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
---
 runtime/themes/acme.toml       | 3 +++
 runtime/themes/nord_light.toml | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/runtime/themes/acme.toml b/runtime/themes/acme.toml
index d3be695c..696a4a9b 100644
--- a/runtime/themes/acme.toml
+++ b/runtime/themes/acme.toml
@@ -22,6 +22,9 @@
 "diagnostic.hint" = {bg="white", modifiers=["bold"]}
 "ui.bufferline" = { fg = "indent", bg = "acme_bar_bg" }
 "ui.bufferline.active" = { fg = "black", bg = "acme_bg" }
+"diff.plus" = {fg = "green"}
+"diff.delta" = {fg = "acme_bar_bg"}
+"diff.minus" = {fg = "red"}
 
 [palette]
 white = "#ffffff"
diff --git a/runtime/themes/nord_light.toml b/runtime/themes/nord_light.toml
index 5270fe34..eb947d03 100644
--- a/runtime/themes/nord_light.toml
+++ b/runtime/themes/nord_light.toml
@@ -58,6 +58,10 @@
 "markup.link.text" = {fg="nord12"}
 "markup.quote" = {fg="nord3", modifiers=["italic"]}
 
+"diff.plus" = {fg = "nord14"}
+"diff.delta" = {fg = "nord13"}
+"diff.minus" = {fg = "nord11"}
+
 
 [palette]
 nord0 = "#2E3440"

From 5781aa026417bc6539b80b451da4a99a7057bbe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= <matousdzivjak@gmail.com>
Date: Mon, 5 Dec 2022 16:16:25 +0100
Subject: [PATCH 606/884] feat(highlights): go builtin funcs and types (#5010)

Add highlight scopes for golang built-in functions and types.
Based on https://pkg.go.dev/builtin.
---
 runtime/queries/go/highlights.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/runtime/queries/go/highlights.scm b/runtime/queries/go/highlights.scm
index 4ff8675b..927bd95b 100644
--- a/runtime/queries/go/highlights.scm
+++ b/runtime/queries/go/highlights.scm
@@ -1,5 +1,9 @@
 ; Function calls
 
+(call_expression
+  function: (identifier) @function.builtin
+  (match? @function.builtin "^(append|cap|close|complex|copy|delete|imag|len|make|new|panic|print|println|real|recover)$"))
+
 (call_expression
   function: (identifier) @function)
 
@@ -24,6 +28,9 @@
 (parameter_declaration (identifier) @variable.parameter)
 (variadic_parameter_declaration (identifier) @variable.parameter)
 
+((type_identifier) @type.builtin
+  (match? @type.builtin "^(any|bool|byte|comparable|complex128|complex64|error|float32|float64|int|int16|int32|int64|int8|rune|string|uint|uint16|uint32|uint64|uint8|uintptr)$"))
+
 (type_identifier) @type
 (field_identifier) @variable.other.member
 (identifier) @variable

From 5691ada822a7c6e27f8890ee25f52a9262caddd2 Mon Sep 17 00:00:00 2001
From: VuiMuich <jm.spam@gmx.net>
Date: Mon, 5 Dec 2022 23:28:20 +0100
Subject: [PATCH 607/884] Change diff colors for serika themes (#5015)

---
 runtime/themes/serika-dark.toml  | 2 +-
 runtime/themes/serika-light.toml | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/runtime/themes/serika-dark.toml b/runtime/themes/serika-dark.toml
index 88e4cf6d..2b4000ac 100644
--- a/runtime/themes/serika-dark.toml
+++ b/runtime/themes/serika-dark.toml
@@ -61,7 +61,7 @@
 
 "diff.plus" = { fg = "green" }
 "diff.delta" = { fg = "orange" }
-"diff.minus" = { fg = "red" }
+"diff.minus" = { fg = "nasty-red" }
 
 "markup.heading" = { fg = "purple", modifiers = ["bold"] }
 "markup.list" = "cyan"
diff --git a/runtime/themes/serika-light.toml b/runtime/themes/serika-light.toml
index a00274bb..ad830d92 100644
--- a/runtime/themes/serika-light.toml
+++ b/runtime/themes/serika-light.toml
@@ -59,9 +59,9 @@
 "error" = "nasty-red"
 "diagnostic" = { fg = "nasty-red", modifiers = ["underlined"] }
 
-"diff.plus" = { fg = "green" }
-"diff.delta" = { fg = "orange" }
-"diff.minus" = { fg = "red" }
+"diff.plus" = { fg = "bg_green"
+"diff.delta" = { fg = "bg_blue" }
+"diff.minus" = { fg = "nasty-red" }
 
 "markup.heading" = { fg = "purple", modifiers = ["bold"] }
 "markup.list" = "cyan"
@@ -72,7 +72,6 @@
 "markup.quote" = { fg = "yellow", modifiers = ["italic"] }
 "markup.raw" = { fg = "fg" }
 
-
 [palette]
 
 bg0 = "#e1e1e3"

From 7210c58a51a16c0ae3c9d77211ed1a25e039bd9e Mon Sep 17 00:00:00 2001
From: nosa <96927121+n0s4@users.noreply.github.com>
Date: Tue, 6 Dec 2022 01:13:41 +0000
Subject: [PATCH 608/884] Change default TS object bindings (#3782)

* Change default TS object bindings

Changes 'match inside/around' bindings for:
- type definition from `c` to `t`
- comments from `o` to `c`
- tests from `t` to `T`

Also changes those for the `]` / `[` bindings.

* Update docs for changed keybinds

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/keymap.md               | 14 +++++++-------
 helix-term/src/commands.rs       | 16 ++++++++--------
 helix-term/src/keymap/default.rs | 12 ++++++------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 6523b09f..c3c09f4c 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -297,7 +297,7 @@ Displays documentation for item under cursor.
 | ----     | ----------- |
 | `Ctrl-u` | Scroll up   |
 | `Ctrl-d` | Scroll down |
- 
+
 #### Unimpaired
 
 Mappings in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaired).
@@ -310,14 +310,14 @@ Mappings in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaire
 | `]D`     | Go to last diagnostic in document (**LSP**)  | `goto_last_diag`      |
 | `]f`     | Go to next function (**TS**)                 | `goto_next_function`  |
 | `[f`     | Go to previous function (**TS**)             | `goto_prev_function`  |
-| `]c`     | Go to next class (**TS**)                    | `goto_next_class`     |
-| `[c`     | Go to previous class (**TS**)                | `goto_prev_class`     |
+| `]t`     | Go to next type definition (**TS**)          | `goto_next_class`     |
+| `[t`     | Go to previous type definition (**TS**)      | `goto_prev_class`     |
 | `]a`     | Go to next argument/parameter (**TS**)       | `goto_next_parameter` |
 | `[a`     | Go to previous argument/parameter (**TS**)   | `goto_prev_parameter` |
-| `]o`     | Go to next comment (**TS**)                  | `goto_next_comment`   |
-| `[o`     | Go to previous comment (**TS**)              | `goto_prev_comment`   |
-| `]t`     | Go to next test (**TS**)                     | `goto_next_test`      |
-| `]t`     | Go to previous test (**TS**)                 | `goto_prev_test`      |
+| `]c`     | Go to next comment (**TS**)                  | `goto_next_comment`   |
+| `[c`     | Go to previous comment (**TS**)              | `goto_prev_comment`   |
+| `]T`     | Go to next test (**TS**)                     | `goto_next_test`      |
+| `]T`     | Go to previous test (**TS**)                 | `goto_prev_test`      |
 | `]p`     | Go to next paragraph                         | `goto_next_paragraph` |
 | `[p`     | Go to previous paragraph                     | `goto_prev_paragraph` |
 | `[Space` | Add newline above                            | `add_newline_above`   |
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 4cd27119..31a2f582 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -402,8 +402,8 @@ impl MappableCommand {
         select_textobject_inner, "Select inside object",
         goto_next_function, "Goto next function",
         goto_prev_function, "Goto previous function",
-        goto_next_class, "Goto next class",
-        goto_prev_class, "Goto previous class",
+        goto_next_class, "Goto next type definition",
+        goto_prev_class, "Goto previous type definition",
         goto_next_parameter, "Goto next parameter",
         goto_prev_parameter, "Goto previous parameter",
         goto_next_comment, "Goto next comment",
@@ -4520,11 +4520,11 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
                     match ch {
                         'w' => textobject::textobject_word(text, range, objtype, count, false),
                         'W' => textobject::textobject_word(text, range, objtype, count, true),
-                        'c' => textobject_treesitter("class", range),
+                        't' => textobject_treesitter("class", range),
                         'f' => textobject_treesitter("function", range),
                         'a' => textobject_treesitter("parameter", range),
-                        'o' => textobject_treesitter("comment", range),
-                        't' => textobject_treesitter("test", range),
+                        'c' => textobject_treesitter("comment", range),
+                        'T' => textobject_treesitter("test", range),
                         'p' => textobject::textobject_paragraph(text, range, objtype, count),
                         'm' => textobject::textobject_pair_surround_closest(
                             text, range, objtype, count,
@@ -4552,11 +4552,11 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
         ("w", "Word"),
         ("W", "WORD"),
         ("p", "Paragraph"),
-        ("c", "Class (tree-sitter)"),
+        ("t", "Type definition (tree-sitter)"),
         ("f", "Function (tree-sitter)"),
         ("a", "Argument/parameter (tree-sitter)"),
-        ("o", "Comment (tree-sitter)"),
-        ("t", "Test (tree-sitter)"),
+        ("c", "Comment (tree-sitter)"),
+        ("T", "Test (tree-sitter)"),
         ("m", "Closest surrounding pair to cursor"),
         (" ", "... or any character acting as a pair"),
     ];
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index c0d17a87..b6d9ea10 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -101,10 +101,10 @@ pub fn default() -> HashMap<Mode, Keymap> {
             "d" => goto_prev_diag,
             "D" => goto_first_diag,
             "f" => goto_prev_function,
-            "c" => goto_prev_class,
+            "t" => goto_prev_class,
             "a" => goto_prev_parameter,
-            "o" => goto_prev_comment,
-            "t" => goto_prev_test,
+            "c" => goto_prev_comment,
+            "T" => goto_prev_test,
             "p" => goto_prev_paragraph,
             "space" => add_newline_above,
         },
@@ -112,10 +112,10 @@ pub fn default() -> HashMap<Mode, Keymap> {
             "d" => goto_next_diag,
             "D" => goto_last_diag,
             "f" => goto_next_function,
-            "c" => goto_next_class,
+            "t" => goto_next_class,
             "a" => goto_next_parameter,
-            "o" => goto_next_comment,
-            "t" => goto_next_test,
+            "c" => goto_next_comment,
+            "T" => goto_next_test,
             "p" => goto_next_paragraph,
             "space" => add_newline_below,
         },

From 2077f5e26a4cdaadde4b505fc64eadb9e6849c0d Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 5 Dec 2022 19:29:40 -0600
Subject: [PATCH 609/884] Apply completion edits to all cursors (#4496)

Completion edits - either basic `insert_text` strings or structured
`text_edit`s - are assumed by the LSP spec to apply to the current
cursor (or at least the trigger point). We can use the range (if any)
and text given by the Language Server to create a transaction that
changes all ranges in the current selection though, allowing auto-
complete to affect multiple cursors.
---
 helix-lsp/src/lib.rs            | 38 ++++++++++++++++++++++++++++++++-
 helix-term/src/ui/completion.rs | 31 +++++++++++++++++++++------
 2 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index abc930f8..f714395f 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -57,7 +57,7 @@ pub enum OffsetEncoding {
 
 pub mod util {
     use super::*;
-    use helix_core::{diagnostic::NumberOrString, Range, Rope, Transaction};
+    use helix_core::{diagnostic::NumberOrString, Range, Rope, Selection, Tendril, Transaction};
 
     /// Converts a diagnostic in the document to [`lsp::Diagnostic`].
     ///
@@ -196,6 +196,42 @@ pub mod util {
         Some(Range::new(start, end))
     }
 
+    /// Creates a [Transaction] from the [lsp::TextEdit] in a completion response.
+    /// The transaction applies the edit to all cursors.
+    pub fn generate_transaction_from_completion_edit(
+        doc: &Rope,
+        selection: &Selection,
+        edit: lsp::TextEdit,
+        offset_encoding: OffsetEncoding,
+    ) -> Transaction {
+        let replacement: Option<Tendril> = if edit.new_text.is_empty() {
+            None
+        } else {
+            Some(edit.new_text.into())
+        };
+
+        let text = doc.slice(..);
+        let primary_cursor = selection.primary().cursor(text);
+
+        let start_offset = match lsp_pos_to_pos(doc, edit.range.start, offset_encoding) {
+            Some(start) => start as i128 - primary_cursor as i128,
+            None => return Transaction::new(doc),
+        };
+        let end_offset = match lsp_pos_to_pos(doc, edit.range.end, offset_encoding) {
+            Some(end) => end as i128 - primary_cursor as i128,
+            None => return Transaction::new(doc),
+        };
+
+        Transaction::change_by_selection(doc, selection, |range| {
+            let cursor = range.cursor(text);
+            (
+                (cursor as i128 + start_offset) as usize,
+                (cursor as i128 + end_offset) as usize,
+                replacement.clone(),
+            )
+        })
+    }
+
     pub fn generate_transaction_from_edits(
         doc: &Rope,
         mut edits: Vec<lsp::TextEdit>,
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index ebb4fb46..c54990e8 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -1,5 +1,5 @@
 use crate::compositor::{Component, Context, Event, EventResult};
-use helix_view::{apply_transaction, editor::CompleteAction};
+use helix_view::{apply_transaction, editor::CompleteAction, ViewId};
 use tui::buffer::Buffer as Surface;
 use tui::text::Spans;
 
@@ -107,6 +107,7 @@ impl Completion {
         let menu = Menu::new(items, (), move |editor: &mut Editor, item, event| {
             fn item_to_transaction(
                 doc: &Document,
+                view_id: ViewId,
                 item: &CompletionItem,
                 offset_encoding: helix_lsp::OffsetEncoding,
                 start_offset: usize,
@@ -121,9 +122,10 @@ impl Completion {
                         }
                     };
 
-                    util::generate_transaction_from_edits(
+                    util::generate_transaction_from_completion_edit(
                         doc.text(),
-                        vec![edit],
+                        doc.selection(view_id),
+                        edit,
                         offset_encoding, // TODO: should probably transcode in Client
                     )
                 } else {
@@ -132,10 +134,23 @@ impl Completion {
                     // in these cases we need to check for a common prefix and remove it
                     let prefix = Cow::from(doc.text().slice(start_offset..trigger_offset));
                     let text = text.trim_start_matches::<&str>(&prefix);
-                    Transaction::change(
-                        doc.text(),
-                        vec![(trigger_offset, trigger_offset, Some(text.into()))].into_iter(),
-                    )
+
+                    // TODO: this needs to be true for the numbers to work out correctly
+                    // in the closure below. It's passed in to a callback as this same
+                    // formula, but can the value change between the LSP request and
+                    // response? If it does, can we recover?
+                    debug_assert!(
+                        doc.selection(view_id)
+                            .primary()
+                            .cursor(doc.text().slice(..))
+                            == trigger_offset
+                    );
+
+                    Transaction::change_by_selection(doc.text(), doc.selection(view_id), |range| {
+                        let cursor = range.cursor(doc.text().slice(..));
+
+                        (cursor, cursor, Some(text.into()))
+                    })
                 };
 
                 transaction
@@ -164,6 +179,7 @@ impl Completion {
 
                     let transaction = item_to_transaction(
                         doc,
+                        view.id,
                         item,
                         offset_encoding,
                         start_offset,
@@ -185,6 +201,7 @@ impl Completion {
 
                     let transaction = item_to_transaction(
                         doc,
+                        view.id,
                         item,
                         offset_encoding,
                         start_offset,

From dbed90c5a65f435c7886f27b17cbad9cd8492355 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 10:30:04 +0900
Subject: [PATCH 610/884] build(deps): bump git-repository from 0.26.0 to
 0.29.0 (#5016)

Bumps [git-repository](https://github.com/Byron/gitoxide) from 0.26.0 to 0.29.0.
- [Release notes](https://github.com/Byron/gitoxide/releases)
- [Changelog](https://github.com/Byron/gitoxide/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Byron/gitoxide/compare/git-repository-v0.26.0...git-repository-v0.29.0)

---
updated-dependencies:
- dependency-name: git-repository
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock           | 132 +++++++++++++++++++++----------------------
 helix-vcs/Cargo.toml |   2 +-
 2 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2e021197..a3746f56 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -551,9 +551,9 @@ dependencies = [
 
 [[package]]
 name = "git-actor"
-version = "0.13.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18d4ce09c0a6c71c044700e5932877667f427f007b77e6c39ab49aebc4719e25"
+checksum = "ac9fb99c934ed45a62d9ae1e7b21949f2d869d1b82a07dcbf16ed61daa665870"
 dependencies = [
  "bstr 1.0.1",
  "btoi",
@@ -565,9 +565,9 @@ dependencies = [
 
 [[package]]
 name = "git-attributes"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c62e66a042c6b39c6dbfa3be37d134900d99ff9c54bbe489ed560a573895d5d"
+checksum = "82e98446a2bf0eb5c8f29fa828d6529510a6fadeb59ce14ca98e58fa7e1e0199"
 dependencies = [
  "bstr 1.0.1",
  "compact_str",
@@ -581,36 +581,36 @@ dependencies = [
 
 [[package]]
 name = "git-bitmap"
-version = "0.1.2"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327098a7ad27ae298d7e71602dbd4375cc828d755d10a720e4be0be1b4ec38f0"
+checksum = "44304093ac66a0ada1b243c15c3a503a165a1d0f50bec748f4e5a9b84a0d0722"
 dependencies = [
  "quick-error",
 ]
 
 [[package]]
 name = "git-chunk"
-version = "0.3.2"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07b2bc1635b660ad6e30379a84a4946590a3c124b747107c2cca1d9dbb98f588"
+checksum = "3090baa2f4a3fe488a9b3e31090b83259aaf930bf0634af34c18117274f8f1a8"
 dependencies = [
  "thiserror",
 ]
 
 [[package]]
 name = "git-command"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e4b01997b6551554fdac6f02277d0d04c3e869daa649bedd06d38c86f11dc42"
+checksum = "a6b98a6312fef79b326c0a6e15d576c2bd30f7f9d0b7964998d166049e0d7b9e"
 dependencies = [
  "bstr 1.0.1",
 ]
 
 [[package]]
 name = "git-config"
-version = "0.10.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd8603e953bd4c9bf310e74e43697400f5542f1cc75fad46fbd7427135a9534f"
+checksum = "bd1d13179bcf3dd68e83404f91a8d01c618f54eb97ef36c68ee5e6f30183a681"
 dependencies = [
  "bstr 1.0.1",
  "git-config-value",
@@ -629,9 +629,9 @@ dependencies = [
 
 [[package]]
 name = "git-config-value"
-version = "0.8.2"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f276bfe5806b414915112f1eec0f006206cdf5b8cc9bbb44ef7e52286dc3eb"
+checksum = "64561e9700f1fc737fa3c1c4ea55293be70dba98e45c54cf3715cb180f37a566"
 dependencies = [
  "bitflags",
  "bstr 1.0.1",
@@ -642,9 +642,9 @@ dependencies = [
 
 [[package]]
 name = "git-credentials"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f540186ea56fd075ba2b923180ebf4318e66ceaeac0a2a518e75dab8517d339"
+checksum = "621dd60288ae7b8f80bb0704f46d4d2b76fc1ec980a7804e48b02d94a927e331"
 dependencies = [
  "bstr 1.0.1",
  "git-command",
@@ -658,9 +658,9 @@ dependencies = [
 
 [[package]]
 name = "git-date"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37881e9725df41e15d16216d3a0cee251fd8a39d425f75b389112df5c7f20f3d"
+checksum = "e33db9f4462b565a33507aee113f3383bf16b988d2c573f07691e34302b7aa0a"
 dependencies = [
  "bstr 1.0.1",
  "itoa",
@@ -670,9 +670,9 @@ dependencies = [
 
 [[package]]
 name = "git-diff"
-version = "0.21.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a88666a0ae4365b55a0cbf2efde68d2a4cff0747894ad229403bd60b0b2abc5"
+checksum = "82f77407381267be95f1b26acfb32007258af342ee61729bb4271b1869bf5bb2"
 dependencies = [
  "git-hash",
  "git-object",
@@ -682,9 +682,9 @@ dependencies = [
 
 [[package]]
 name = "git-discover"
-version = "0.7.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "881e4136d5599cfdb79d8ef60d650823d1a563589fa493d8e4961e64d78a79f2"
+checksum = "2c2cfd1272824b126c6997ef479a71288d00fae14dc5144dfc48658f4dd24fbe"
 dependencies = [
  "bstr 1.0.1",
  "git-hash",
@@ -696,9 +696,9 @@ dependencies = [
 
 [[package]]
 name = "git-features"
-version = "0.23.1"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be88ae837674c71b30c6517c6f5f1335f8135bb8a9ffef20000d211933bed08"
+checksum = "d7bdbe755d2129bc609437b6b18af1116f146128dda6070c15c0aa50201ac17c"
 dependencies = [
  "crc32fast",
  "flate2",
@@ -713,9 +713,9 @@ dependencies = [
 
 [[package]]
 name = "git-glob"
-version = "0.4.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d756430237112f8c89049236f60fdcdb0005127b1f7e531d40984e4fe7daa90"
+checksum = "ef858611602fce54b51e45671ca72f07fe6a3c0e24a0539c66b75dfd4d84bd77"
 dependencies = [
  "bitflags",
  "bstr 1.0.1",
@@ -723,9 +723,9 @@ dependencies = [
 
 [[package]]
 name = "git-hash"
-version = "0.9.11"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16d46e6c2d1e8da4438a87bf516a6761b300964a353541fea61e96b3c7b34554"
+checksum = "1532d82bf830532f8d545c5b7b568e311e3593f16cf7ee9dd0ce03c74b12b99d"
 dependencies = [
  "hex",
  "thiserror",
@@ -733,9 +733,9 @@ dependencies = [
 
 [[package]]
 name = "git-index"
-version = "0.7.1"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "821583c2d12b1e864694eb0bf1cca10ff6a3f45966f5f834e0f921b496dbe7cb"
+checksum = "a87c32d2e012ee316d4037b2151e5893599379ff1fc2c6adb36d2d4d1c461e2c"
 dependencies = [
  "atoi",
  "bitflags",
@@ -755,9 +755,9 @@ dependencies = [
 
 [[package]]
 name = "git-lock"
-version = "2.2.0"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0fe10bf961f62b1335b4c07785e64fb4d86c5ed367dc7cd9360f13c3eb7c78"
+checksum = "89e4f05b8a68c3a5dd83a6651c76be384e910fe283072184fdab9d77f87ccec2"
 dependencies = [
  "fastrand",
  "git-tempfile",
@@ -766,9 +766,9 @@ dependencies = [
 
 [[package]]
 name = "git-mailmap"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb3f85ce84b2328aeb3124a809f7b3a63e59c4d63c227dba7a9cdf6fca6c0987"
+checksum = "480eecdfaf1bfd05973678520d182dc07afa25b133db18c52575fb65b782b7ba"
 dependencies = [
  "bstr 1.0.1",
  "git-actor",
@@ -777,9 +777,9 @@ dependencies = [
 
 [[package]]
 name = "git-object"
-version = "0.22.1"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9469a8c00d8bb500ee76a12e455bb174b4ddf71674713335dd1a84313723f7b3"
+checksum = "ce0f14f9cd8f0782e843898a2fb7b0c2f5a6e37bd4cdff4409bb8ec698597dad"
 dependencies = [
  "bstr 1.0.1",
  "btoi",
@@ -796,9 +796,9 @@ dependencies = [
 
 [[package]]
 name = "git-odb"
-version = "0.35.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaaea7031ac7d8dfee232a16d7114395d118226214fb03fe4e15d1f4d62a88a6"
+checksum = "13493da6cf0326454215414d29f933a1e26bdba3b9b60ad8cdcbe06f0639584b"
 dependencies = [
  "arc-swap",
  "git-features",
@@ -814,9 +814,9 @@ dependencies = [
 
 [[package]]
 name = "git-pack"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc4386dff835ffdc3697c3558111f708fd7b7695c42a4347f2d211cf3246c8e1"
+checksum = "fa8391cbf293f0f8ffbb5e324f25741f5e1e2d35fb87b89ab222a025661e0454"
 dependencies = [
  "bytesize",
  "clru",
@@ -838,9 +838,9 @@ dependencies = [
 
 [[package]]
 name = "git-path"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "425dc1022690be13e6c5bde4b7e04d9504d323605ec314cd367cebf38a812572"
+checksum = "5f60cbc13bc0fdd95df5f4b80437197e2853116792894b1bf38d1a6b4a64f8c9"
 dependencies = [
  "bstr 1.0.1",
  "thiserror",
@@ -848,9 +848,9 @@ dependencies = [
 
 [[package]]
 name = "git-prompt"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa6947935c0671342277bc883ff0687978477b570c1ffe2200b9ba5ac8afdd9f"
+checksum = "21c6aaeb3f0f8de91f5e0eb950282c6508e05babcedef768db5a6f085d6e5242"
 dependencies = [
  "git-command",
  "git-config-value",
@@ -861,9 +861,9 @@ dependencies = [
 
 [[package]]
 name = "git-quote"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea17931d07cbe447f371bbdf45ff03c30ea86db43788166655a5302df87ecfc"
+checksum = "1dd11f4e7f251ab297545faa4c5a4517f4985a43b9c16bf96fa49107f58e837f"
 dependencies = [
  "bstr 1.0.1",
  "btoi",
@@ -872,9 +872,9 @@ dependencies = [
 
 [[package]]
 name = "git-ref"
-version = "0.18.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "638c9e454bacb2965a43f05b4a383c8f66dc64f3a770bd0324b221c2a20e121d"
+checksum = "22484043921e699edc170415789f1b882c8f3546e1fbbc447a0043ef07e088c4"
 dependencies = [
  "git-actor",
  "git-features",
@@ -891,9 +891,9 @@ dependencies = [
 
 [[package]]
 name = "git-refspec"
-version = "0.3.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9497af773538ae8cfda053ff7dd0a9e6c28d333ba653040f54b8b4ee32f14187"
+checksum = "ac2e8f36e7d5d48903b60051dfb75aedfc4ea9ba66bdffa7a9081e8d276b0107"
 dependencies = [
  "bstr 1.0.1",
  "git-hash",
@@ -905,9 +905,9 @@ dependencies = [
 
 [[package]]
 name = "git-repository"
-version = "0.26.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeb43e59612e493af6a433bf0a960de0042c8aa6f4e4c4cb414f03b97e296b82"
+checksum = "a89cec253dd3fba44694f7468d907506a52d0055850ecd7d84f4bac07f00e73f"
 dependencies = [
  "byte-unit",
  "clru",
@@ -948,9 +948,9 @@ dependencies = [
 
 [[package]]
 name = "git-revision"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efd31c63c3745b5dba5ec7109eec41a9c717f4e1e797fe0ef93098f33f31b25"
+checksum = "e629289b0d7f7f2f2e46248527f5cac838e6a7cb9507eab06fc8473082db6cb6"
 dependencies = [
  "bstr 1.0.1",
  "git-date",
@@ -962,9 +962,9 @@ dependencies = [
 
 [[package]]
 name = "git-sec"
-version = "0.4.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c79769f6546814d0774db7295c768441016b7e40bdd414fa8dfae2c616a1892"
+checksum = "1ecb370efde58da72827909292284b5c5b885e0621a342515a36976b0b3bf660"
 dependencies = [
  "bitflags",
  "dirs",
@@ -975,9 +975,9 @@ dependencies = [
 
 [[package]]
 name = "git-tempfile"
-version = "2.0.6"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d23bc6129de3cbd81e6c9d0d685b5540c6b41bd9fa0cc38f381bc300743d708"
+checksum = "a6bb4dee86c8cae5a078cfaac3b004ef99c31548ed86218f23a7ff9b4b74f3be"
 dependencies = [
  "dashmap",
  "libc",
@@ -989,9 +989,9 @@ dependencies = [
 
 [[package]]
 name = "git-traverse"
-version = "0.18.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d0c4dd773c69f294f43ace8373d48eb770129791f104c6857fa8cac0505af89"
+checksum = "2d2746935c92d252e24f9d345e0a981510596faceb7edae821b9e4c8c35c285b"
 dependencies = [
  "git-hash",
  "git-object",
@@ -1001,9 +1001,9 @@ dependencies = [
 
 [[package]]
 name = "git-url"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b7f8323196840e7932f5b60e1d9c1d6c140fd806bc512f8beedc3f990a1f81"
+checksum = "7dbd91c55b1b03a833ff8278776fed272918cd61cd48efe9a97ad1fea7ef93ec"
 dependencies = [
  "bstr 1.0.1",
  "git-features",
@@ -1015,9 +1015,9 @@ dependencies = [
 
 [[package]]
 name = "git-validate"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5439d6aa0de838dfadd74a71e97a9e23ebc719fd11a9ab6788b835b112c8c3d"
+checksum = "cdf83bae632fc064ca938ebfb987364d9083b7f98b1476805f0a2d5eebb48686"
 dependencies = [
  "bstr 1.0.1",
  "thiserror",
@@ -1025,9 +1025,9 @@ dependencies = [
 
 [[package]]
 name = "git-worktree"
-version = "0.7.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45bcc69c36a29cfa283710b7901877ab251d658935f5a41ed824416af500e0ed"
+checksum = "2eae0e0b1050208e611d5fac0d8366b29ef3f83849767ff9c4bcf570f0d5dc2b"
 dependencies = [
  "bstr 1.0.1",
  "git-attributes",
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index c114666d..e54cf828 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -16,7 +16,7 @@ helix-core = { version = "0.6", path = "../helix-core" }
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
 parking_lot = "0.12"
 
-git-repository = { version = "0.26", default-features = false , optional = true }
+git-repository = { version = "0.29", default-features = false , optional = true }
 imara-diff = "0.1.5"
 
 log = "0.4"

From 952f292d252bdc135f10b1ffa52734d5242d2c60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 10:30:11 +0900
Subject: [PATCH 611/884] build(deps): bump serde from 1.0.148 to 1.0.149
 (#5017)

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.148 to 1.0.149.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.148...v1.0.149)

---
updated-dependencies:
- dependency-name: serde
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a3746f56..014834e4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1804,18 +1804,18 @@ checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
 
 [[package]]
 name = "serde"
-version = "1.0.148"
+version = "1.0.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc"
+checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.148"
+version = "1.0.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c"
+checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4"
 dependencies = [
  "proc-macro2",
  "quote",

From 453a75a3739338348024b6c676231aef9ef6cb7b Mon Sep 17 00:00:00 2001
From: Narazaki Shuji <shujinarazaki@protonmail.com>
Date: Tue, 6 Dec 2022 11:16:08 +0900
Subject: [PATCH 612/884] fix: align view after jumplist_picker (#3743)

* Add `View::ensure_cursor_in_view_center` to adjust view after searching and jumping

Also `offset_coodrs_to_in_view` was refactored to reduce duplicated position calculations.

* Fix a wrong offset calculation in `offset_coords_to_in_view_center`

It ignored `scrolloff` if `centering` is false.
---
 helix-term/src/commands.rs | 15 +++----
 helix-view/src/view.rs     | 89 +++++++++++++++++++++++++-------------
 2 files changed, 67 insertions(+), 37 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 31a2f582..26389026 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1667,12 +1667,7 @@ fn search_impl(
         };
 
         doc.set_selection(view.id, selection);
-        // TODO: is_cursor_in_view does the same calculation as ensure_cursor_in_view
-        if view.is_cursor_in_view(doc, 0) {
-            view.ensure_cursor_in_view(doc, scrolloff);
-        } else {
-            align_view(doc, view, Align::Center)
-        }
+        view.ensure_cursor_in_view_center(doc, scrolloff);
     };
 }
 
@@ -2434,8 +2429,10 @@ fn jumplist_picker(cx: &mut Context) {
         (),
         |cx, meta, action| {
             cx.editor.switch(meta.id, action);
+            let config = cx.editor.config();
             let (view, doc) = current!(cx.editor);
             doc.set_selection(view.id, meta.selection.clone());
+            view.ensure_cursor_in_view_center(doc, config.scrolloff);
         },
         |editor, meta| {
             let doc = &editor.documents.get(&meta.id)?;
@@ -4205,6 +4202,7 @@ fn match_brackets(cx: &mut Context) {
 
 fn jump_forward(cx: &mut Context) {
     let count = cx.count();
+    let config = cx.editor.config();
     let view = view_mut!(cx.editor);
     let doc_id = view.doc;
 
@@ -4218,12 +4216,13 @@ fn jump_forward(cx: &mut Context) {
         }
 
         doc.set_selection(view.id, selection);
-        align_view(doc, view, Align::Center);
+        view.ensure_cursor_in_view_center(doc, config.scrolloff);
     };
 }
 
 fn jump_backward(cx: &mut Context) {
     let count = cx.count();
+    let config = cx.editor.config();
     let (view, doc) = current!(cx.editor);
     let doc_id = doc.id();
 
@@ -4237,7 +4236,7 @@ fn jump_backward(cx: &mut Context) {
         }
 
         doc.set_selection(view.id, selection);
-        align_view(doc, view, Align::Center);
+        view.ensure_cursor_in_view_center(doc, config.scrolloff);
     };
 }
 
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index ecc8e8be..c09d502d 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -1,4 +1,4 @@
-use crate::{editor::GutterType, graphics::Rect, Document, DocumentId, ViewId};
+use crate::{align_view, editor::GutterType, graphics::Rect, Align, Document, DocumentId, ViewId};
 use helix_core::{
     pos_at_visual_coords, visual_coords_at_pos, Position, RopeSlice, Selection, Transaction,
 };
@@ -169,6 +169,15 @@ impl View {
         &self,
         doc: &Document,
         scrolloff: usize,
+    ) -> Option<(usize, usize)> {
+        self.offset_coords_to_in_view_center(doc, scrolloff, false)
+    }
+
+    pub fn offset_coords_to_in_view_center(
+        &self,
+        doc: &Document,
+        scrolloff: usize,
+        centering: bool,
     ) -> Option<(usize, usize)> {
         let cursor = doc
             .selection(self.id)
@@ -180,47 +189,69 @@ impl View {
 
         let inner_area = self.inner_area(doc);
         let last_line = (self.offset.row + inner_area.height as usize).saturating_sub(1);
-
-        // - 1 so we have at least one gap in the middle.
-        // a height of 6 with padding of 3 on each side will keep shifting the view back and forth
-        // as we type
-        let scrolloff = scrolloff.min(inner_area.height.saturating_sub(1) as usize / 2);
-
         let last_col = self.offset.col + inner_area.width.saturating_sub(1) as usize;
 
-        let row = if line > last_line.saturating_sub(scrolloff) {
-            // scroll down
-            self.offset.row + line - (last_line.saturating_sub(scrolloff))
-        } else if line < self.offset.row + scrolloff {
-            // scroll up
-            line.saturating_sub(scrolloff)
-        } else {
-            self.offset.row
+        let new_offset = |scrolloff: usize| {
+            // - 1 so we have at least one gap in the middle.
+            // a height of 6 with padding of 3 on each side will keep shifting the view back and forth
+            // as we type
+            let scrolloff = scrolloff.min(inner_area.height.saturating_sub(1) as usize / 2);
+
+            let row = if line > last_line.saturating_sub(scrolloff) {
+                // scroll down
+                self.offset.row + line - (last_line.saturating_sub(scrolloff))
+            } else if line < self.offset.row + scrolloff {
+                // scroll up
+                line.saturating_sub(scrolloff)
+            } else {
+                self.offset.row
+            };
+
+            let col = if col > last_col.saturating_sub(scrolloff) {
+                // scroll right
+                self.offset.col + col - (last_col.saturating_sub(scrolloff))
+            } else if col < self.offset.col + scrolloff {
+                // scroll left
+                col.saturating_sub(scrolloff)
+            } else {
+                self.offset.col
+            };
+            (row, col)
         };
-
-        let col = if col > last_col.saturating_sub(scrolloff) {
-            // scroll right
-            self.offset.col + col - (last_col.saturating_sub(scrolloff))
-        } else if col < self.offset.col + scrolloff {
-            // scroll left
-            col.saturating_sub(scrolloff)
+        let current_offset = (self.offset.row, self.offset.col);
+        if centering {
+            // return None if cursor is out of view
+            let offset = new_offset(0);
+            (offset == current_offset).then(|| {
+                if scrolloff == 0 {
+                    offset
+                } else {
+                    new_offset(scrolloff)
+                }
+            })
         } else {
-            self.offset.col
-        };
-        if row == self.offset.row && col == self.offset.col {
-            None
-        } else {
-            Some((row, col))
+            // return None if cursor is in (view - scrolloff)
+            let offset = new_offset(scrolloff);
+            (offset != current_offset).then(|| offset) // TODO: use 'then_some' when 1.62 <= MSRV
         }
     }
 
     pub fn ensure_cursor_in_view(&mut self, doc: &Document, scrolloff: usize) {
-        if let Some((row, col)) = self.offset_coords_to_in_view(doc, scrolloff) {
+        if let Some((row, col)) = self.offset_coords_to_in_view_center(doc, scrolloff, false) {
             self.offset.row = row;
             self.offset.col = col;
         }
     }
 
+    pub fn ensure_cursor_in_view_center(&mut self, doc: &Document, scrolloff: usize) {
+        if let Some((row, col)) = self.offset_coords_to_in_view_center(doc, scrolloff, true) {
+            self.offset.row = row;
+            self.offset.col = col;
+        } else {
+            align_view(doc, self, Align::Center);
+        }
+    }
+
     pub fn is_cursor_in_view(&mut self, doc: &Document, scrolloff: usize) -> bool {
         self.offset_coords_to_in_view(doc, scrolloff).is_none()
     }

From af532147c97987d6170dc06a52aa3434ebf1b9d4 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Tue, 6 Dec 2022 15:18:33 +0100
Subject: [PATCH 613/884] Add command/keybinding to jump between hunks (#4650)

* add command and keybding to jump to next/prev hunk

* add textobject for change

* Update helix-vcs/src/diff.rs

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* select entire hunk instead of first char

* fix selection range

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/keymap.md               |   4 +
 book/src/usage.md                |   1 +
 helix-term/src/commands.rs       | 121 +++++++++++++++++++++++++++++++
 helix-term/src/keymap/default.rs |   4 +
 helix-vcs/src/diff.rs            |  81 +++++++++++++++++++++
 5 files changed, 211 insertions(+)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index c3c09f4c..139e8fdd 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -320,6 +320,10 @@ Mappings in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaire
 | `]T`     | Go to previous test (**TS**)                 | `goto_prev_test`      |
 | `]p`     | Go to next paragraph                         | `goto_next_paragraph` |
 | `[p`     | Go to previous paragraph                     | `goto_prev_paragraph` |
+| `]g`     | Go to next change                            | `goto_next_change`    |
+| `[g`     | Go to previous change                        | `goto_prev_change`    |
+| `]G`     | Go to first change                           | `goto_first_change`   |
+| `[G`     | Go to last change                            | `goto_last_change`    |
 | `[Space` | Add newline above                            | `add_newline_above`   |
 | `]Space` | Add newline below                            | `add_newline_below`   |
 
diff --git a/book/src/usage.md b/book/src/usage.md
index 646bf926..a6eb9ec1 100644
--- a/book/src/usage.md
+++ b/book/src/usage.md
@@ -143,6 +143,7 @@ though, we climb the syntax tree and then take the previous selection. So
 | `a`                    | Argument/parameter       |
 | `o`                    | Comment                  |
 | `t`                    | Test                     |
+| `g`                    | Change                   |
 
 > NOTE: `f`, `c`, etc need a tree-sitter grammar active for the current
 document and a special tree-sitter query file to work properly. [Only
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 26389026..1843e7a2 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3,6 +3,7 @@ pub(crate) mod lsp;
 pub(crate) mod typed;
 
 pub use dap::*;
+use helix_vcs::Hunk;
 pub use lsp::*;
 use tui::text::Spans;
 pub use typed::*;
@@ -308,6 +309,10 @@ impl MappableCommand {
         goto_last_diag, "Goto last diagnostic",
         goto_next_diag, "Goto next diagnostic",
         goto_prev_diag, "Goto previous diagnostic",
+        goto_next_change, "Goto next change",
+        goto_prev_change, "Goto previous change",
+        goto_first_change, "Goto first change",
+        goto_last_change, "Goto last change",
         goto_line_start, "Goto line start",
         goto_line_end, "Goto line end",
         goto_next_buffer, "Goto next buffer",
@@ -2912,6 +2917,100 @@ fn goto_prev_diag(cx: &mut Context) {
     goto_pos(editor, pos);
 }
 
+fn goto_first_change(cx: &mut Context) {
+    goto_first_change_impl(cx, false);
+}
+
+fn goto_last_change(cx: &mut Context) {
+    goto_first_change_impl(cx, true);
+}
+
+fn goto_first_change_impl(cx: &mut Context, reverse: bool) {
+    let editor = &mut cx.editor;
+    let (_, doc) = current!(editor);
+    if let Some(handle) = doc.diff_handle() {
+        let hunk = {
+            let hunks = handle.hunks();
+            let idx = if reverse {
+                hunks.len().saturating_sub(1)
+            } else {
+                0
+            };
+            hunks.nth_hunk(idx)
+        };
+        if hunk != Hunk::NONE {
+            let pos = doc.text().line_to_char(hunk.after.start as usize);
+            goto_pos(editor, pos)
+        }
+    }
+}
+
+fn goto_next_change(cx: &mut Context) {
+    goto_next_change_impl(cx, Direction::Forward)
+}
+
+fn goto_prev_change(cx: &mut Context) {
+    goto_next_change_impl(cx, Direction::Backward)
+}
+
+fn goto_next_change_impl(cx: &mut Context, direction: Direction) {
+    let count = cx.count() as u32 - 1;
+    let motion = move |editor: &mut Editor| {
+        let (view, doc) = current!(editor);
+        let doc_text = doc.text().slice(..);
+        let diff_handle = if let Some(diff_handle) = doc.diff_handle() {
+            diff_handle
+        } else {
+            editor.set_status("Diff is not available in current buffer");
+            return;
+        };
+
+        let selection = doc.selection(view.id).clone().transform(|range| {
+            let cursor_line = range.cursor_line(doc_text) as u32;
+
+            let hunks = diff_handle.hunks();
+            let hunk_idx = match direction {
+                Direction::Forward => hunks
+                    .next_hunk(cursor_line)
+                    .map(|idx| (idx + count).min(hunks.len() - 1)),
+                Direction::Backward => hunks
+                    .prev_hunk(cursor_line)
+                    .map(|idx| idx.saturating_sub(count)),
+            };
+            // TODO refactor with let..else once MSRV reaches 1.65
+            let hunk_idx = if let Some(hunk_idx) = hunk_idx {
+                hunk_idx
+            } else {
+                return range;
+            };
+            let hunk = hunks.nth_hunk(hunk_idx);
+
+            let hunk_start = doc_text.line_to_char(hunk.after.start as usize);
+            let hunk_end = if hunk.after.is_empty() {
+                hunk_start + 1
+            } else {
+                doc_text.line_to_char(hunk.after.end as usize)
+            };
+            let new_range = Range::new(hunk_start, hunk_end);
+            if editor.mode == Mode::Select {
+                let head = if new_range.head < range.anchor {
+                    new_range.anchor
+                } else {
+                    new_range.head
+                };
+
+                Range::new(range.anchor, head)
+            } else {
+                new_range.with_direction(direction)
+            }
+        });
+
+        doc.set_selection(view.id, selection)
+    };
+    motion(cx.editor);
+    cx.editor.last_motion = Some(Motion(Box::new(motion)));
+}
+
 pub mod insert {
     use super::*;
     pub type Hook = fn(&Rope, &Selection, char) -> Option<Transaction>;
@@ -4515,6 +4614,27 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
                     )
                 };
 
+                if ch == 'g' && doc.diff_handle().is_none() {
+                    editor.set_status("Diff is not available in current buffer");
+                    return;
+                }
+
+                let textobject_change = |range: Range| -> Range {
+                    let diff_handle = doc.diff_handle().unwrap();
+                    let hunks = diff_handle.hunks();
+                    let line = range.cursor_line(text);
+                    let hunk_idx = if let Some(hunk_idx) = hunks.hunk_at(line as u32, false) {
+                        hunk_idx
+                    } else {
+                        return range;
+                    };
+                    let hunk = hunks.nth_hunk(hunk_idx).after;
+
+                    let start = text.line_to_char(hunk.start as usize);
+                    let end = text.line_to_char(hunk.end as usize);
+                    Range::new(start, end).with_direction(range.direction())
+                };
+
                 let selection = doc.selection(view.id).clone().transform(|range| {
                     match ch {
                         'w' => textobject::textobject_word(text, range, objtype, count, false),
@@ -4528,6 +4648,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
                         'm' => textobject::textobject_pair_surround_closest(
                             text, range, objtype, count,
                         ),
+                        'g' => textobject_change(range),
                         // TODO: cancel new ranges if inconsistent surround matches across lines
                         ch if !ch.is_ascii_alphanumeric() => {
                             textobject::textobject_pair_surround(text, range, objtype, ch, count)
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index b6d9ea10..ebcd125a 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -100,6 +100,8 @@ pub fn default() -> HashMap<Mode, Keymap> {
         "[" => { "Left bracket"
             "d" => goto_prev_diag,
             "D" => goto_first_diag,
+            "g" => goto_prev_change,
+            "G" => goto_first_change,
             "f" => goto_prev_function,
             "t" => goto_prev_class,
             "a" => goto_prev_parameter,
@@ -111,6 +113,8 @@ pub fn default() -> HashMap<Mode, Keymap> {
         "]" => { "Right bracket"
             "d" => goto_next_diag,
             "D" => goto_last_diag,
+            "g" => goto_next_change,
+            "G" => goto_last_change,
             "f" => goto_next_function,
             "t" => goto_next_class,
             "a" => goto_next_parameter,
diff --git a/helix-vcs/src/diff.rs b/helix-vcs/src/diff.rs
index b1acd1f2..9c6a362f 100644
--- a/helix-vcs/src/diff.rs
+++ b/helix-vcs/src/diff.rs
@@ -195,4 +195,85 @@ impl FileHunks<'_> {
     pub fn is_empty(&self) -> bool {
         self.len() == 0
     }
+
+    pub fn next_hunk(&self, line: u32) -> Option<u32> {
+        let hunk_range = if self.inverted {
+            |hunk: &Hunk| hunk.before.clone()
+        } else {
+            |hunk: &Hunk| hunk.after.clone()
+        };
+
+        let res = self
+            .hunks
+            .binary_search_by_key(&line, |hunk| hunk_range(hunk).start);
+
+        match res {
+            // Search found a hunk that starts exactly at this line, return the next hunk if it exists.
+            Ok(pos) if pos + 1 == self.hunks.len() => None,
+            Ok(pos) => Some(pos as u32 + 1),
+
+            // No hunk starts exactly at this line, so the search returns
+            // the position where a hunk starting at this line should be inserted.
+            // That position is exactly the position of the next hunk or the end
+            // of the list if no such hunk exists
+            Err(pos) if pos == self.hunks.len() => None,
+            Err(pos) => Some(pos as u32),
+        }
+    }
+
+    pub fn prev_hunk(&self, line: u32) -> Option<u32> {
+        let hunk_range = if self.inverted {
+            |hunk: &Hunk| hunk.before.clone()
+        } else {
+            |hunk: &Hunk| hunk.after.clone()
+        };
+        let res = self
+            .hunks
+            .binary_search_by_key(&line, |hunk| hunk_range(hunk).end);
+
+        match res {
+            // Search found a hunk that ends exactly at this line (so it does not include the current line).
+            // We can usually just return that hunk, however a special case for empty hunk is necessary
+            // which represents a pure removal.
+            // Removals are technically empty but are still shown as single line hunks
+            // and as such we must jump to the previous hunk (if it exists) if we are already inside the removal
+            Ok(pos) if !hunk_range(&self.hunks[pos]).is_empty() => Some(pos as u32),
+
+            // No hunk ends exactly at this line, so the search returns
+            // the position where a hunk ending at this line should be inserted.
+            // That position before this one is exactly the position of the previous hunk
+            Err(0) | Ok(0) => None,
+            Err(pos) | Ok(pos) => Some(pos as u32 - 1),
+        }
+    }
+
+    pub fn hunk_at(&self, line: u32, include_removal: bool) -> Option<u32> {
+        let hunk_range = if self.inverted {
+            |hunk: &Hunk| hunk.before.clone()
+        } else {
+            |hunk: &Hunk| hunk.after.clone()
+        };
+
+        let res = self
+            .hunks
+            .binary_search_by_key(&line, |hunk| hunk_range(hunk).start);
+
+        match res {
+            // Search found a hunk that starts exactly at this line, return it
+            Ok(pos) => Some(pos as u32),
+
+            // No hunk starts exactly at this line, so the search returns
+            // the position where a hunk starting at this line should be inserted.
+            // The previous hunk contains this hunk if it exists and doesn't end before this line
+            Err(0) => None,
+            Err(pos) => {
+                let hunk = hunk_range(&self.hunks[pos - 1]);
+                if hunk.end > line || include_removal && hunk.start == line && hunk.is_empty() {
+                    Some(pos as u32 - 1)
+                } else {
+                    None
+                }
+            }
+        }
+    }
 }

From e9d43c284bb717e3de5aec7312d985a088ede7ea Mon Sep 17 00:00:00 2001
From: Kristoffer Flottorp <2630397+krfl@users.noreply.github.com>
Date: Wed, 7 Dec 2022 02:08:34 +0100
Subject: [PATCH 614/884] Fleetish theme renamed to fleet dark and adjusted to
 match official theme.  (#4997)

* remove fleetish.toml

* add fleet_dark.toml

* adjust colors for tags and markup lists

* Add type.enum.variant

* correct color for focused elements

* adjust builtins and keywords

Co-authored-by: krfl <kr.fl@outlook.com>
---
 .../themes/{fleetish.toml => fleet_dark.toml} | 93 ++++++++++---------
 1 file changed, 51 insertions(+), 42 deletions(-)
 rename runtime/themes/{fleetish.toml => fleet_dark.toml} (52%)

diff --git a/runtime/themes/fleetish.toml b/runtime/themes/fleet_dark.toml
similarity index 52%
rename from runtime/themes/fleetish.toml
rename to runtime/themes/fleet_dark.toml
index 159daf87..f885e4eb 100644
--- a/runtime/themes/fleetish.toml
+++ b/runtime/themes/fleet_dark.toml
@@ -1,8 +1,13 @@
-# Author: Kristoffer Flottorp <kr.fl@outlook.com>
-# A take on the JetBrains Fleet theme sprinkled with some creative freedom
+# Fleet Dark
+# A take on the JetBrains Fleet theme. Feel free to contribute
 
+# Original author: @krfl
+# Contributors:
+# @matoous
+
+"attribute" = "green"
 "type" = "light_blue"
-"type.builtin" = "orange"
+"type.enum.variant" = "purple"
 "constructor" = "yellow"
 "constant" = "cyan"
 # "constant.builtin" = {} # .boolean
@@ -16,55 +21,55 @@
 "comment" = "light_gray" # .line
 # "comment.block" = {} # .documentation
 "variable" = "light" # .builtin
+"variable.builtin" = { fg = "red", modifiers = ["underlined"] }
 "variable.parameter" = "light"
 # "variable.other" = {} # .member
-"variable.other.member" = "yellow"
+"variable.other.member" = "purple"
 "label" = "yellow"
 "punctuation" = "light" # .delimiter / .bracket
 "keyword" = "cyan" # .operator / .directive / .function
-"keyword.control" = "yellow" # .conditional / .repeat / .import / .return / .exception
+# "keyword.control" = "cyan" # .conditional / .repeat / .import / .return / .exception
+"keyword.control.exception" = "purple"
 "operator" = "light"
 "function" = "yellow"
 "function.macro" = "green"
 "function.builtin" = "green"
 "function.special" = "green"
 "function.method" = "light"
-"tag" = "green"
+#"function.declaration.method" = { fg = "lightest", modifiers = ["bold"] } #depends on #4892
+"tag" = "light_blue"
 "special" = "green"
 "namespace" = "light"
 
 # used in theming
+# "markup" = {} # .normal / .quote / .raw
 # "markup.normal" = {} # .completion / .hover
-# "markup.raw.inline" = {} # .completion / .hover
-"markup" = "purple" # .quote
-"markup.bold" = { fg = "purple", modifiers = ["bold"] }
-"markup.italic" = { fg = "purple", modifiers = ["italic"] }
-"markup.heading" = "light" # .marker
-"markup.heading.1" = "yellow"
-"markup.heading.2" = "green"
-"markup.heading.3" = "pink"
-"markup.heading.4" = "purple"
-"markup.heading.5" = "cyan"
-"markup.heading.6" = "light_blue"
-"markup.list" = "cyan" # .unnumbered / .numbered
-"markup.link" = "green"
-"markup.link.url" = "pink"
+"markup.bold" = { fg = "lightest", modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.heading" = { fg = "cyan", modifiers = ["bold"] } # .marker / .1 / .2 / .3 / .4 / .5 / .6
+"markup.list" = "pink" # .unnumbered / .numbered
+"markup.list.numbered" = "cyan"
+"markup.list.unnumbered" = "cyan"
+# "markup.link" = "green"
+"markup.link.url" = { fg = "pink", modifiers = ['italic', 'underlined'] }
 "markup.link.text" = "cyan"
-"markup.link.label" = "yellow"
-"markup.raw" = "pink" # .inline
-"markup.raw.block" = "orange"
+"markup.link.label" = "purple"
+"markup.quote" = "pink"
+"markup.raw" = "pink"
+"markup.raw.inline" = "cyan" # .completion / .hover
+"markup.raw.block" = "pink"
 
-"diff.plus" = "cyan"
-"diff.minus" = "yellow"
-"diff.delta" = "purple"
+"diff.plus" = "diff_plus"
+"diff.minus" = "red_accent"
+"diff.delta" = "blue_accent"
 
 # ui specific
-"ui.background" = { bg = "#0d0d0d" } # .separator
+"ui.background" = { bg = "background" } # .separator
 "ui.cursor" = { bg = "dark_gray", modifiers = ["reversed"] } # .insert / .select / .match / .primary
-"ui.cursor.match" = { fg = "light", bg = "blue_accent" } # .insert / .select / .match / .primary
+"ui.cursor.match" = { fg = "light", bg = "selection" } # .insert / .select / .match / .primary
 "ui.cursorline" = { bg = "darker" }
 "ui.linenr" = "dark_gray"
-"ui.linenr.selected" = { fg = "light_gray", bg = "darker" }
+"ui.linenr.selected" = { fg = "light", bg = "darker" }
 "ui.statusline" = { fg = "light", bg = "darker" } # .inactive / .normal / .insert / .select
 "ui.statusline.inactive" = { fg = "dark", bg = "darker" }
 "ui.statusline.normal" = { fg = "lightest", bg = "darker"}
@@ -74,27 +79,28 @@
 "ui.window" = { fg = "dark", bg = "darkest" }
 "ui.help" = { fg = "light", bg = "darkest" }
 "ui.text" = "light" # .focus / .info
+"ui.text.focus" = { fg = "lightest", bg = "focus" }
 "ui.virtual" = "dark" # .whitespace
 "ui.virtual.ruler" = { bg = "darker"}
-"ui.menu" = { fg = "light", bg = "darker" } # .selected
-"ui.menu.selected" = { fg = "lightest", bg = "blue_accent" } # .selected
+"ui.menu" = { fg = "light", bg = "darkest" } # .selected
+"ui.menu.selected" = { fg = "lightest", bg = "focus" } # .selected
 "ui.selection" = { bg = "darker" } # .primary
-"ui.selection.primary" = { bg = "select" } # .primary
+"ui.selection.primary" = { bg = "selection" }
 "hint" = "blue"
 "info" = "yellow_accent"
 "warning" = "orange_accent"
-"error" = "red"
+"error" = "red_error"
 "diagnostic" = { modifiers = [] }
-"diagnostic.hint" = { underline = { color = "light", style = "curl" } }
-"diagnostic.info" = { underline = { color = "blue", style = "curl" } }
-"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
-"diagnostic.error" = { underline = { color = "red", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "light", style = "line" } }
+"diagnostic.info" = { underline = { color = "blue_accent", style = "line" } }
+"diagnostic.warning" = { underline = { color = "yellow_accent", style = "line" } }
+"diagnostic.error" = { underline = { color = "red_error", style = "line" } }
 
 [palette]
+background = "#181818"
 darkest = "#1e1e1e"
-darker = "#262626"
+darker = "#292929"
 dark = "#898989"
-select = "#102f5b"
 
 light = "#d6d6dd"
 lightest = "#ffffff"
@@ -109,13 +115,16 @@ green = "#afcb85"
 cyan = "#78d0bd"
 orange = "#efb080"
 yellow = "#e5c995"
-red = "#f44747"
+red = "#CC7C8A"
 
 blue_accent = "#2197F3"
 pink_accent = "#E44C7A"
 green_accent = "#00AF99"
 orange_accent = "#EE7F25"
 yellow_accent = "#DEA407"
+red_accent = "#F44747"
 
-# variables intended for future updates
-checkmark = "#44B254"
+red_error = "#EB5F6A"
+selection = "#1F3661"
+diff_plus = "#5A9F81"
+focus = "#204474"

From d3f670c0e2d8800bfeacb76a5b96753ac6529170 Mon Sep 17 00:00:00 2001
From: Jonathan LEI <me@xjonathan.dev>
Date: Wed, 7 Dec 2022 10:11:45 +0800
Subject: [PATCH 615/884] Use OSC 52 for tmux copy (#5027)

---
 helix-view/src/clipboard.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-view/src/clipboard.rs b/helix-view/src/clipboard.rs
index 19fade69..4f83fb4d 100644
--- a/helix-view/src/clipboard.rs
+++ b/helix-view/src/clipboard.rs
@@ -136,7 +136,7 @@ pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> {
     } else if env_var_is_set("TMUX") && binary_exists("tmux") {
         command_provider! {
             paste => "tmux", "save-buffer", "-";
-            copy => "tmux", "load-buffer", "-";
+            copy => "tmux", "load-buffer", "-w", "-";
         }
     } else {
         Box::new(provider::FallbackProvider::new())

From 96ff64a84a4948b0aa85a453276cb0091fb9c792 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 6 Dec 2022 20:54:50 -0600
Subject: [PATCH 616/884] Add changelog notes for 22.12 (#4822)

* Add changelog notes for 22.12

* Bump VERSION to 22.12
---
 CHANGELOG.md | 286 +++++++++++++++++++++++++++++++++++++++++++++++++++
 VERSION      |   2 +-
 2 files changed, 287 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56d85751..dc91c9ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,289 @@
+# 22.12 (2022-12-06)
+
+This is a great big release filled with changes from a 99 contributors. A big _thank you_ to you all!
+
+As usual, the following is a summary of each of the changes since the last release.
+For the full log, check out the [git log](https://github.com/helix-editor/helix/compare/22.08.1..22.12).
+
+Breaking changes:
+
+- Remove readline-like navigation bindings from the default insert mode keymap ([e12690e](https://github.com/helix-editor/helix/commit/e12690e), [#3811](https://github.com/helix-editor/helix/pull/3811), [#3827](https://github.com/helix-editor/helix/pull/3827), [#3915](https://github.com/helix-editor/helix/pull/3915), [#4088](https://github.com/helix-editor/helix/pull/4088))
+- Rename `append_to_line` as `insert_at_line_end` and `prepend_to_line` as `insert_at_line_start` ([#3753](https://github.com/helix-editor/helix/pull/3753))
+- Swap diagnostic picker and debug mode bindings in the space keymap ([#4229](https://github.com/helix-editor/helix/pull/4229))
+- Select newly inserted text on paste or from shell commands ([#4458](https://github.com/helix-editor/helix/pull/4458), [#4608](https://github.com/helix-editor/helix/pull/4608), [#4619](https://github.com/helix-editor/helix/pull/4619), [#4824](https://github.com/helix-editor/helix/pull/4824))
+- Select newly inserted surrounding characters on `ms<char>` ([#4752](https://github.com/helix-editor/helix/pull/4752))
+- Exit select-mode after executing `replace_*` commands ([#4554](https://github.com/helix-editor/helix/pull/4554))
+- Exit select-mode after executing surround commands ([#4858](https://github.com/helix-editor/helix/pull/4858))
+- Change tree-sitter text-object keys ([#3782](https://github.com/helix-editor/helix/pull/3782))
+- Rename `fleetish` theme to `fleet_dark` ([#4997](https://github.com/helix-editor/helix/pull/4997))
+
+Features:
+
+- Bufferline ([#2759](https://github.com/helix-editor/helix/pull/2759))
+- Support underline styles and colors ([#4061](https://github.com/helix-editor/helix/pull/4061), [98c121c](https://github.com/helix-editor/helix/commit/98c121c))
+- Inheritance for themes ([#3067](https://github.com/helix-editor/helix/pull/3067), [#4096](https://github.com/helix-editor/helix/pull/4096))
+- Cursorcolumn ([#4084](https://github.com/helix-editor/helix/pull/4084))
+- Overhauled system for writing files and quiting ([#2267](https://github.com/helix-editor/helix/pull/2267), [#4397](https://github.com/helix-editor/helix/pull/4397))
+- Autosave when terminal loses focus ([#3178](https://github.com/helix-editor/helix/pull/3178))
+- Use OSC52 as a fallback for the system clipboard ([#3220](https://github.com/helix-editor/helix/pull/3220))
+- Show git diffs in the gutter ([#3890](https://github.com/helix-editor/helix/pull/3890), [#5012](https://github.com/helix-editor/helix/pull/5012), [#4995](https://github.com/helix-editor/helix/pull/4995))
+- Add a logo ([dc1ec56](https://github.com/helix-editor/helix/commit/dc1ec56))
+- Multi-cursor completion ([#4496](https://github.com/helix-editor/helix/pull/4496))
+
+Commands:
+
+- `file_picker_in_current_directory` (`<space>F`) ([#3701](https://github.com/helix-editor/helix/pull/3701))
+- `:lsp-restart` to restart the current document's language server ([#3435](https://github.com/helix-editor/helix/pull/3435), [#3972](https://github.com/helix-editor/helix/pull/3972))
+- `join_selections_space` (`A-j`) which joins selections and selects the joining whitespace ([#3549](https://github.com/helix-editor/helix/pull/3549))
+- `:update` to write the current file if it is modified ([#4426](https://github.com/helix-editor/helix/pull/4426))
+- `:lsp-workspace-command` for picking LSP commands to execute ([#3140](https://github.com/helix-editor/helix/pull/3140))
+- `extend_prev_word_end` - the extend variant for `move_prev_word_end` ([7468fa2](https://github.com/helix-editor/helix/commit/7468fa2))
+- `make_search_word_bounded` which adds regex word boundaries to the current search register value ([#4322](https://github.com/helix-editor/helix/pull/4322))
+- `:reload-all` - `:reload` for all open buffers ([#4663](https://github.com/helix-editor/helix/pull/4663), [#4901](https://github.com/helix-editor/helix/pull/4901))
+- `goto_next_change` (`]g`), `goto_prev_change` (`[g`), `goto_first_change` (`[G`), `goto_last_change` (`]G`) textobjects for jumping between VCS changes ([#4650](https://github.com/helix-editor/helix/pull/4650))
+
+Usability improvements and fixes:
+
+- Don't log 'LSP not defined' errors in the logfile ([1caba2d](https://github.com/helix-editor/helix/commit/1caba2d))
+- Look for the external formatter program before invoking it ([#3670](https://github.com/helix-editor/helix/pull/3670))
+- Don't send LSP didOpen events for documents without URLs ([44b4479](https://github.com/helix-editor/helix/commit/44b4479))
+- Fix off-by-one in `extend_line_above` command ([#3689](https://github.com/helix-editor/helix/pull/3689))
+- Use the original scroll offset when opening a split ([1acdfaa](https://github.com/helix-editor/helix/commit/1acdfaa))
+- Handle auto-formatting failures and save the file anyway ([#3684](https://github.com/helix-editor/helix/pull/3684))
+- Ensure the cursor is in view after `:reflow` ([#3733](https://github.com/helix-editor/helix/pull/3733))
+- Add default rulers and reflow config for git commit messages ([#3738](https://github.com/helix-editor/helix/pull/3738))
+- Improve grammar fetching and building output ([#3773](https://github.com/helix-editor/helix/pull/3773))
+- Add a `text` language to language completion ([cc47d3f](https://github.com/helix-editor/helix/commit/cc47d3f))
+- Improve error handling for `:set-language` ([e8add6f](https://github.com/helix-editor/helix/commit/e8add6f))
+- Improve error handling for `:config-reload` ([#3668](https://github.com/helix-editor/helix/pull/3668))
+- Improve error handling when passing improper ranges to syntax highlighting ([#3826](https://github.com/helix-editor/helix/pull/3826))
+- Render `<code>` tags as raw markup in markdown ([#3425](https://github.com/helix-editor/helix/pull/3425))
+- Remove border around the LSP code-actions popup ([#3444](https://github.com/helix-editor/helix/pull/3444))
+- Canonicalize the path to the runtime directory ([#3794](https://github.com/helix-editor/helix/pull/3794))
+- Add a `themelint` xtask for linting themes ([#3234](https://github.com/helix-editor/helix/pull/3234))
+- Re-sort LSP diagnostics after applying transactions ([#3895](https://github.com/helix-editor/helix/pull/3895), [#4319](https://github.com/helix-editor/helix/pull/4319))
+- Add a command-line flag to specify the log file ([#3807](https://github.com/helix-editor/helix/pull/3807))
+- Track source and tag information in LSP diagnostics ([#3898](https://github.com/helix-editor/helix/pull/3898), [1df32c9](https://github.com/helix-editor/helix/commit/1df32c9))
+- Fix theme returning to normal when exiting the `:theme` completion ([#3644](https://github.com/helix-editor/helix/pull/3644))
+- Improve error messages for invalid commands in the keymap ([#3931](https://github.com/helix-editor/helix/pull/3931))
+- Deduplicate regexs in `search_selection` command ([#3941](https://github.com/helix-editor/helix/pull/3941))
+- Split the finding of LSP root and config roots ([#3929](https://github.com/helix-editor/helix/pull/3929))
+- Ensure that the cursor is within view after auto-formatting ([#4047](https://github.com/helix-editor/helix/pull/4047))
+- Add pseudo-pending to commands with on-next-key callbacks ([#4062](https://github.com/helix-editor/helix/pull/4062), [#4077](https://github.com/helix-editor/helix/pull/4077))
+- Add live preview to `:goto` ([#2982](https://github.com/helix-editor/helix/pull/2982))
+- Show regex compilation failure in a popup ([#3049](https://github.com/helix-editor/helix/pull/3049))
+- Add 'cycled to end' and 'no more matches' for search ([#3176](https://github.com/helix-editor/helix/pull/3176), [#4101](https://github.com/helix-editor/helix/pull/4101))
+- Add extending behavior to tree-sitter textobjects ([#3266](https://github.com/helix-editor/helix/pull/3266))
+- Add `ui.gutter.selected` option for themes ([#3303](https://github.com/helix-editor/helix/pull/3303))
+- Make statusline mode names configurable ([#3311](https://github.com/helix-editor/helix/pull/3311))
+- Add a statusline element for total line count ([#3960](https://github.com/helix-editor/helix/pull/3960))
+- Add extending behavior to `goto_window_*` commands ([#3985](https://github.com/helix-editor/helix/pull/3985))
+- Fix a panic in signature help when the preview is too large ([#4030](https://github.com/helix-editor/helix/pull/4030))
+- Add command names to the command palette ([#4071](https://github.com/helix-editor/helix/pull/4071), [#4223](https://github.com/helix-editor/helix/pull/4223), [#4495](https://github.com/helix-editor/helix/pull/4495))
+- Find the LSP workspace root from the current document's path ([#3553](https://github.com/helix-editor/helix/pull/3553))
+- Add an option to skip indent-guide levels ([#3819](https://github.com/helix-editor/helix/pull/3819), [2c36e33](https://github.com/helix-editor/helix/commit/2c36e33))
+- Change focus to modified docs on quit ([#3872](https://github.com/helix-editor/helix/pull/3872))
+- Respond to `USR1` signal by reloading config ([#3952](https://github.com/helix-editor/helix/pull/3952))
+- Exit gracefully when the close operation fails ([#4081](https://github.com/helix-editor/helix/pull/4081))
+- Fix goto/view center mismatch ([#4135](https://github.com/helix-editor/helix/pull/4135))
+- Highlight the current file picker document on idle-timeout ([#3172](https://github.com/helix-editor/helix/pull/3172), [a85e386](https://github.com/helix-editor/helix/commit/a85e386))
+- Apply transactions to jumplist selections ([#4186](https://github.com/helix-editor/helix/pull/4186), [#4227](https://github.com/helix-editor/helix/pull/4227), [#4733](https://github.com/helix-editor/helix/pull/4733), [#4865](https://github.com/helix-editor/helix/pull/4865), [#4912](https://github.com/helix-editor/helix/pull/4912), [#4965](https://github.com/helix-editor/helix/pull/4965), [#4981](https://github.com/helix-editor/helix/pull/4981))
+- Use space as a separator for fuzzy matcher ([#3969](https://github.com/helix-editor/helix/pull/3969))
+- Overlay all diagnostics with highest severity on top ([#4113](https://github.com/helix-editor/helix/pull/4113))
+- Avoid re-parsing unmodified tree-sitter injections ([#4146](https://github.com/helix-editor/helix/pull/4146))
+- Add extending captures for indentation, re-enable python indentation ([#3382](https://github.com/helix-editor/helix/pull/3382), [3e84434](https://github.com/helix-editor/helix/commit/3e84434))
+- Only allow either `--vsplit` or `--hsplit` CLI flags at once ([#4202](https://github.com/helix-editor/helix/pull/4202))
+- Fix append cursor location when selection anchor is at the end of the document ([#4147](https://github.com/helix-editor/helix/pull/4147))
+- Improve selection yanking message ([#4275](https://github.com/helix-editor/helix/pull/4275))
+- Log failures to load tree-sitter grammars as errors ([#4315](https://github.com/helix-editor/helix/pull/4315))
+- Fix rendering of lines longer than 65,536 columns ([#4172](https://github.com/helix-editor/helix/pull/4172))
+- Skip searching `.git` in `global_search` ([#4334](https://github.com/helix-editor/helix/pull/4334))
+- Display tree-sitter scopes in a popup ([#4337](https://github.com/helix-editor/helix/pull/4337))
+- Fix deleting a word from the end of the buffer ([#4328](https://github.com/helix-editor/helix/pull/4328))
+- Pretty print the syntax tree in `:tree-sitter-subtree` ([#4295](https://github.com/helix-editor/helix/pull/4295), [#4606](https://github.com/helix-editor/helix/pull/4606))
+- Allow specifying suffixes for file-type detection ([#2455](https://github.com/helix-editor/helix/pull/2455), [#4414](https://github.com/helix-editor/helix/pull/4414))
+- Fix multi-byte auto-pairs ([#4024](https://github.com/helix-editor/helix/pull/4024))
+- Improve sort scoring for LSP code-actions and completions ([#4134](https://github.com/helix-editor/helix/pull/4134))
+- Fix the handling of quotes within shellwords ([#4098](https://github.com/helix-editor/helix/pull/4098))
+- Fix `delete_word_backward` and `delete_word_forward` on newlines ([#4392](https://github.com/helix-editor/helix/pull/4392))
+- Fix 'no entry found for key' crash on `:write-all` ([#4384](https://github.com/helix-editor/helix/pull/4384))
+- Remove lowercase requirement for tree-sitter grammars ([#4346](https://github.com/helix-editor/helix/pull/4346))
+- Resolve LSP completion items on idle-timeout ([#4406](https://github.com/helix-editor/helix/pull/4406), [#4797](https://github.com/helix-editor/helix/pull/4797))
+- Render diagnostics in the file picker preview ([#4324](https://github.com/helix-editor/helix/pull/4324))
+- Fix terminal freezing on `shell_insert_output` ([#4156](https://github.com/helix-editor/helix/pull/4156))
+- Allow use of the count in the repeat operator (`.`) ([#4450](https://github.com/helix-editor/helix/pull/4450))
+- Show the current theme name on `:theme` with no arguments ([#3740](https://github.com/helix-editor/helix/pull/3740))
+- Fix rendering in very large terminals ([#4318](https://github.com/helix-editor/helix/pull/4318))
+- Sort LSP preselected items to the top of the completion menu ([#4480](https://github.com/helix-editor/helix/pull/4480))
+- Trim braces and quotes from paths in goto-file ([#4370](https://github.com/helix-editor/helix/pull/4370))
+- Prevent automatic signature help outside of insert mode ([#4456](https://github.com/helix-editor/helix/pull/4456))
+- Fix freezes with external programs that process stdin and stdout concurrently ([#4180](https://github.com/helix-editor/helix/pull/4180))
+- Make `scroll` aware of tabs and wide characters ([#4519](https://github.com/helix-editor/helix/pull/4519))
+- Correctly handle escaping in `command_mode` completion ([#4316](https://github.com/helix-editor/helix/pull/4316), [#4587](https://github.com/helix-editor/helix/pull/4587), [#4632](https://github.com/helix-editor/helix/pull/4632))
+- Fix `delete_char_backward` for paired characters ([#4558](https://github.com/helix-editor/helix/pull/4558))
+- Fix crash from two windows editing the same document ([#4570](https://github.com/helix-editor/helix/pull/4570))
+- Fix pasting from the blackhole register ([#4497](https://github.com/helix-editor/helix/pull/4497))
+- Support LSP insertReplace completion items ([1312682](https://github.com/helix-editor/helix/commit/1312682))
+- Dynamically resize the line number gutter width ([#3469](https://github.com/helix-editor/helix/pull/3469))
+- Fix crash for unknown completion item kinds ([#4658](https://github.com/helix-editor/helix/pull/4658))
+- Re-enable `format_selections` for single selection ranges ([d4f5cab](https://github.com/helix-editor/helix/commit/d4f5cab))
+- Limit the number of in-progress tree-sitter query matches ([#4707](https://github.com/helix-editor/helix/pull/4707), [#4830](https://github.com/helix-editor/helix/pull/4830))
+- Use the special `#` register with `increment`/`decrement` to change by range number ([#4418](https://github.com/helix-editor/helix/pull/4418))
+- Add a statusline element to show number of selected chars ([#4682](https://github.com/helix-editor/helix/pull/4682))
+- Add a statusline element showing global LSP diagnostic warning and error counts ([#4569](https://github.com/helix-editor/helix/pull/4569))
+- Add a scrollbar to popups ([#4449](https://github.com/helix-editor/helix/pull/4449))
+- Prefer shorter matches in fuzzy matcher scoring ([#4698](https://github.com/helix-editor/helix/pull/4698))
+- Use key-sequence format for command palette keybinds ([#4712](https://github.com/helix-editor/helix/pull/4712))
+- Remove prefix filtering from autocompletion menu ([#4578](https://github.com/helix-editor/helix/pull/4578))
+- Focus on the parent buffer when closing a split ([#4766](https://github.com/helix-editor/helix/pull/4766))
+- Handle language server termination ([#4797](https://github.com/helix-editor/helix/pull/4797), [#4852](https://github.com/helix-editor/helix/pull/4852))
+- Allow `r`/`t`/`f` to work on tab characters ([#4817](https://github.com/helix-editor/helix/pull/4817))
+- Show a preview for scratch buffers in the buffer picker ([#3454](https://github.com/helix-editor/helix/pull/3454))
+- Set a limit of entries in the jumplist ([#4750](https://github.com/helix-editor/helix/pull/4750))
+- Re-use shell outputs when inserting or appending shell output ([#3465](https://github.com/helix-editor/helix/pull/3465))
+- Check LSP server provider capabilities ([#3554](https://github.com/helix-editor/helix/pull/3554))
+- Improve tree-sitter parsing performance on files with many language layers ([#4716](https://github.com/helix-editor/helix/pull/4716))
+- Move indentation to the next line when using `<ret>` on a line with only whitespace ([#4854](https://github.com/helix-editor/helix/pull/4854))
+- Remove selections for closed views from all documents ([#4888](https://github.com/helix-editor/helix/pull/4888))
+- Improve performance of the `:reload` command ([#4457](https://github.com/helix-editor/helix/pull/4457))
+- Properly handle media keys ([#4887](https://github.com/helix-editor/helix/pull/4887))
+- Support LSP diagnostic data field ([#4935](https://github.com/helix-editor/helix/pull/4935))
+- Handle C-i keycode as tab ([#4961](https://github.com/helix-editor/helix/pull/4961))
+- Fix view alignment for jumplist picker jumps ([#3743](https://github.com/helix-editor/helix/pull/3743))
+- Use OSC52 for tmux clipboard provider ([#5027](https://github.com/helix-editor/helix/pull/5027))
+
+Themes:
+
+- Add `varua` ([#3610](https://github.com/helix-editor/helix/pull/3610), [#4964](https://github.com/helix-editor/helix/pull/4964))
+- Update `boo_berry` ([#3653](https://github.com/helix-editor/helix/pull/3653))
+- Add `rasmus` ([#3728](https://github.com/helix-editor/helix/pull/3728))
+- Add `papercolor_dark` ([#3742](https://github.com/helix-editor/helix/pull/3742))
+- Update `monokai_pro_spectrum` ([#3814](https://github.com/helix-editor/helix/pull/3814))
+- Update `nord` ([#3792](https://github.com/helix-editor/helix/pull/3792))
+- Update `fleetish` ([#3844](https://github.com/helix-editor/helix/pull/3844), [#4487](https://github.com/helix-editor/helix/pull/4487), [#4813](https://github.com/helix-editor/helix/pull/4813))
+- Update `flatwhite` ([#3843](https://github.com/helix-editor/helix/pull/3843))
+- Add `darcula` ([#3739](https://github.com/helix-editor/helix/pull/3739))
+- Update `papercolor` ([#3938](https://github.com/helix-editor/helix/pull/3938), [#4317](https://github.com/helix-editor/helix/pull/4317))
+- Add bufferline colors to multiple themes ([#3881](https://github.com/helix-editor/helix/pull/3881))
+- Add `gruvbox_dark_hard` ([#3948](https://github.com/helix-editor/helix/pull/3948))
+- Add `onedarker` ([#3980](https://github.com/helix-editor/helix/pull/3980), [#4060](https://github.com/helix-editor/helix/pull/4060))
+- Add `dark_high_contrast` ([#3312](https://github.com/helix-editor/helix/pull/3312))
+- Update `bogster` ([#4121](https://github.com/helix-editor/helix/pull/4121), [#4264](https://github.com/helix-editor/helix/pull/4264))
+- Update `sonokai` ([#4089](https://github.com/helix-editor/helix/pull/4089))
+- Update `ayu_*` themes ([#4140](https://github.com/helix-editor/helix/pull/4140), [#4109](https://github.com/helix-editor/helix/pull/4109), [#4662](https://github.com/helix-editor/helix/pull/4662), [#4764](https://github.com/helix-editor/helix/pull/4764))
+- Update `everforest` ([#3998](https://github.com/helix-editor/helix/pull/3998))
+- Update `monokai_pro_octagon` ([#4247](https://github.com/helix-editor/helix/pull/4247))
+- Add `heisenberg` ([#4209](https://github.com/helix-editor/helix/pull/4209))
+- Add `bogster_light` ([#4265](https://github.com/helix-editor/helix/pull/4265))
+- Update `pop-dark` ([#4323](https://github.com/helix-editor/helix/pull/4323))
+- Update `rose_pine` ([#4221](https://github.com/helix-editor/helix/pull/4221))
+- Add `kanagawa` ([#4300](https://github.com/helix-editor/helix/pull/4300))
+- Add `hex_steel`, `hex_toxic` and `hex_lavendar` ([#4367](https://github.com/helix-editor/helix/pull/4367), [#4990](https://github.com/helix-editor/helix/pull/4990))
+- Update `tokyonight` and `tokyonight_storm` ([#4415](https://github.com/helix-editor/helix/pull/4415))
+- Update `gruvbox` ([#4626](https://github.com/helix-editor/helix/pull/4626))
+- Update `dark_plus` ([#4661](https://github.com/helix-editor/helix/pull/4661), [#4678](https://github.com/helix-editor/helix/pull/4678))
+- Add `zenburn` ([#4613](https://github.com/helix-editor/helix/pull/4613), [#4977](https://github.com/helix-editor/helix/pull/4977))
+- Update `monokai_pro` ([#4789](https://github.com/helix-editor/helix/pull/4789))
+- Add `mellow` ([#4770](https://github.com/helix-editor/helix/pull/4770))
+- Add `nightfox` ([#4769](https://github.com/helix-editor/helix/pull/4769), [#4966](https://github.com/helix-editor/helix/pull/4966))
+- Update `doom_acario_dark` ([#4979](https://github.com/helix-editor/helix/pull/4979))
+- Update `autumn` ([#4996](https://github.com/helix-editor/helix/pull/4996))
+- Update `acme` ([#4999](https://github.com/helix-editor/helix/pull/4999))
+- Update `nord_light` ([#4999](https://github.com/helix-editor/helix/pull/4999))
+- Update `serika_*` ([#5015](https://github.com/helix-editor/helix/pull/5015))
+
+LSP configurations:
+
+- Switch to `openscad-lsp` for OpenScad ([#3750](https://github.com/helix-editor/helix/pull/3750))
+- Support Jsonnet ([#3748](https://github.com/helix-editor/helix/pull/3748))
+- Support Markdown ([#3499](https://github.com/helix-editor/helix/pull/3499))
+- Support Bass ([#3771](https://github.com/helix-editor/helix/pull/3771))
+- Set roots configuration for Elixir and HEEx ([#3917](https://github.com/helix-editor/helix/pull/3917), [#3959](https://github.com/helix-editor/helix/pull/3959))
+- Support Purescript ([#4242](https://github.com/helix-editor/helix/pull/4242))
+- Set roots configuration for Julia ([#4361](https://github.com/helix-editor/helix/pull/4361))
+- Support D ([#4372](https://github.com/helix-editor/helix/pull/4372))
+- Increase default language server timeout for Julia ([#4575](https://github.com/helix-editor/helix/pull/4575))
+- Use ElixirLS for HEEx ([#4679](https://github.com/helix-editor/helix/pull/4679))
+- Support Bicep ([#4403](https://github.com/helix-editor/helix/pull/4403))
+- Switch to `nil` for Nix ([433ccef](https://github.com/helix-editor/helix/commit/433ccef))
+- Support QML ([#4842](https://github.com/helix-editor/helix/pull/4842))
+- Enable auto-format for CSS ([#4987](https://github.com/helix-editor/helix/pull/4987))
+- Support CommonLisp ([4176769](https://github.com/helix-editor/helix/commit/4176769))
+
+New languages:
+
+- SML ([#3692](https://github.com/helix-editor/helix/pull/3692))
+- Jsonnet ([#3714](https://github.com/helix-editor/helix/pull/3714))
+- Godot resource ([#3759](https://github.com/helix-editor/helix/pull/3759))
+- Astro ([#3829](https://github.com/helix-editor/helix/pull/3829))
+- SSH config ([#2455](https://github.com/helix-editor/helix/pull/2455), [#4538](https://github.com/helix-editor/helix/pull/4538))
+- Bass ([#3771](https://github.com/helix-editor/helix/pull/3771))
+- WAT (WebAssembly text format) ([#4040](https://github.com/helix-editor/helix/pull/4040), [#4542](https://github.com/helix-editor/helix/pull/4542))
+- Purescript ([#4242](https://github.com/helix-editor/helix/pull/4242))
+- D ([#4372](https://github.com/helix-editor/helix/pull/4372), [#4562](https://github.com/helix-editor/helix/pull/4562))
+- VHS ([#4486](https://github.com/helix-editor/helix/pull/4486))
+- KDL ([#4481](https://github.com/helix-editor/helix/pull/4481))
+- XML ([#4518](https://github.com/helix-editor/helix/pull/4518))
+- WIT ([#4525](https://github.com/helix-editor/helix/pull/4525))
+- ENV ([#4536](https://github.com/helix-editor/helix/pull/4536))
+- INI ([#4538](https://github.com/helix-editor/helix/pull/4538))
+- Bicep ([#4403](https://github.com/helix-editor/helix/pull/4403), [#4751](https://github.com/helix-editor/helix/pull/4751))
+- QML ([#4842](https://github.com/helix-editor/helix/pull/4842))
+- CommonLisp ([4176769](https://github.com/helix-editor/helix/commit/4176769))
+
+Updated languages and queries:
+
+- Zig ([#3621](https://github.com/helix-editor/helix/pull/3621), [#4745](https://github.com/helix-editor/helix/pull/4745))
+- Rust ([#3647](https://github.com/helix-editor/helix/pull/3647), [#3729](https://github.com/helix-editor/helix/pull/3729), [#3927](https://github.com/helix-editor/helix/pull/3927), [#4073](https://github.com/helix-editor/helix/pull/4073), [#4510](https://github.com/helix-editor/helix/pull/4510), [#4659](https://github.com/helix-editor/helix/pull/4659), [#4717](https://github.com/helix-editor/helix/pull/4717))
+- Solidity ([20ed8c2](https://github.com/helix-editor/helix/commit/20ed8c2))
+- Fish ([#3704](https://github.com/helix-editor/helix/pull/3704))
+- Elixir ([#3645](https://github.com/helix-editor/helix/pull/3645), [#4333](https://github.com/helix-editor/helix/pull/4333), [#4821](https://github.com/helix-editor/helix/pull/4821))
+- Diff ([#3708](https://github.com/helix-editor/helix/pull/3708))
+- Nix ([665e27f](https://github.com/helix-editor/helix/commit/665e27f), [1fe3273](https://github.com/helix-editor/helix/commit/1fe3273))
+- Markdown ([#3749](https://github.com/helix-editor/helix/pull/3749), [#4078](https://github.com/helix-editor/helix/pull/4078), [#4483](https://github.com/helix-editor/helix/pull/4483), [#4478](https://github.com/helix-editor/helix/pull/4478))
+- GDScript ([#3760](https://github.com/helix-editor/helix/pull/3760))
+- JSX and TSX ([#3853](https://github.com/helix-editor/helix/pull/3853), [#3973](https://github.com/helix-editor/helix/pull/3973))
+- Ruby ([#3976](https://github.com/helix-editor/helix/pull/3976), [#4601](https://github.com/helix-editor/helix/pull/4601))
+- R ([#4031](https://github.com/helix-editor/helix/pull/4031))
+- WGSL ([#3996](https://github.com/helix-editor/helix/pull/3996), [#4079](https://github.com/helix-editor/helix/pull/4079))
+- C# ([#4118](https://github.com/helix-editor/helix/pull/4118), [#4281](https://github.com/helix-editor/helix/pull/4281), [#4213](https://github.com/helix-editor/helix/pull/4213))
+- Twig ([#4176](https://github.com/helix-editor/helix/pull/4176))
+- Lua ([#3552](https://github.com/helix-editor/helix/pull/3552))
+- C/C++ ([#4079](https://github.com/helix-editor/helix/pull/4079), [#4278](https://github.com/helix-editor/helix/pull/4278), [#4282](https://github.com/helix-editor/helix/pull/4282))
+- Cairo ([17488f1](https://github.com/helix-editor/helix/commit/17488f1), [431f9c1](https://github.com/helix-editor/helix/commit/431f9c1), [09a6df1](https://github.com/helix-editor/helix/commit/09a6df1))
+- Rescript ([#4356](https://github.com/helix-editor/helix/pull/4356))
+- Zig ([#4409](https://github.com/helix-editor/helix/pull/4409))
+- Scala ([#4353](https://github.com/helix-editor/helix/pull/4353), [#4697](https://github.com/helix-editor/helix/pull/4697), [#4701](https://github.com/helix-editor/helix/pull/4701))
+- LaTeX ([#4528](https://github.com/helix-editor/helix/pull/4528), [#4922](https://github.com/helix-editor/helix/pull/4922))
+- SQL ([#4529](https://github.com/helix-editor/helix/pull/4529))
+- Python ([#4560](https://github.com/helix-editor/helix/pull/4560))
+- Bash/Zsh ([#4582](https://github.com/helix-editor/helix/pull/4582))
+- Nu ([#4583](https://github.com/helix-editor/helix/pull/4583))
+- Julia ([#4588](https://github.com/helix-editor/helix/pull/4588))
+- Typescript ([#4703](https://github.com/helix-editor/helix/pull/4703))
+- Meson ([#4572](https://github.com/helix-editor/helix/pull/4572))
+- Haskell ([#4800](https://github.com/helix-editor/helix/pull/4800))
+- CMake ([#4809](https://github.com/helix-editor/helix/pull/4809))
+- HTML ([#4829](https://github.com/helix-editor/helix/pull/4829), [#4881](https://github.com/helix-editor/helix/pull/4881))
+- Java ([#4886](https://github.com/helix-editor/helix/pull/4886))
+- Go ([#4906](https://github.com/helix-editor/helix/pull/4906), [#4969](https://github.com/helix-editor/helix/pull/4969), [#5010](https://github.com/helix-editor/helix/pull/5010))
+- CSS ([#4882](https://github.com/helix-editor/helix/pull/4882))
+- Racket ([#4915](https://github.com/helix-editor/helix/pull/4915))
+- SCSS ([#5003](https://github.com/helix-editor/helix/pull/5003))
+
+Packaging:
+
+- Filter relevant source files in the Nix flake ([#3657](https://github.com/helix-editor/helix/pull/3657))
+- Build a binary for `aarch64-linux` in the release CI ([038a91d](https://github.com/helix-editor/helix/commit/038a91d))
+- Build an AppImage for `aarch64-linux` in the release CI ([b738031](https://github.com/helix-editor/helix/commit/b738031))
+- Enable CI builds for `riscv64-linux` ([#3685](https://github.com/helix-editor/helix/pull/3685))
+- Support preview releases in CI ([0090a2d](https://github.com/helix-editor/helix/commit/0090a2d))
+- Strip binaries built in CI ([#3780](https://github.com/helix-editor/helix/pull/3780))
+- Fix the development shell for the Nix Flake on `aarch64-darwin` ([#3810](https://github.com/helix-editor/helix/pull/3810))
+- Raise the MSRV and create an MSRV policy ([#3896](https://github.com/helix-editor/helix/pull/3896), [#3913](https://github.com/helix-editor/helix/pull/3913), [#3961](https://github.com/helix-editor/helix/pull/3961))
+- Fix Fish completions for `--config` and `--log` flags ([#3912](https://github.com/helix-editor/helix/pull/3912))
+- Use builtin filenames option in Bash completion ([#4648](https://github.com/helix-editor/helix/pull/4648))
+
 # 22.08.1 (2022-09-01)
 
 This is a patch release that fixes a panic caused by closing splits or buffers. ([#3633](https://github.com/helix-editor/helix/pull/3633))
diff --git a/VERSION b/VERSION
index b9ed4c22..e70b3aeb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-22.08.1
\ No newline at end of file
+22.12
\ No newline at end of file

From 9d4236941d581a1a9ed017db294fd3413a670b84 Mon Sep 17 00:00:00 2001
From: Alexander Brevig <alexanderbrevig@gmail.com>
Date: Wed, 7 Dec 2022 12:29:56 +0100
Subject: [PATCH 617/884] fix(theme): serika toml syntax valid (#5038)

---
 runtime/themes/serika-light.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/themes/serika-light.toml b/runtime/themes/serika-light.toml
index ad830d92..99d4b7f1 100644
--- a/runtime/themes/serika-light.toml
+++ b/runtime/themes/serika-light.toml
@@ -59,7 +59,7 @@
 "error" = "nasty-red"
 "diagnostic" = { fg = "nasty-red", modifiers = ["underlined"] }
 
-"diff.plus" = { fg = "bg_green"
+"diff.plus" = { fg = "bg_green" }
 "diff.delta" = { fg = "bg_blue" }
 "diff.minus" = { fg = "nasty-red" }
 

From a4de86e7afc0da3d847d467a21ff4fb67a51d620 Mon Sep 17 00:00:00 2001
From: Alexander Brevig <alexanderbrevig@gmail.com>
Date: Wed, 7 Dec 2022 12:30:46 +0100
Subject: [PATCH 618/884] fix(theme): git gutter for flatwhite (#5036)

---
 runtime/themes/flatwhite.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/themes/flatwhite.toml b/runtime/themes/flatwhite.toml
index d4c837b6..2fdc66d0 100644
--- a/runtime/themes/flatwhite.toml
+++ b/runtime/themes/flatwhite.toml
@@ -77,9 +77,9 @@
 "ui.popup" = { fg = "base1", bg = "base6" }
 "ui.window" = { fg = "base1", bg = "base6" }
 
-"diff.plus" = { bg = "diff_add" }
-"diff.delta" = { bg = "diff_change" }
-"diff.minus" = { bg = "diff_delete" }
+"diff.plus" = { fg = "diff_add" }
+"diff.delta" = { fg = "diff_change" }
+"diff.minus" = { fg = "diff_delete" }
 
 [palette]
 base1 = "#605a52"

From f8b75a245a390fc3772d59cafe04ccaaa53c9ca9 Mon Sep 17 00:00:00 2001
From: Jens Getreu <getreu@web.de>
Date: Thu, 8 Dec 2022 02:48:01 +0100
Subject: [PATCH 619/884] Autumn theme: use new features (#5051)

Co-authored-by: Jens Getreu <jens.getreu@dlh.lu>
---
 runtime/themes/autumn.toml       |  3 +-
 runtime/themes/autumn_night.toml | 62 +-------------------------------
 2 files changed, 3 insertions(+), 62 deletions(-)

diff --git a/runtime/themes/autumn.toml b/runtime/themes/autumn.toml
index fe80261a..501675da 100644
--- a/runtime/themes/autumn.toml
+++ b/runtime/themes/autumn.toml
@@ -58,10 +58,11 @@
 "markup.raw" = "my_green"
 
 "diff.plus" = "my_green"
-"diff.delta" = "my_white"
+"diff.delta" = "my_gray4"
 "diff.minus" = "my_red"
 
 "diagnostic" = { modifiers = ["underlined"] }
+"diagnostic.error" = { underline = { style = "curl", color = "my_red" } }
 "ui.gutter" = { bg = "my_gray0" }
 "hint" = "my_gray5"
 "debug" = "my_yellow2"
diff --git a/runtime/themes/autumn_night.toml b/runtime/themes/autumn_night.toml
index d01f5356..c26cc777 100644
--- a/runtime/themes/autumn_night.toml
+++ b/runtime/themes/autumn_night.toml
@@ -7,67 +7,7 @@
 # Jens Getreu ported and optimised the color theme for the Helix editor.
 # Author: Jens Getreu <getreu at web.de>
 
-"ui.background" = { bg = "my_gray0" }
-"ui.menu" = { fg = "my_white", bg = "my_gray2" }
-"ui.menu.selected" = { fg = "my_gray2", bg = "my_gray5" }
-"ui.linenr" = { fg = "my_gray3", bg = "my_gray0" }
-"ui.popup" = { bg = "my_gray2" }
-"ui.window" = { fg = "my_gray3", bg = "my_gray2" }
-"ui.linenr.selected" = { fg = "my_gray6", bg = "my_gray0"}
-"ui.selection" = { bg = "my_gray3" }
-"comment" = { fg = "my_gray4", modifiers = ["italic"] }
-"ui.cursorline" = { bg = "my_gray3" }
-"ui.statusline" = { fg = "my_gray6", bg = "my_gray2" }
-"ui.statusline.inactive" = { fg = 'my_gray4', bg = 'my_gray2' }
-"ui.statusline.insert" = {fg = "my_black", bg = "my_gray5", modifiers = ["bold"]}
-"ui.statusline.normal" = {fg = "my_gray6", bg = "my_gray2"}
-"ui.statusline.select" = {fg = "my_gray6", bg = "my_black", modifiers = ["bold"]}
-"ui.cursor" = { fg = "my_gray5", modifiers = ["reversed"] }
-"ui.cursor.primary" = { fg = "my_white", modifiers = ["reversed"] }
-"ui.cursorline.primary" = { bg = "my_black" }
-"ui.cursorline.secondary" = { bg = "my_black" }
-"ui.text" = "my_white"
-"operator" = "my_white"
-"ui.text.focus" = "my_white"
-"variable" = "my_white3"
-"constant.numeric" = "my_turquoise"
-"constant" = "my_white3"
-"attribute" = "my_turquoise"
-"type" = { fg = "my_white3", modifiers = ["italic"] }
-"ui.cursor.match" = { fg = "my_white3", modifiers = ["underlined"] }
-"string"  = "my_green"
-"variable.other.member" = "my_brown"
-"constant.character.escape" = "my_turquoise"
-"function" = "my_yellow1"
-"constructor" = "my_yellow1"
-"special" = "my_yellow1"
-"keyword" = "my_red"
-"label" = "my_red"
-"namespace" = "my_white3"
-"ui.help" = { fg = "my_gray6", bg = "my_gray2" }
-"ui.virtual.whitespace" = { fg = "my_gray5" }
-"ui.virtual.ruler" = { bg = "my_gray1" }
-
-"markup.heading" = "my_yellow1"
-"markup.list" = "my_white2"
-"markup.bold" = { modifiers = ["bold"] }
-"markup.italic" = {  modifiers = ["italic"] }
-"markup.link.url" = "my_turquoise2"
-"markup.link.text" = "my_white2"
-"markup.quote" = "my_brown"
-"markup.raw" = "my_green"
-
-"diff.plus" = "my_green"
-"diff.delta" = "my_white"
-"diff.minus" = "my_red"
-
-"diagnostic" = { modifiers = ["underlined"] }
-"ui.gutter" = { bg = "my_gray0" }
-"hint" = "my_gray5"
-"debug" = "my_yellow2"
-"info" = "my_yellow2"
-"warning" = "my_yellow2"
-"error" = "my_red"
+inherits = "autumn"
 
 [palette]
 my_black      = "#111111" # Cursorline

From 36eff1da8cdc4efc9cec362311718fa6a4c75563 Mon Sep 17 00:00:00 2001
From: LeoniePhiline <22329650+LeoniePhiline@users.noreply.github.com>
Date: Fri, 9 Dec 2022 03:58:15 +0100
Subject: [PATCH 620/884] fix(tutor): Capitalize first letter of a sentence
 (#5075)

---
 runtime/tutor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/tutor b/runtime/tutor
index d977e078..418c4195 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -96,7 +96,7 @@ _________________________________________________________________
  2. Move to a place in the line which is missing text and type
     i to enter Insert mode. Keys you type will now type text.
  3. Enter the missing text.
- 4. type Escape to exit Insert mode and return to Normal mode.
+ 4. Type Escape to exit Insert mode and return to Normal mode.
  5. Repeat until the line matches the line below it.
 
  --> Th stce misg so.

From d91464208958b6f44b431d244e0f369d7907ba59 Mon Sep 17 00:00:00 2001
From: cor <cor@pruijs.dev>
Date: Fri, 9 Dec 2022 04:48:56 +0100
Subject: [PATCH 621/884] use curl underlines for gruvbox_dark_hard (#5066)

---
 runtime/themes/gruvbox_dark_hard.toml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/runtime/themes/gruvbox_dark_hard.toml b/runtime/themes/gruvbox_dark_hard.toml
index 708ca2b2..27d9ab9b 100644
--- a/runtime/themes/gruvbox_dark_hard.toml
+++ b/runtime/themes/gruvbox_dark_hard.toml
@@ -39,6 +39,12 @@
 "info" = { fg = "aqua1", bg = "bg1" }
 "hint" = { fg = "blue1", bg = "bg1" }
 
+"diagnostic" = { modifiers = ["underlined"] }
+"diagnostic.error" = { underline = { style = "curl", color = "red0" } }
+"diagnostic.warning" = { underline = { style = "curl", color = "orange1" } }
+"diagnostic.info" = { underline = { style = "curl", color = "aqua1" } }
+"diagnostic.hint" = { underline = { style = "curl", color = "blue1" } }
+
 "ui.background" = { bg = "bg0" }
 "ui.linenr" = { fg = "bg4" }
 "ui.linenr.selected" = { fg = "yellow1" }
@@ -61,8 +67,6 @@
 "ui.virtual.whitespace" = "bg2"
 "ui.virtual.ruler" = { bg = "bg1" }
 
-"diagnostic" = { modifiers = ["underlined"] }
-
 "markup.heading" = "aqua1"
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }

From 6798a6651f9d314eacefddfd051661b030ca9d78 Mon Sep 17 00:00:00 2001
From: ath3 <45574139+ath3@users.noreply.github.com>
Date: Fri, 9 Dec 2022 04:55:15 +0100
Subject: [PATCH 622/884] Only write newlines in menu selection popup if the
 lsp returns detail (#4902)

---
 helix-term/src/ui/completion.rs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index c54990e8..11d7886a 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -411,7 +411,7 @@ impl Component for Completion {
                             "```{}\n{}\n```\n{}",
                             language,
                             option.detail.as_deref().unwrap_or_default(),
-                            contents.clone()
+                            contents
                         ),
                         cx.editor.syn_loader.clone(),
                     )
@@ -421,15 +421,14 @@ impl Component for Completion {
                     value: contents,
                 })) => {
                     // TODO: set language based on doc scope
-                    Markdown::new(
-                        format!(
-                            "```{}\n{}\n```\n{}",
-                            language,
-                            option.detail.as_deref().unwrap_or_default(),
-                            contents.clone()
-                        ),
-                        cx.editor.syn_loader.clone(),
-                    )
+                    if let Some(detail) = &option.detail.as_deref() {
+                        Markdown::new(
+                            format!("```{}\n{}\n```\n{}", language, detail, contents),
+                            cx.editor.syn_loader.clone(),
+                        )
+                    } else {
+                        Markdown::new(contents.to_string(), cx.editor.syn_loader.clone())
+                    }
                 }
                 None if option.detail.is_some() => {
                     // TODO: copied from above

From 8abed3bd78200fc5f7e3890fd853c17ce518d157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= <matousdzivjak@gmail.com>
Date: Fri, 9 Dec 2022 04:57:03 +0100
Subject: [PATCH 623/884] feat(lsp): pass client_info on initialization (#4904)

Pass client name ('helix') and client version (version / git hash)
to LSP server on initialization.
---
 Cargo.lock              |  1 +
 helix-loader/build.rs   | 20 ++++++++++++++++++++
 helix-loader/src/lib.rs |  2 ++
 helix-lsp/Cargo.toml    |  1 +
 helix-lsp/src/client.rs |  6 +++++-
 helix-term/build.rs     | 21 ---------------------
 helix-term/src/main.rs  |  5 +++--
 7 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 014834e4..b204214f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1187,6 +1187,7 @@ dependencies = [
  "futures-executor",
  "futures-util",
  "helix-core",
+ "helix-loader",
  "log",
  "lsp-types",
  "serde",
diff --git a/helix-loader/build.rs b/helix-loader/build.rs
index e0ebd1c4..c4b89e6b 100644
--- a/helix-loader/build.rs
+++ b/helix-loader/build.rs
@@ -1,6 +1,26 @@
+use std::borrow::Cow;
+use std::process::Command;
+
+const VERSION: &str = include_str!("../VERSION");
+
 fn main() {
+    let git_hash = Command::new("git")
+        .args(["rev-parse", "HEAD"])
+        .output()
+        .ok()
+        .filter(|output| output.status.success())
+        .and_then(|x| String::from_utf8(x.stdout).ok());
+
+    let version: Cow<_> = match git_hash {
+        Some(git_hash) => format!("{} ({})", VERSION, &git_hash[..8]).into(),
+        None => VERSION.into(),
+    };
+
     println!(
         "cargo:rustc-env=BUILD_TARGET={}",
         std::env::var("TARGET").unwrap()
     );
+
+    println!("cargo:rerun-if-changed=../VERSION");
+    println!("cargo:rustc-env=VERSION_AND_GIT_HASH={}", version);
 }
diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs
index a02a59af..29a9f2e7 100644
--- a/helix-loader/src/lib.rs
+++ b/helix-loader/src/lib.rs
@@ -4,6 +4,8 @@ pub mod grammar;
 use etcetera::base_strategy::{choose_base_strategy, BaseStrategy};
 use std::path::PathBuf;
 
+pub const VERSION_AND_GIT_HASH: &str = env!("VERSION_AND_GIT_HASH");
+
 pub static RUNTIME_DIR: once_cell::sync::Lazy<PathBuf> = once_cell::sync::Lazy::new(runtime_dir);
 
 static CONFIG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCell::new();
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 41884e73..05c5467e 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -13,6 +13,7 @@ homepage = "https://helix-editor.com"
 
 [dependencies]
 helix-core = { version = "0.6", path = "../helix-core" }
+helix-loader = { version = "0.6", path = "../helix-loader" }
 
 anyhow = "1.0"
 futures-executor = "0.3"
diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 2c2c7c88..90fd2f21 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -5,6 +5,7 @@ use crate::{
 };
 
 use helix_core::{find_root, ChangeSet, Rope};
+use helix_loader::{self, VERSION_AND_GIT_HASH};
 use lsp_types as lsp;
 use serde::Deserialize;
 use serde_json::Value;
@@ -376,7 +377,10 @@ impl Client {
                 ..Default::default()
             },
             trace: None,
-            client_info: None,
+            client_info: Some(lsp::ClientInfo {
+                name: String::from("helix"),
+                version: Some(String::from(VERSION_AND_GIT_HASH)),
+            }),
             locale: None, // TODO
         };
 
diff --git a/helix-term/build.rs b/helix-term/build.rs
index 719113ff..b47dae8e 100644
--- a/helix-term/build.rs
+++ b/helix-term/build.rs
@@ -1,30 +1,9 @@
 use helix_loader::grammar::{build_grammars, fetch_grammars};
-use std::borrow::Cow;
-use std::process::Command;
-
-const VERSION: &str = include_str!("../VERSION");
 
 fn main() {
-    let git_hash = Command::new("git")
-        .args(["rev-parse", "HEAD"])
-        .output()
-        .ok()
-        .filter(|output| output.status.success())
-        .and_then(|x| String::from_utf8(x.stdout).ok());
-
-    let version: Cow<_> = match git_hash {
-        Some(git_hash) => format!("{} ({})", VERSION, &git_hash[..8]).into(),
-        None => VERSION.into(),
-    };
-
     if std::env::var("HELIX_DISABLE_AUTO_GRAMMAR_BUILD").is_err() {
         fetch_grammars().expect("Failed to fetch tree-sitter grammars");
         build_grammars(Some(std::env::var("TARGET").unwrap()))
             .expect("Failed to compile tree-sitter grammars");
     }
-
-    println!("cargo:rerun-if-changed=../runtime/grammars/");
-    println!("cargo:rerun-if-changed=../VERSION");
-
-    println!("cargo:rustc-env=VERSION_AND_GIT_HASH={}", version);
 }
diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs
index 96b695c6..aac5c537 100644
--- a/helix-term/src/main.rs
+++ b/helix-term/src/main.rs
@@ -1,5 +1,6 @@
 use anyhow::{Context, Error, Result};
 use crossterm::event::EventStream;
+use helix_loader::VERSION_AND_GIT_HASH;
 use helix_term::application::Application;
 use helix_term::args::Args;
 use helix_term::config::Config;
@@ -74,7 +75,7 @@ FLAGS:
     --hsplit                       Splits all given files horizontally into different windows
 ",
         env!("CARGO_PKG_NAME"),
-        env!("VERSION_AND_GIT_HASH"),
+        VERSION_AND_GIT_HASH,
         env!("CARGO_PKG_AUTHORS"),
         env!("CARGO_PKG_DESCRIPTION"),
         logpath.display(),
@@ -89,7 +90,7 @@ FLAGS:
     }
 
     if args.display_version {
-        println!("helix {}", env!("VERSION_AND_GIT_HASH"));
+        println!("helix {}", VERSION_AND_GIT_HASH);
         std::process::exit(0);
     }
 

From 2ea20a23e26a771e095972bdda673d491b4aacc5 Mon Sep 17 00:00:00 2001
From: Jummit <jummit@web.de>
Date: Fri, 9 Dec 2022 05:02:34 +0100
Subject: [PATCH 624/884] Fix LSP completions ignoring auto-completion option
 (#5042)

---
 helix-term/src/commands.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 1843e7a2..2bac5be0 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3049,6 +3049,11 @@ pub mod insert {
     }
 
     fn language_server_completion(cx: &mut Context, ch: char) {
+        let config = cx.editor.config();
+        if !config.auto_completion {
+            return;
+        }
+
         use helix_lsp::lsp;
         // if ch matches completion char, trigger completion
         let doc = doc_mut!(cx.editor);

From 16e13b9789359282cb6c2681262f46fb1b70134b Mon Sep 17 00:00:00 2001
From: TotalKrill <kristoffer.odmark90@gmail.com>
Date: Fri, 9 Dec 2022 05:09:23 +0100
Subject: [PATCH 625/884] allow specifying environment for language servers in
 language.toml (#4004)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stephen Wakely <fungus.humungus@gmail.com>
Co-authored-by: Stephen Wakely <fungus.humungus@gmail.com>
Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
---
 book/src/languages.md    | 3 ++-
 helix-core/src/syntax.rs | 2 ++
 helix-lsp/src/client.rs  | 3 +++
 helix-lsp/src/lib.rs     | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/book/src/languages.md b/book/src/languages.md
index 133e6447..e45ef910 100644
--- a/book/src/languages.md
+++ b/book/src/languages.md
@@ -39,7 +39,7 @@ injection-regex = "^mylang$"
 file-types = ["mylang", "myl"]
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
-language-server = { command = "mylang-lsp", args = ["--stdio"] }
+language-server = { command = "mylang-lsp", args = ["--stdio"], environment = { "ENV1" = "value1", "ENV2" = "value2" } }
 formatter = { command = "mylang-formatter" , args = ["--stdin"] }
 ```
 
@@ -99,6 +99,7 @@ The `language-server` field takes the following keys:
 | `args`        | A list of arguments to pass to the language server binary             |
 | `timeout`     | The maximum time a request to the language server may take, in seconds. Defaults to `20` |
 | `language-id` | The language name to pass to the language server. Some language servers support multiple languages and use this field to determine which one is being served in a buffer |
+| `environment` | Any environment variables that will be used when starting the language server `{ "KEY1" = "Value1", "KEY2" = "Value2" }` |
 
 The top-level `config` field is used to configure the LSP initialization options. A `format`
 sub-table within `config` can be used to pass extra formatting options to
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 8dc34a3e..41ab23e1 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -207,6 +207,8 @@ pub struct LanguageServerConfiguration {
     #[serde(default)]
     #[serde(skip_serializing_if = "Vec::is_empty")]
     pub args: Vec<String>,
+    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
+    pub environment: HashMap<String, String>,
     #[serde(default = "default_timeout")]
     pub timeout: u64,
     pub language_id: Option<String>,
diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 90fd2f21..dd2581c6 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -42,10 +42,12 @@ pub struct Client {
 
 impl Client {
     #[allow(clippy::type_complexity)]
+    #[allow(clippy::too_many_arguments)]
     pub fn start(
         cmd: &str,
         args: &[String],
         config: Option<Value>,
+        server_environment: HashMap<String, String>,
         root_markers: &[String],
         id: usize,
         req_timeout: u64,
@@ -55,6 +57,7 @@ impl Client {
         let cmd = which::which(cmd).map_err(|err| anyhow::anyhow!(err))?;
 
         let process = Command::new(cmd)
+            .envs(server_environment)
             .args(args)
             .stdin(Stdio::piped())
             .stdout(Stdio::piped())
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index f714395f..8418896c 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -550,6 +550,7 @@ fn start_client(
         &ls_config.command,
         &ls_config.args,
         config.config.clone(),
+        ls_config.environment.clone(),
         &config.roots,
         id,
         ls_config.timeout,

From 37e7dd1df598312727aadb5c74919fd196fecffc Mon Sep 17 00:00:00 2001
From: two-six <twopsix@gmail.com>
Date: Fri, 9 Dec 2022 05:11:25 +0100
Subject: [PATCH 626/884] Update `diagnostic.error` background for acme theme
 (#5019)

---
 runtime/themes/acme.toml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/runtime/themes/acme.toml b/runtime/themes/acme.toml
index 696a4a9b..e1785f4a 100644
--- a/runtime/themes/acme.toml
+++ b/runtime/themes/acme.toml
@@ -17,9 +17,9 @@
 "ui.menu" = {fg="black", bg="acme_bg"}
 "ui.menu.selected" = {bg="selected"}
 "ui.window" = {bg="acme_bg"}
-"diagnostic.error" = {bg="white", modifiers=["bold"]}
-"diagnostic.warning" = {bg="white", modifiers=["bold"]}
-"diagnostic.hint" = {bg="white", modifiers=["bold"]}
+"diagnostic.error" = {bg="red", fg="white", modifiers=["bold"]}
+"diagnostic.warning" = {bg="orange", fg="black", modifiers=["bold"]}
+"diagnostic.hint" = {fg="gray", modifiers=["bold"]}
 "ui.bufferline" = { fg = "indent", bg = "acme_bar_bg" }
 "ui.bufferline.active" = { fg = "black", bg = "acme_bg" }
 "diff.plus" = {fg = "green"}
@@ -37,3 +37,5 @@ cursor = "#444444"
 red = "#a0342f"
 green = "#065905"
 indent = "#aaaaaa"
+orange = "#f0ad4e"
+gray = "#777777"

From d14de277092d7eab555ea2abc1435101d12e308c Mon Sep 17 00:00:00 2001
From: "Felipe S. S. Schneider"
 <37125+schneiderfelipe@users.noreply.github.com>
Date: Fri, 9 Dec 2022 01:33:08 -0300
Subject: [PATCH 627/884] Add support for the BibTeX file format (#5064)

---
 book/src/generated/lang-support.md    |  1 +
 languages.toml                        | 28 ++++++++++++++++
 runtime/queries/bibtex/highlights.scm | 47 +++++++++++++++++++++++++++
 runtime/queries/bibtex/locals.scm     |  0
 runtime/queries/bibtex/tags.scm       |  0
 5 files changed, 76 insertions(+)
 create mode 100644 runtime/queries/bibtex/highlights.scm
 create mode 100644 runtime/queries/bibtex/locals.scm
 create mode 100644 runtime/queries/bibtex/tags.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index ccfd18c0..28dafd7a 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -5,6 +5,7 @@
 | bash | ✓ |  |  | `bash-language-server` |
 | bass | ✓ |  |  | `bass` |
 | beancount | ✓ |  |  |  |
+| bibtex | ✓ |  |  | `texlab` |
 | bicep | ✓ |  |  | `bicep-langserver` |
 | c | ✓ | ✓ | ✓ | `clangd` |
 | c-sharp | ✓ | ✓ |  | `OmniSharp` |
diff --git a/languages.toml b/languages.toml
index 325a39df..96d92ce8 100644
--- a/languages.toml
+++ b/languages.toml
@@ -576,6 +576,34 @@ indent = { tab-width = 4, unit = "\t" }
 name = "latex"
 source = { git = "https://github.com/latex-lsp/tree-sitter-latex", rev = "8c75e93cd08ccb7ce1ccab22c1fbd6360e3bcea6" }
 
+[[language]]
+name = "bibtex"
+scope = "source.bib"
+injection-regex = "bib"
+file-types = ["bib"]
+roots = []
+comment-token = "%"
+language-server = { command = "texlab" }
+indent = { tab-width = 4, unit = "\t" }
+auto-format = true
+
+[language.formatter]
+command = 'bibtex-tidy'
+args = [
+  "-",
+  "--curly",
+  "--drop-all-caps",
+  "--remove-empty-fields",
+  "--sort-fields",
+  "--sort=year,author,id",
+  "--strip-enclosing-braces",
+  "--trailing-commas",
+]
+
+[[grammar]]
+name = "bibtex"
+source = { git = "https://github.com/latex-lsp/tree-sitter-bibtex", rev = "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34" }
+
 [[language]]
 name = "lean"
 scope = "source.lean"
diff --git a/runtime/queries/bibtex/highlights.scm b/runtime/queries/bibtex/highlights.scm
new file mode 100644
index 00000000..db1ab70c
--- /dev/null
+++ b/runtime/queries/bibtex/highlights.scm
@@ -0,0 +1,47 @@
+[
+  (string_type)
+  (preamble_type)
+  (entry_type)
+] @keyword
+
+[
+  (junk)
+  (comment)
+] @comment
+
+[
+  "="
+  "#"
+] @operator
+
+(command) @function.builtin
+
+(number) @constant.numeric
+
+(field
+  name: (identifier) @variable.builtin)
+
+(token
+  (identifier) @variable.parameter)
+
+[
+  (brace_word)
+  (quote_word)
+] @string
+
+[
+  (key_brace)
+  (key_paren)
+] @attribute
+
+(string
+  name: (identifier) @constant)
+
+[
+  "{"
+  "}"
+  "("
+  ")"
+] @punctuation.bracket
+
+"," @punctuation.delimiter
diff --git a/runtime/queries/bibtex/locals.scm b/runtime/queries/bibtex/locals.scm
new file mode 100644
index 00000000..e69de29b
diff --git a/runtime/queries/bibtex/tags.scm b/runtime/queries/bibtex/tags.scm
new file mode 100644
index 00000000..e69de29b

From f323ffabcc5846f647e3ba1d3d2ff5dec95257bd Mon Sep 17 00:00:00 2001
From: Danilo Spinella <oss@danyspin97.org>
Date: Sat, 10 Dec 2022 01:40:27 +0100
Subject: [PATCH 628/884] Treat patches as diff files (#5085)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 96d92ce8..06af52bd 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1083,7 +1083,7 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-git-commit", rev
 name = "diff"
 scope = "source.diff"
 roots = []
-file-types = ["diff"]
+file-types = ["diff", "patch"]
 injection-regex = "diff"
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }

From 0e8ea13696206aa8ad289d539a5df62f34a73dec Mon Sep 17 00:00:00 2001
From: Ollie Charles <ollie@ocharles.org.uk>
Date: Sat, 10 Dec 2022 20:03:18 +0000
Subject: [PATCH 629/884] Add Haskell text objects (#5061)

---
 book/src/generated/lang-support.md      |  2 +-
 runtime/queries/haskell/textobjects.scm | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/haskell/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 28dafd7a..4dca8104 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -51,7 +51,7 @@
 | gowork | ✓ |  |  | `gopls` |
 | graphql | ✓ |  |  |  |
 | hare | ✓ |  |  |  |
-| haskell | ✓ |  |  | `haskell-language-server-wrapper` |
+| haskell | ✓ | ✓ |  | `haskell-language-server-wrapper` |
 | hcl | ✓ |  | ✓ | `terraform-ls` |
 | heex | ✓ | ✓ |  | `elixir-ls` |
 | html | ✓ |  |  | `vscode-html-language-server` |
diff --git a/runtime/queries/haskell/textobjects.scm b/runtime/queries/haskell/textobjects.scm
new file mode 100644
index 00000000..9870dc4a
--- /dev/null
+++ b/runtime/queries/haskell/textobjects.scm
@@ -0,0 +1,13 @@
+(comment) @comment.inside
+
+[
+  (adt)
+  (decl_type)
+  (newtype)
+] @class.around
+
+((signature)? (function rhs:(_) @function.inside)) @function.around 
+(exp_lambda) @function.around
+
+(adt (type_variable) @parameter.inside)
+(patterns (_) @parameter.inside)

From 70d78123b94d93c801171ac3dd29e2a493feee20 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Sun, 11 Dec 2022 11:20:34 +0100
Subject: [PATCH 630/884] properly handle detachted git worktrees (#5097)

---
 helix-core/src/lib.rs       | 2 +-
 helix-loader/src/grammar.rs | 2 +-
 helix-loader/src/lib.rs     | 2 +-
 helix-term/src/ui/mod.rs    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index 0e76ebbb..ee174e69 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -69,7 +69,7 @@ pub fn find_root(root: Option<&str>, root_markers: &[String]) -> std::path::Path
             top_marker = Some(ancestor);
         }
 
-        if ancestor.join(".git").is_dir() {
+        if ancestor.join(".git").exists() {
             // Top marker is repo root if not root marker was detected yet
             if top_marker.is_none() {
                 top_marker = Some(ancestor);
diff --git a/helix-loader/src/grammar.rs b/helix-loader/src/grammar.rs
index 833616e0..2aa92475 100644
--- a/helix-loader/src/grammar.rs
+++ b/helix-loader/src/grammar.rs
@@ -263,7 +263,7 @@ fn fetch_grammar(grammar: GrammarConfiguration) -> Result<FetchStatus> {
         ))?;
 
         // create the grammar dir contains a git directory
-        if !grammar_dir.join(".git").is_dir() {
+        if !grammar_dir.join(".git").exists() {
             git(&grammar_dir, ["init"])?;
         }
 
diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs
index 29a9f2e7..80d44a82 100644
--- a/helix-loader/src/lib.rs
+++ b/helix-loader/src/lib.rs
@@ -97,7 +97,7 @@ pub fn find_local_config_dirs() -> Vec<PathBuf> {
     let mut directories = Vec::new();
 
     for ancestor in current_dir.ancestors() {
-        if ancestor.join(".git").is_dir() {
+        if ancestor.join(".git").exists() {
             directories.push(ancestor.to_path_buf());
             // Don't go higher than repo if we're in one
             break;
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index f61c4c45..107e48dd 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -207,7 +207,7 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
 
     // Cap the number of files if we aren't in a git project, preventing
     // hangs when using the picker in your home directory
-    let files: Vec<_> = if root.join(".git").is_dir() {
+    let files: Vec<_> = if root.join(".git").exists() {
         files.collect()
     } else {
         // const MAX: usize = 8192;

From cdc54f50a2ceb62c9f1c38b939ca988ff0e96855 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 11 Dec 2022 09:04:08 -0600
Subject: [PATCH 631/884] Reset mode when changing buffers (#5072)

* Reset mode when changing buffers

This is similar to the change in
e4c9d4082a139aac3aea4506918171b96e81f5b9: reset the editor to normal
mode when changing buffers. Usually the editor is already in normal
mode but it's possible to setup insert-mode keybindings that change
buffers.

* Move normal mode entering code to Editor

This should be called internally in the Editor when changing documents
(Editor::switch) or changing focuses (Editor::focus).
---
 helix-term/src/commands.rs | 57 +------------------------------
 helix-view/src/editor.rs   | 70 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 70 insertions(+), 57 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 2bac5be0..1310417e 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2672,62 +2672,7 @@ fn open_above(cx: &mut Context) {
 }
 
 fn normal_mode(cx: &mut Context) {
-    if cx.editor.mode == Mode::Normal {
-        return;
-    }
-
-    cx.editor.mode = Mode::Normal;
-    let (view, doc) = current!(cx.editor);
-
-    try_restore_indent(doc, view);
-
-    // if leaving append mode, move cursor back by 1
-    if doc.restore_cursor {
-        let text = doc.text().slice(..);
-        let selection = doc.selection(view.id).clone().transform(|range| {
-            Range::new(
-                range.from(),
-                graphemes::prev_grapheme_boundary(text, range.to()),
-            )
-        });
-
-        doc.set_selection(view.id, selection);
-        doc.restore_cursor = false;
-    }
-}
-
-fn try_restore_indent(doc: &mut Document, view: &mut View) {
-    use helix_core::chars::char_is_whitespace;
-    use helix_core::Operation;
-
-    fn inserted_a_new_blank_line(changes: &[Operation], pos: usize, line_end_pos: usize) -> bool {
-        if let [Operation::Retain(move_pos), Operation::Insert(ref inserted_str), Operation::Retain(_)] =
-            changes
-        {
-            move_pos + inserted_str.len() == pos
-                && inserted_str.starts_with('\n')
-                && inserted_str.chars().skip(1).all(char_is_whitespace)
-                && pos == line_end_pos // ensure no characters exists after current position
-        } else {
-            false
-        }
-    }
-
-    let doc_changes = doc.changes().changes();
-    let text = doc.text().slice(..);
-    let range = doc.selection(view.id).primary();
-    let pos = range.cursor(text);
-    let line_end_pos = line_end_char_index(&text, range.cursor_line(text));
-
-    if inserted_a_new_blank_line(doc_changes, pos, line_end_pos) {
-        // Removes tailing whitespaces.
-        let transaction =
-            Transaction::change_by_selection(doc.text(), doc.selection(view.id), |range| {
-                let line_start_pos = text.line_to_char(range.cursor_line(text));
-                (line_start_pos, pos, None)
-            });
-        apply_transaction(&transaction, doc, view);
-    }
+    cx.editor.enter_normal_mode();
 }
 
 // Store a jump on the jumplist.
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 973cf82e..c13a6673 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1005,6 +1005,8 @@ impl Editor {
             return;
         }
 
+        self.enter_normal_mode();
+
         match action {
             Action::Replace => {
                 let (view, doc) = current_ref!(self);
@@ -1025,6 +1027,9 @@ impl Editor {
                 let (view, doc) = current!(self);
                 let view_id = view.id;
 
+                // Append any outstanding changes to history in the old document.
+                doc.append_changes_to_history(view);
+
                 if remove_empty_scratch {
                     // Copy `doc.id` into a variable before calling `self.documents.remove`, which requires a mutable
                     // borrow, invalidating direct access to `doc.id`.
@@ -1262,7 +1267,7 @@ impl Editor {
         // if leaving the view: mode should reset and the cursor should be
         // within view
         if prev_id != view_id {
-            self.mode = Mode::Normal;
+            self.enter_normal_mode();
             self.ensure_cursor_in_view(view_id);
 
             // Update jumplist selections with new document changes.
@@ -1427,4 +1432,67 @@ impl Editor {
 
         Ok(())
     }
+
+    /// Switches the editor into normal mode.
+    pub fn enter_normal_mode(&mut self) {
+        use helix_core::{graphemes, Range};
+
+        if self.mode == Mode::Normal {
+            return;
+        }
+
+        self.mode = Mode::Normal;
+        let (view, doc) = current!(self);
+
+        try_restore_indent(doc, view);
+
+        // if leaving append mode, move cursor back by 1
+        if doc.restore_cursor {
+            let text = doc.text().slice(..);
+            let selection = doc.selection(view.id).clone().transform(|range| {
+                Range::new(
+                    range.from(),
+                    graphemes::prev_grapheme_boundary(text, range.to()),
+                )
+            });
+
+            doc.set_selection(view.id, selection);
+            doc.restore_cursor = false;
+        }
+    }
+}
+
+fn try_restore_indent(doc: &mut Document, view: &mut View) {
+    use helix_core::{
+        chars::char_is_whitespace, line_ending::line_end_char_index, Operation, Transaction,
+    };
+
+    fn inserted_a_new_blank_line(changes: &[Operation], pos: usize, line_end_pos: usize) -> bool {
+        if let [Operation::Retain(move_pos), Operation::Insert(ref inserted_str), Operation::Retain(_)] =
+            changes
+        {
+            move_pos + inserted_str.len() == pos
+                && inserted_str.starts_with('\n')
+                && inserted_str.chars().skip(1).all(char_is_whitespace)
+                && pos == line_end_pos // ensure no characters exists after current position
+        } else {
+            false
+        }
+    }
+
+    let doc_changes = doc.changes().changes();
+    let text = doc.text().slice(..);
+    let range = doc.selection(view.id).primary();
+    let pos = range.cursor(text);
+    let line_end_pos = line_end_char_index(&text, range.cursor_line(text));
+
+    if inserted_a_new_blank_line(doc_changes, pos, line_end_pos) {
+        // Removes tailing whitespaces.
+        let transaction =
+            Transaction::change_by_selection(doc.text(), doc.selection(view.id), |range| {
+                let line_start_pos = text.line_to_char(range.cursor_line(text));
+                (line_start_pos, pos, None)
+            });
+        crate::apply_transaction(&transaction, doc, view);
+    }
 }

From c5bfb792b2a26545f6515a1e7b62d4f37b10841e Mon Sep 17 00:00:00 2001
From: Slug <106496265+GreasySlug@users.noreply.github.com>
Date: Mon, 12 Dec 2022 03:14:10 +0900
Subject: [PATCH 632/884] update(theme): adjust base16_transparent and
 dark_high_contrast (#5105)

---
 book/src/themes.md                     |  2 +-
 runtime/themes/base16_transparent.toml | 45 +++++++++++++------------
 runtime/themes/dark_high_contrast.toml | 46 ++++++++++++++------------
 3 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/book/src/themes.md b/book/src/themes.md
index 392b5f8c..322caea5 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -103,7 +103,7 @@ Some styles might not be supported by your terminal emulator.
 | `line`         |
 | `curl`         |
 | `dashed`       |
-| `dot`          |
+| `dotted`       |
 | `double_line`  |
 
 
diff --git a/runtime/themes/base16_transparent.toml b/runtime/themes/base16_transparent.toml
index 0c6d924f..f8ee0890 100644
--- a/runtime/themes/base16_transparent.toml
+++ b/runtime/themes/base16_transparent.toml
@@ -1,27 +1,28 @@
 # Author: GreasySlug <9619abgoni@gmail.com>
+# This theme is base on base16_theme(Author: NNB <nnbnh@protonmail.com>)
 
 "ui.background" = { fg = "white"}
 "ui.background.separator" = { fg = "gray" }
-"ui.menu" = { fg = "gray" }
+"ui.menu" = { fg = "white" }
 "ui.menu.selected" = { modifiers = ["reversed"] }
 "ui.menu.scroll" = { fg = "light-gray" }
 "ui.linenr" = { fg = "light-gray" }
 "ui.linenr.selected" = { fg = "white",  modifiers = ["bold"] }
 "ui.popup" = { fg = "white" }
 "ui.window" = { fg = "white" }
-"ui.selection" = { modifiers = [ "reversed"] }
-"comment" = { fg = "gray", modifiers = ["italic"] }
+"ui.selection" = { bg = "gray" }
+"comment" = "light-gray"
 "ui.statusline" = { fg = "white" }
 "ui.statusline.inactive" = { fg = "gray" }
-"ui.statusline.normal" = { fg = "blue", modifiers = ["reversed"] }
-"ui.statusline.insert" = { fg = "green", modifiers = ["reversed"] }
-"ui.statusline.select" = { fg = "magenta", modifiers = ["reversed"] }
+"ui.statusline.normal" = { fg = "black", bg = "blue" }
+"ui.statusline.insert" = { fg = "black", bg = "green" }
+"ui.statusline.select" = { fg = "black", bg = "magenta" }
 "ui.help" = { fg = "light-gray" }
 "ui.cursor" = { modifiers = ["reversed"] }
-"ui.cursor.match" = { fg = "light-yellow", modifiers = ["underlined"] }
+"ui.cursor.match" = { fg = "light-yellow", underline = { color = "light-yellow", style = "line" } }
 "ui.cursor.primary" = { modifiers = ["reversed", "slow_blink"] }
 "ui.cursor.secondary" = { modifiers = ["reversed"] }
-"ui.virtual.ruler" = { fg = "gray", modifiers = ["reversed"] }
+"ui.virtual.ruler" = { bg = "gray" }
 "ui.virtual.whitespace" = "gray"
 "ui.virtual.indent-guide" = "gray"
 
@@ -44,7 +45,7 @@
 "markup.list" = "light-red"
 "markup.bold" = { fg = "light-yellow", modifiers = ["bold"] }
 "markup.italic" = { fg = "light-magenta", modifiers = ["italic"] }
-"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
+"markup.link.url" = { fg = "yellow", underline = { color = "yellow", style = "line"} }
 "markup.link.text" = "light-red"
 "markup.quote" = "light-cyan"
 "markup.raw" = "green"
@@ -53,19 +54,19 @@
 "markup.select" = { fg = "magenta" }
 
 "diff.plus" = "light-green"
-"diff.delta" = "yellow"
+"diff.delta" = "light-blue"
+"diff.delta.moved" = "blue"
 "diff.minus" = "light-red"
 
-"ui.gutter" = "gray" 
-"info" = "light-blue" 
-"hint" = "gray" 
-"debug" = "gray"  
-"warning" = "yellow" 
-"error" = "light-red" 
+"ui.gutter" = "gray"
+"info" = "light-blue"
+"hint" = "light-gray"
+"debug" = "light-gray"
+"warning" = "light-yellow"
+"error" = "light-red"
 
-"diagnostic" = { modifiers = ["underlined"] }
-"diagnostic.info" = { fg = "light-blue", modifiers = ["underlined"] }
-"diagnostic.hint" = { fg = "gray", modifiers = ["underlined"] }
-"diagnostic.debug" ={ fg ="gray",  modifiers = ["underlined"] }
-"diagnostic.warning" = { fg = "yellow", modifiers = ["underlined"] }
-"diagnostic.error" = { fg ="light-red", modifiers = ["underlined"] }
+"diagnostic.info" = { underline = { color = "light-blue", style = "dotted" } }
+"diagnostic.hint" = { underline = { color = "light-gray", style = "double_line" } }
+"diagnostic.debug" = { underline ={ color ="light-gray", style = "dashed" } }
+"diagnostic.warning" = { underline = { color = "light-yellow", style = "curl" } }
+"diagnostic.error" = { underline = { color ="light-red", style = "curl" } }
diff --git a/runtime/themes/dark_high_contrast.toml b/runtime/themes/dark_high_contrast.toml
index c65750f4..1c911eb5 100644
--- a/runtime/themes/dark_high_contrast.toml
+++ b/runtime/themes/dark_high_contrast.toml
@@ -9,29 +9,29 @@
 "ui.text.focus" = { modifiers = ["reversed"] } # file picker selected
 
 "ui.virtual.whitespace" = "gray"
-"ui.virtual.ruler" = { fg = "gray", bg = "white", modifiers = ["reversed"] }
+"ui.virtual.ruler" = { fg = "white", bg = "gray" }
 "ui.virtual.indent-guide" = "white"
 
 "ui.statusline" = { fg = "white", bg = "deep_blue" }
-"ui.statusline.inactive" = { fg = "gray" }
+"ui.statusline.inactive" = { fg = "gray", bg = "deep_blue" }
 "ui.statusline.normal" = { fg = "black", bg = "aqua" }
 "ui.statusline.insert" = { fg = "black", bg = "orange" }
 "ui.statusline.select" = { fg = "black", bg = "purple" }
-# "ui.statusline.separator" = { fg = "aqua", bg = "white" }
+"ui.statusline.separator" = { fg = "aqua", bg = "white" }
 
 "ui.cursor" = { fg = "black", bg = "white" }
 "ui.cursor.insert" = { fg = "black", bg = "white" }
 "ui.cursor.select" = { fg = "black", bg = "white" }
 "ui.cursor.match" = { bg = "white", modifiers = ["dim"] }
 "ui.cursor.primary" = { fg = "black", bg = "white", modifiers = ["slow_blink"] }
-
 "ui.cursor.secondary" = "white"
-"ui.cursorline.primary" = { fg = "orange", modifiers = ["underlined"] }
-"ui.cursorline.secondary" = { fg = "orange", modifiers = ["underlined"] }
-"ui.selection" = { fg = "deep_blue", bg = "white" }
+"ui.cursorline.primary" = { bg = "deep_blue", underline = { color = "orange", style = "double_line" } }
+"ui.cursorline.secondary" = { bg = "dark_blue", underline = { color = "white", style = "line" } }
+"ui.selection" = { fg = "dark_blue", bg = "white" }
+"ui.selection.primary" = { fg = "deep_blue", bg = "white" }
 
 "ui.menu" = { fg = "white", bg = "deep_blue" }
-"ui.menu.selected" = { fg = "orange", modifiers = ["underlined"] }
+"ui.menu.selected" = { fg = "orange", underline = { style = "line" } }
 "ui.menu.scroll" = { fg = "aqua", bg = "black" }
 "ui.help" = { fg = "white", bg = "deep_blue" }
 
@@ -39,15 +39,16 @@
 "ui.popup.info" = { fg = "white", bg = "deep_blue" }
 
 "ui.gutter" = { bg = "black" }
+"ui.gutter.selected" = { bg = "black" }
 "ui.linenr" = { fg = "white", bg = "black" }
 "ui.linenr.selected" = { fg = "orange", bg = "black", modifiers = ["bold"] }
 
 # Diagnostic
-"diagnostic" = "white"
-"diagnostic.info" = { bg = "white", modifiers = ["underlined"] }
-"diagnostic.hint" = { fg = "yellow", modifiers = ["underlined"] }
-"diagnostic.warning" = { fg = "orange", modifiers = ["underlined"] }
-"diagnostic.error" = { fg = "red", modifiers = ["underlined"] }
+"diagnostic" = { fg = "white" }
+"diagnostic.info" = { underline = { color = "white", style = "dotted" } }
+"diagnostic.hint" = { underline = { color = "yellow", style = "dashed" } }
+"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
 "info" = "white" 
 "hint" = "yellow"
 "warning" = "orange"
@@ -59,31 +60,31 @@
 "diff.minus" = "pink"
 
 # Syntax high light
-"type" = { fg = "emerald_green" }
+"type" = "emerald_green"
 "type.buildin" = "emerald_green"
-"comment" = { fg = "white" }
+"comment" = "white"
 "operator" = "white"
-"variable" = { fg = "aqua" }
+"variable" = "aqua"
 "variable.other.member" = "brown"
 "constant" = "aqua"
 "constant.numeric" = "emerald_green"
-"attributes" = { fg = "blue" }
+"attributes" = "blue"
 "namespace" = "blue"
 "string" = "brown"
-"string.special.url" = { fg = "brown", modifiers =["underlined"]}
+"string.special.url" = "brown"
 "constant.character.escape" = "yellow"
 "constructor" = "aqua"
-"keyword" = { fg = "blue", modifiers = ["underlined"] }
+"keyword" = "blue"
 "keyword.control" = "purple"
 "function" = "yellow"
 "label" = "blue"
 
 # Markup 
-"markup.heading" = { fg = "yellow", modifiers = ["bold", "underlined"] }
-"markup.list" = { fg = "pink" }
+"markup.heading" = { fg = "yellow", modifiers = ["bold"], underline = { color = "yellow", style = "double_line"} }
+"markup.list" = "pink"
 "markup.bold" = { fg = "emerald_green", modifiers = ["bold"] }
 "markup.italic" = { fg = "blue", modifiers = ["italic"] }
-"markup.link.url" = { fg = "blue", modifiers = ["underlined"] }
+"markup.link.url" = { fg = "blue", underline = { color = "blue", style = "line" } }
 "markup.link.text" = "pink"
 "markup.quote" = "yellow"
 "markup.raw" = "brown"
@@ -94,6 +95,7 @@ gray = "#585858"
 white = "#ffffff"
 blue = "#66a4ff"
 deep_blue = "#142743"
+dark_blue = "#0d1a2d"
 aqua = "#6fc3df"
 purple = "#c586c0"
 red = "#b65f5f"

From a34ba071be0a48a35f36ada7759dee53d783e57b Mon Sep 17 00:00:00 2001
From: garlic0x1 <43155857+garlic0x1@users.noreply.github.com>
Date: Sun, 11 Dec 2022 19:59:27 -0600
Subject: [PATCH 633/884] Fix commonlisp filetypes typo and auto-pairs (#5091)

---
 languages.toml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 06af52bd..dae675df 100644
--- a/languages.toml
+++ b/languages.toml
@@ -918,13 +918,19 @@ grammar = "scheme"
 name = "common-lisp"
 scope = "source.lisp"
 roots = []
-file-types = ["lisp", "asd", "cl", "l", "lsp", "ny"," podsl", "sexp"]
+file-types = ["lisp", "asd", "cl", "l", "lsp", "ny", "podsl", "sexp"]
 shebangs = ["lisp", "sbcl", "ccl", "clisp", "ecl"]
 comment-token = ";"
 indent = { tab-width = 2, unit = "  " }
 language-server = { command = "cl-lsp", args = [ "stdio" ] }
 grammar = "scheme"
 
+[language.auto-pairs]
+'(' = ')'
+'{' = '}'
+'[' = ']'
+'"' = '"'
+
 [[language]]
 name = "comment"
 scope = "scope.comment"

From d5ab974d38fd5565a63c8d7c35967c77c0e434d0 Mon Sep 17 00:00:00 2001
From: Marco Ieni <11428655+MarcoIeni@users.noreply.github.com>
Date: Mon, 12 Dec 2022 02:59:53 +0100
Subject: [PATCH 634/884] chore(book): link repository (#5101)

---
 book/book.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/book/book.toml b/book/book.toml
index 2277a0bd..9835145c 100644
--- a/book/book.toml
+++ b/book/book.toml
@@ -9,3 +9,4 @@ edit-url-template = "https://github.com/helix-editor/helix/tree/master/book/{pat
 cname = "docs.helix-editor.com"
 default-theme = "colibri"
 preferred-dark-theme = "colibri"
+git-repository-url = "https://github.com/helix-editor/helix"

From 0b960216433956503e9e6fe5220523eb1970eaee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Schl=C3=B6gl?= <alexander.schloegl@uibk.ac.at>
Date: Mon, 12 Dec 2022 03:06:24 +0100
Subject: [PATCH 635/884] Add `:pipe-to` typable command that ignores shell
 output (#4931)

---
 book/src/generated/typable-cmd.md |  1 +
 helix-term/src/commands/typed.rs  | 26 +++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index 6390ef85..66e6ac03 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -71,4 +71,5 @@
 | `:insert-output` | Run shell command, inserting output before each selection. |
 | `:append-output` | Run shell command, appending output after each selection. |
 | `:pipe` | Pipe each selection to the shell command. |
+| `:pipe-to` | Pipe each selection to the shell command, ignoring output. |
 | `:run-shell-command`, `:sh` | Run a shell command |
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 03fcaa55..2119a48d 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1741,13 +1741,30 @@ fn insert_output(
     Ok(())
 }
 
+fn pipe_to(
+    cx: &mut compositor::Context,
+    args: &[Cow<str>],
+    event: PromptEvent,
+) -> anyhow::Result<()> {
+    pipe_impl(cx, args, event, &ShellBehavior::Ignore)
+}
+
 fn pipe(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) -> anyhow::Result<()> {
+    pipe_impl(cx, args, event, &ShellBehavior::Replace)
+}
+
+fn pipe_impl(
+    cx: &mut compositor::Context,
+    args: &[Cow<str>],
+    event: PromptEvent,
+    behavior: &ShellBehavior,
+) -> anyhow::Result<()> {
     if event != PromptEvent::Validate {
         return Ok(());
     }
 
     ensure!(!args.is_empty(), "Shell command required");
-    shell(cx, &args.join(" "), &ShellBehavior::Replace);
+    shell(cx, &args.join(" "), behavior);
     Ok(())
 }
 
@@ -2292,6 +2309,13 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
             fun: pipe,
             completer: None,
         },
+        TypableCommand {
+            name: "pipe-to",
+            aliases: &[],
+            doc: "Pipe each selection to the shell command, ignoring output.",
+            fun: pipe_to,
+            completer: None,
+        },
         TypableCommand {
             name: "run-shell-command",
             aliases: &["sh"],

From bae890d8faa993333d81e662b6f0a6bc5e921a92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Mon, 12 Dec 2022 17:49:57 +0900
Subject: [PATCH 636/884] Update tree-sitter-scheme

---
 languages.toml                        |  2 +-
 runtime/queries/rust/highlights.scm   | 11 +++++-
 runtime/queries/scheme/highlights.scm | 55 +++++++++++++--------------
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/languages.toml b/languages.toml
index dae675df..e6bc344c 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1583,7 +1583,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "scheme"
-source = { git = "https://github.com/6cdh/tree-sitter-scheme", rev = "27fb77db05f890c2823b4bd751c6420378df146b" }
+source = { git = "https://github.com/6cdh/tree-sitter-scheme", rev = "c0741320bfca6b7b5b7a13b5171275951e96a842" }
 
 [[language]]
 name = "v"
diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm
index 5606e93d..d3c29270 100644
--- a/runtime/queries/rust/highlights.scm
+++ b/runtime/queries/rust/highlights.scm
@@ -5,8 +5,6 @@
 ; overrides are unnecessary.
 ; -------
 
-
-
 ; -------
 ; Types
 ; -------
@@ -241,6 +239,14 @@
 
 
 
+(attribute
+  (identifier) @_macro
+  arguments: (token_tree (identifier) @constant.numeric.integer)
+  (#eq? @_macro "derive")
+)
+@special
+
+
 ; -------
 ; Functions
 ; -------
@@ -271,6 +277,7 @@
 ; ---
 ; Macros
 ; ---
+
 (attribute
   (identifier) @function.macro)
 (attribute
diff --git a/runtime/queries/scheme/highlights.scm b/runtime/queries/scheme/highlights.scm
index 3b7a4275..46819374 100644
--- a/runtime/queries/scheme/highlights.scm
+++ b/runtime/queries/scheme/highlights.scm
@@ -2,29 +2,40 @@
 (character) @constant.character
 (boolean) @constant.builtin.boolean
 
-[(string)
- (character)] @string
+(string) @string
 
 (escape_sequence) @constant.character.escape
 
-[(comment)
- (block_comment)
- (directive)] @comment
+(comment) @comment.line
+(block_comment) @comment.block
+(directive) @keyword.directive
 
-[(boolean)
- (character)] @constant
+; operators
 
-((symbol) @function.builtin
- (#match? @function.builtin "^(eqv\\?|eq\\?|equal\\?)")) ; TODO
+((symbol) @operator
+ (#match? @operator "^(\\+|-|\\*|/|=|>|<|>=|<=)$"))
 
 ; keywords
 
-((symbol) @keyword.conditional
- (#match? @keyword.conditional "^(if|cond|case|when|unless)$"))
+(list
+  .
+  ((symbol) @keyword.conditional
+   (#match? @keyword.conditional "^(if|cond|case|when|unless)$"
+  )))
  
-((symbol) @keyword
- (#match? @keyword
-  "^(define|lambda|begin|do|define-syntax|and|or|if|cond|case|when|unless|else|=>|let|let*|let-syntax|let-values|let*-values|letrec|letrec*|letrec-syntax|set!|syntax-rules|identifier-syntax|quote|unquote|quote-splicing|quasiquote|unquote-splicing|delay|assert|library|export|import|rename|only|except|prefix)$"))
+(list
+  .
+  (symbol) @keyword
+  (#match? @keyword
+   "^(define-syntax|let\\*|lambda|λ|case|=>|quote-splicing|unquote-splicing|set!|let|letrec|letrec-syntax|let-values|let\\*-values|do|else|define|cond|syntax-rules|unquote|begin|quote|let-syntax|and|if|quasiquote|letrec|delay|or|when|unless|identifier-syntax|assert|library|export|import|rename|only|except|prefix)$"
+   ))
+
+(list
+  .
+  (symbol) @function.builtin
+  (#match? @function.builtin
+   "^(caar|cadr|call-with-input-file|call-with-output-file|cdar|cddr|list|open-input-file|open-output-file|with-input-from-file|with-output-to-file|\\*|\\+|-|/|<|<=|=|>|>=|abs|acos|angle|append|apply|asin|assoc|assq|assv|atan|boolean\\?|caaaar|caaadr|caaar|caadar|caaddr|caadr|cadaar|cadadr|cadar|caddar|cadddr|caddr|call-with-current-continuation|call-with-values|car|cdaaar|cdaadr|cdaar|cdadar|cdaddr|cdadr|cddaar|cddadr|cddar|cdddar|cddddr|cdddr|cdr|ceiling|char->integer|char-alphabetic\\?|char-ci<=\\?|char-ci<\\?|char-ci=\\?|char-ci>=\\?|char-ci>\\?|char-downcase|char-lower-case\\?|char-numeric\\?|char-ready\\?|char-upcase|char-upper-case\\?|char-whitespace\\?|char<=\\?|char<\\?|char=\\?|char>=\\?|char>\\?|char\\?|close-input-port|close-output-port|complex\\?|cons|cos|current-error-port|current-input-port|current-output-port|denominator|display|dynamic-wind|eof-object\\?|eq\\?|equal\\?|eqv\\?|eval|even\\?|exact->inexact|exact\\?|exp|expt|floor|flush-output|for-each|force|gcd|imag-part|inexact->exact|inexact\\?|input-port\\?|integer->char|integer\\?|interaction-environment|lcm|length|list->string|list->vector|list-ref|list-tail|list\\?|load|log|magnitude|make-polar|make-rectangular|make-string|make-vector|map|max|member|memq|memv|min|modulo|negative\\?|newline|not|null-environment|null\\?|number->string|number\\?|numerator|odd\\?|output-port\\?|pair\\?|peek-char|positive\\?|procedure\\?|quotient|rational\\?|rationalize|read|read-char|real-part|real\\?|remainder|reverse|round|scheme-report-environment|set-car!|set-cdr!|sin|sqrt|string|string->list|string->number|string->symbol|string-append|string-ci<=\\?|string-ci<\\?|string-ci=\\?|string-ci>=\\?|string-ci>\\?|string-copy|string-fill!|string-length|string-ref|string-set!|string<=\\?|string<\\?|string=\\?|string>=\\?|string>\\?|string\\?|substring|symbol->string|symbol\\?|tan|transcript-off|transcript-on|truncate|values|vector|vector->list|vector-fill!|vector-length|vector-ref|vector-set!|vector\\?|write|write-char|zero\\?)$"
+   ))
 
 ; special forms
 
@@ -47,26 +58,16 @@
  .
  (list
    (list
-     (symbol) @variable))
+     (symbol) @variable.parameter))
  (#match? @_f
   "^(let|let\\*|let-syntax|let-values|let\\*-values|letrec|letrec\\*|letrec-syntax)$"))
 
-; operators
-
-(list
-  .
-  (symbol) @operator
-  (#match? @operator "^([+*/<>=-]|(<=)|(>=))$"))
-  
 ; quote
 
-(abbreviation
-  "'" (symbol)) @constant
-
 (list
  .
  (symbol) @_f
- (#eq? @_f "quote")) @symbol
+ (#eq? @_f "quote")) @string.symbol
 
 ; library
 
@@ -89,12 +90,10 @@
 ((symbol) @variable.builtin
  (#eq? @variable.builtin "..."))
 
-(symbol) @variable
 ((symbol) @variable.builtin
  (#eq? @variable.builtin "."))
 
 (symbol) @variable
 
-
 ["(" ")" "[" "]" "{" "}"] @punctuation.bracket
 

From f995f2610b3ad3aa68cec42ea14ce067a1ed3655 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Dec 2022 17:20:26 -0600
Subject: [PATCH 637/884] build(deps): bump serde from 1.0.149 to 1.0.150
 (#5138)

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.149 to 1.0.150.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.149...v1.0.150)

---
updated-dependencies:
- dependency-name: serde
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b204214f..040a039c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1805,18 +1805,18 @@ checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
 
 [[package]]
 name = "serde"
-version = "1.0.149"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055"
+checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.149"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4"
+checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e"
 dependencies = [
  "proc-macro2",
  "quote",

From fa436fa680b5bcf6d46666a03ae23b94a74e0414 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Dec 2022 17:25:05 -0600
Subject: [PATCH 638/884] build(deps): bump tokio from 1.22.0 to 1.23.0 (#5137)

Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.22.0 to 1.23.0.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.22.0...tokio-1.23.0)

---
updated-dependencies:
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock           | 6 +++---
 helix-lsp/Cargo.toml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 040a039c..6ae0a71f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2100,9 +2100,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.22.0"
+version = "1.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3"
+checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46"
 dependencies = [
  "autocfg",
  "bytes",
@@ -2115,7 +2115,7 @@ dependencies = [
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "winapi",
+ "windows-sys",
 ]
 
 [[package]]
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 05c5467e..d04edcd5 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -23,6 +23,6 @@ lsp-types = { version = "0.93", features = ["proposed"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-tokio = { version = "1.22", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
+tokio = { version = "1.23", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
 tokio-stream = "0.1.11"
 which = "4.2"

From 00092a29c4f8ca7402455a9a494147ee3521bd4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 13 Dec 2022 15:07:20 +0900
Subject: [PATCH 639/884] Use dtolnay/rust-toolchain in more places

---
 .github/workflows/build.yml   |  9 ++------
 .github/workflows/release.yml | 42 ++++++++++++++++++++---------------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index deeff80e..3a4896f1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,10 +44,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install stable toolchain
-        uses: helix-editor/rust-toolchain@v1
-        with:
-          profile: minimal
-          override: true
+        uses: dtolnay/rust-toolchain@1.61
 
       - uses: Swatinem/rust-cache@v2
 
@@ -76,10 +73,8 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install stable toolchain
-        uses: helix-editor/rust-toolchain@v1
+        uses: dtolnay/rust-toolchain@1.61
         with:
-          profile: minimal
-          override: true
           components: rustfmt, clippy
 
       - uses: Swatinem/rust-cache@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c242f089..8c105bfc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,10 +26,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install stable toolchain
-        uses: helix-editor/rust-toolchain@v1
-        with:
-          profile: minimal
-          override: true
+        uses: dtolnay/rust-toolchain@stable
 
       - uses: Swatinem/rust-cache@v2
 
@@ -47,6 +44,16 @@ jobs:
   dist:
     name: Dist
     needs: [fetch-grammars]
+    env:
+      # For some builds, we use cross to test on 32-bit and big-endian
+      # systems.
+      CARGO: cargo
+      # When CARGO is set to CROSS, this is set to `--target matrix.target`.
+      TARGET_FLAGS:
+      # When CARGO is set to CROSS, TARGET_DIR includes matrix.target.
+      TARGET_DIR: ./target
+      # Emit backtraces on panics.
+      RUST_BACKTRACE: 1
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false # don't fail other jobs if one fails
@@ -107,12 +114,10 @@ jobs:
           tar xJf grammars/grammars.tar.xz -C runtime/grammars/sources
 
       - name: Install ${{ matrix.rust }} toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
           toolchain: ${{ matrix.rust }}
           target: ${{ matrix.target }}
-          override: true
 
       # Install a pre-release version of Cross
       # TODO: We need to pre-install Cross because we need cross-rs/cross#591 to
@@ -120,15 +125,20 @@ jobs:
       #       0.3.0, which includes cross-rs/cross#591, is released.
       - name: Install Cross
         if: "matrix.cross"
-        run: cargo install cross --git https://github.com/cross-rs/cross.git --rev 47df5c76e7cba682823a0b6aa6d95c17b31ba63a
+        run: |
+          cargo install cross --git https://github.com/cross-rs/cross.git --rev 47df5c76e7cba682823a0b6aa6d95c17b31ba63a
+          echo "CARGO=cross" >> $GITHUB_ENV
+        # echo "TARGET_FLAGS=--target ${{ matrix.target }}" >> $GITHUB_ENV
+        # echo "TARGET_DIR=./target/${{ matrix.target }}" >> $GITHUB_ENV
+
+      - name: Show command used for Cargo
+        run: |
+          echo "cargo command is: ${{ env.CARGO }}"
+          echo "target flag is: ${{ env.TARGET_FLAGS }}"
 
       - name: Run cargo test
-        uses: actions-rs/cargo@v1
         if: "!matrix.skip_tests"
-        with:
-          use-cross: ${{ matrix.cross }}
-          command: test
-          args: --release --locked --target ${{ matrix.target }} --workspace
+        run: ${{ env.CARGO }} test --release --locked --target ${{ matrix.target }} --workspace
 
       - name: Set profile.release.strip = true
         shell: bash
@@ -139,11 +149,7 @@ jobs:
           EOF
 
       - name: Build release binary
-        uses: actions-rs/cargo@v1
-        with:
-          use-cross: ${{ matrix.cross }}
-          command: build
-          args: --release --locked --target ${{ matrix.target }}
+        run: ${{ env.CARGO }} build --release --locked --target ${{ matrix.target }}
 
       - name: Build AppImage
         shell: bash

From e6fce860b10faab1cb50b7709a67ded113364392 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 13 Dec 2022 15:08:24 +0900
Subject: [PATCH 640/884] Use latest github runner images

---
 .github/workflows/release.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8c105bfc..9518a537 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -61,17 +61,17 @@ jobs:
         build: [x86_64-linux, x86_64-macos, x86_64-windows] #, x86_64-win-gnu, win32-msvc
         include:
         - build: x86_64-linux
-          os: ubuntu-20.04
+          os: ubuntu-latest
           rust: stable
           target: x86_64-unknown-linux-gnu
           cross: false
         - build: aarch64-linux
-          os: ubuntu-20.04
+          os: ubuntu-latest
           rust: stable
           target: aarch64-unknown-linux-gnu
           cross: true
         - build: riscv64-linux
-          os: ubuntu-20.04
+          os: ubuntu-latest
           rust: stable
           target: riscv64gc-unknown-linux-gnu
           cross: true
@@ -81,7 +81,7 @@ jobs:
           target: x86_64-apple-darwin
           cross: false
         - build: x86_64-windows
-          os: windows-2019
+          os: windows-latest
           rust: stable
           target: x86_64-pc-windows-msvc
           cross: false

From 0f2ae35a1336d5fef823127dc134ed5675e5b9cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Tue, 13 Dec 2022 15:14:40 +0900
Subject: [PATCH 641/884] ci: Merge two jobs

---
 .github/workflows/build.yml | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3a4896f1..0d6fcb3e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -98,13 +98,13 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install stable toolchain
-        uses: helix-editor/rust-toolchain@v1
-        with:
-          profile: minimal
-          override: true
+        uses: dtolnay/rust-toolchain@1.61
 
       - uses: Swatinem/rust-cache@v2
 
+      - name: Validate queries
+        run: cargo xtask query-check
+
       - name: Generate docs
         run: cargo xtask docgen
 
@@ -115,20 +115,3 @@ jobs:
             || (echo "Run 'cargo xtask docgen', commit the changes and push again" \
             && exit 1)
 
-  queries:
-    name: Tree-sitter queries
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-
-      - name: Install stable toolchain
-        uses: helix-editor/rust-toolchain@v1
-        with:
-          profile: minimal
-          override: true
-
-      - uses: Swatinem/rust-cache@v2
-
-      - name: Generate docs
-        run: cargo xtask query-check

From 436296b76c671446aab8863b467155ff9e94d4fc Mon Sep 17 00:00:00 2001
From: Erasin <erasinoo@gmail.com>
Date: Wed, 14 Dec 2022 21:51:00 +0800
Subject: [PATCH 642/884] Add Mermaid.js for markdown support (#5147)

---
 book/src/generated/lang-support.md     |   1 +
 languages.toml                         |  13 ++
 runtime/queries/mermaid/highlights.scm | 187 +++++++++++++++++++++++++
 3 files changed, 201 insertions(+)
 create mode 100644 runtime/queries/mermaid/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 4dca8104..fa7b6edd 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -77,6 +77,7 @@
 | make | ✓ |  |  |  |
 | markdown | ✓ |  |  | `marksman` |
 | markdown.inline | ✓ |  |  |  |
+| mermaid | ✓ |  |  |  |
 | meson | ✓ |  | ✓ |  |
 | mint |  |  |  | `mint` |
 | nickel | ✓ |  | ✓ | `nls` |
diff --git a/languages.toml b/languages.toml
index e6bc344c..e28476d3 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2043,3 +2043,16 @@ grammar = "qmljs"
 [[grammar]]
 name = "qmljs"
 source = { git = "https://github.com/yuja/tree-sitter-qmljs", rev = "0b2b25bcaa7d4925d5f0dda16f6a99c588a437f1" }
+
+[[language]]
+name = "mermaid"
+scope = "source.mermaid"
+injection-regex = "mermaid"
+file-types = ["mermaid"]
+roots = []
+comment-token = "%%"
+indent = { tab-width = 4, unit = "    " }
+
+[[grammar]]
+name = "mermaid"
+source = { git = "https://github.com/monaqa/tree-sitter-mermaid", rev = "d787c66276e7e95899230539f556e8b83ee16f6d" }
diff --git a/runtime/queries/mermaid/highlights.scm b/runtime/queries/mermaid/highlights.scm
new file mode 100644
index 00000000..b546d39f
--- /dev/null
+++ b/runtime/queries/mermaid/highlights.scm
@@ -0,0 +1,187 @@
+[
+ "sequenceDiagram"
+ "classDiagram"
+ "classDiagram-v2"
+ "stateDiagram"
+ "stateDiagram-v2"
+ "gantt"
+ "pie"
+ "flowchart"
+ "erdiagram"
+
+ "participant"
+ "as"
+ "activate"
+ "deactivate"
+ "note "
+ "over"
+ "link"
+ "links"
+ ; "left of"
+ ; "right of"
+ "properties"
+ "details"
+ "title"
+ "loop"
+ "rect"
+ "opt"
+ "alt"
+ "else"
+ "par"
+ "and"
+ "end"
+ (sequence_stmt_autonumber)
+ (note_placement_left)
+ (note_placement_right)
+
+ "class"
+
+ "state "
+
+ "dateformat"
+ "inclusiveenddates"
+ "topaxis"
+ "axisformat"
+ "includes"
+ "excludes"
+ "todaymarker"
+ "title"
+ "section"
+
+ "direction"
+ "subgraph"
+
+ ] @keyword
+
+[
+ (comment)
+ ] @comment
+
+(flow_vertex_id) @type
+(flow_arrow_text) @label
+(flow_text_literal) @string
+ 
+[
+ ":"
+ (sequence_signal_plus_sign)
+ (sequence_signal_minus_sign)
+
+ (class_visibility_public)
+ (class_visibility_private)
+ (class_visibility_protected)
+ (class_visibility_internal)
+
+ (state_division)
+ ] @punctuation.delimiter
+
+[
+ "("
+ ")"
+ "{"
+ "}"
+ ] @punctuation.bracket
+
+[
+ "-->"
+ (solid_arrow)
+ (dotted_arrow)
+ (solid_open_arrow)
+ (dotted_open_arrow)
+ (solid_cross)
+ (dotted_cross)
+ (solid_point)
+ (dotted_point)
+ ] @operator
+
+[
+ (class_reltype_aggregation)
+ (class_reltype_extension)
+ (class_reltype_composition)
+ (class_reltype_dependency)
+ (class_linetype_solid)
+ (class_linetype_dotted)
+ "&"
+ ] @operator
+
+(sequence_actor) @variable
+(sequence_text) @string
+
+(class_name) @type
+(class_label) @string
+(class_method_line) @function.method
+
+(state_name) @variable
+
+(gantt_section) @markup.heading
+(gantt_task_text) @variable.builtin
+(gantt_task_data) @string
+
+[
+ (class_annotation_line)
+ (class_stmt_annotation)
+ (class_generics)
+
+ (state_annotation_fork)
+ (state_annotation_join)
+ (state_annotation_choice)
+ ] @type
+
+(directive) @keyword.directive
+
+(pie_label) @string
+(pie_value) @constant.numeric
+
+[
+(flowchart_direction_lr)
+(flowchart_direction_rl)
+(flowchart_direction_tb)
+(flowchart_direction_bt)
+ ] @constant
+
+(flow_vertex_id) @variable
+
+[
+ (flow_link_arrow)
+ (flow_link_arrow_start)
+ ] @operator
+
+(flow_link_arrowtext "|" @punctuation.bracket)
+
+(flow_vertex_square        [ "[" "]" ]   @punctuation.bracket )
+(flow_vertex_circle        ["((" "))"]   @punctuation.bracket )
+(flow_vertex_ellipse       ["(-" "-)"]   @punctuation.bracket )
+(flow_vertex_stadium       ["([" "])"]   @punctuation.bracket )
+(flow_vertex_subroutine    ["[[" "]]"]   @punctuation.bracket )
+(flow_vertex_rect          ["[|" "|]"]   @punctuation.bracket )
+(flow_vertex_cylinder      ["[(" ")]"]   @punctuation.bracket )
+(flow_vertex_round         ["(" ")"]     @punctuation.bracket )
+(flow_vertex_diamond       ["{" "}"]     @punctuation.bracket )
+(flow_vertex_hexagon       ["{{" "}}"]   @punctuation.bracket )
+(flow_vertex_odd           [">" "]"]     @punctuation.bracket )
+(flow_vertex_trapezoid     ["[/" "\\]"]  @punctuation.bracket )
+(flow_vertex_inv_trapezoid ["[\\" "/]"]  @punctuation.bracket )
+(flow_vertex_leanright     ["[/" "/]"]   @punctuation.bracket )
+(flow_vertex_leanleft      ["[\\" "\\]"] @punctuation.bracket )
+
+(flow_stmt_subgraph ["[" "]"] @punctuation.bracket )
+
+[
+ (er_cardinarity_zero_or_one)
+ (er_cardinarity_zero_or_more)
+ (er_cardinarity_one_or_more)
+ (er_cardinarity_only_one)
+ (er_reltype_non_identifying)
+ (er_reltype_identifying)
+ ] @operator
+
+(er_entity_name) @variable
+
+(er_attribute_type) @type
+(er_attribute_name) @variable
+
+[
+ (er_attribute_key_type_pk)
+ (er_attribute_key_type_fk)
+ ] @keyword
+
+(er_attribute_comment) @string

From 012fc12f97f4e8e0fc38af351388e41e8bc142d8 Mon Sep 17 00:00:00 2001
From: gavincrawford <94875769+gavincrawford@users.noreply.github.com>
Date: Wed, 14 Dec 2022 07:42:11 -0700
Subject: [PATCH 643/884] Add Bash indents (#5149)

---
 book/src/generated/lang-support.md |  2 +-
 runtime/queries/bash/indents.scm   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/bash/indents.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index fa7b6edd..1400fa87 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -2,7 +2,7 @@
 | --- | --- | --- | --- | --- |
 | astro | ✓ |  |  |  |
 | awk | ✓ | ✓ |  | `awk-language-server` |
-| bash | ✓ |  |  | `bash-language-server` |
+| bash | ✓ |  | ✓ | `bash-language-server` |
 | bass | ✓ |  |  | `bass` |
 | beancount | ✓ |  |  |  |
 | bibtex | ✓ |  |  | `texlab` |
diff --git a/runtime/queries/bash/indents.scm b/runtime/queries/bash/indents.scm
new file mode 100644
index 00000000..f2077037
--- /dev/null
+++ b/runtime/queries/bash/indents.scm
@@ -0,0 +1,11 @@
+[
+  (function_definition)
+  (if_statement)
+  (for_statement)
+  (case_statement)
+  (pipeline)
+] @indent
+
+[
+  "}"
+] @outdent

From db939801ebf299f11a6a52bdff7a3c9bfb87fc34 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 15 Dec 2022 02:49:49 -0600
Subject: [PATCH 644/884] Improve error message handling for theme loading
 failures (#5073)

The error messages for a theme that failed to be deserialized (or
otherwise failed to load) were covered up by the context/with_context
calls:

* The log message for a bad theme configured in config.toml would only
  say "Failed to deserilaize theme"
* Selecting a bad theme via :theme would show "Theme does not exist"

With these changes, we let the TOML deserializer errors bubble up, so
the error messages can now say the line number of a duplicated
key - and that key's name - when a theme fails to load because of a
duplicated key.

Providing a theme which does not exist to :theme still gives a helpful
error message: "No such file or directory."
---
 helix-term/src/commands/typed.rs | 2 +-
 helix-view/src/theme.rs          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 2119a48d..cb387fcb 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -777,7 +777,7 @@ fn theme(
                     .editor
                     .theme_loader
                     .load(theme_name)
-                    .with_context(|| "Theme does not exist")?;
+                    .map_err(|err| anyhow::anyhow!("Could not load theme: {}", err))?;
                 if !(true_color || theme.is_16_color()) {
                     bail!("Unsupported theme: theme requires true color support");
                 }
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index f1219ec5..b2c8a79f 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -136,8 +136,9 @@ impl Loader {
     // Loads the theme data as `toml::Value` first from the user_dir then in default_dir
     fn load_toml(&self, path: PathBuf) -> Result<Value> {
         let data = std::fs::read(&path)?;
+        let value = toml::from_slice(data.as_slice())?;
 
-        toml::from_slice(data.as_slice()).context("Failed to deserialize theme")
+        Ok(value)
     }
 
     // Returns the path to the theme with the name

From c64debc7412c0769db8186694bd89f85ea057b1b Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Tue, 19 Jul 2022 21:28:14 +0530
Subject: [PATCH 645/884] Add force_score() for scoring picker items without
 optimizations

---
 helix-term/src/ui/picker.rs | 45 +++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 5e9ca3d8..8b5d20ec 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -469,34 +469,41 @@ impl<T: Item> Picker<T> {
 
             self.matches.sort_unstable();
         } else {
-            let query = FuzzyQuery::new(pattern);
-            self.matches.clear();
-            self.matches.extend(
-                self.options
-                    .iter()
-                    .enumerate()
-                    .filter_map(|(index, option)| {
-                        let text = option.filter_text(&self.editor_data);
-
-                        query
-                            .fuzzy_match(&text, &self.matcher)
-                            .map(|score| PickerMatch {
-                                index,
-                                score,
-                                len: text.chars().count(),
-                            })
-                    }),
-            );
-            self.matches.sort_unstable();
+            self.force_score();
         }
 
         log::debug!("picker score {:?}", Instant::now().duration_since(now));
 
         // reset cursor position
         self.cursor = 0;
+        let pattern = self.prompt.line();
         self.previous_pattern.clone_from(pattern);
     }
 
+    pub fn force_score(&mut self) {
+        let pattern = self.prompt.line();
+
+        let query = FuzzyQuery::new(pattern);
+        self.matches.clear();
+        self.matches.extend(
+            self.options
+                .iter()
+                .enumerate()
+                .filter_map(|(index, option)| {
+                    let text = option.filter_text(&self.editor_data);
+
+                    query
+                        .fuzzy_match(&text, &self.matcher)
+                        .map(|score| PickerMatch {
+                            index,
+                            score,
+                            len: text.chars().count(),
+                        })
+                }),
+        );
+        self.matches.sort_unstable();
+    }
+
     /// Move the cursor by a number of lines, either down (`Forward`) or up (`Backward`)
     pub fn move_by(&mut self, amount: usize, direction: Direction) {
         let len = self.matches.len();

From 914d2944997e11cf76eeabfe43f9031aeb2b1721 Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Tue, 19 Jul 2022 21:49:02 +0530
Subject: [PATCH 646/884] Add DynamicPicker for updating options on every key

---
 helix-term/src/ui/mod.rs     |  2 +-
 helix-term/src/ui/overlay.rs |  4 ++
 helix-term/src/ui/picker.rs  | 74 +++++++++++++++++++++++++++++++++++-
 3 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 107e48dd..5b5924bf 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -19,7 +19,7 @@ pub use completion::Completion;
 pub use editor::EditorView;
 pub use markdown::Markdown;
 pub use menu::Menu;
-pub use picker::{FileLocation, FilePicker, Picker};
+pub use picker::{DynamicPicker, FileLocation, FilePicker, Picker};
 pub use popup::Popup;
 pub use prompt::{Prompt, PromptEvent};
 pub use spinner::{ProgressSpinners, Spinner};
diff --git a/helix-term/src/ui/overlay.rs b/helix-term/src/ui/overlay.rs
index 0b8a93ae..5b2bc806 100644
--- a/helix-term/src/ui/overlay.rs
+++ b/helix-term/src/ui/overlay.rs
@@ -69,4 +69,8 @@ impl<T: Component + 'static> Component for Overlay<T> {
         let dimensions = (self.calc_child_size)(area);
         self.content.cursor(dimensions, ctx)
     }
+
+    fn id(&self) -> Option<&'static str> {
+        self.content.id()
+    }
 }
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 8b5d20ec..821a282c 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -3,6 +3,7 @@ use crate::{
     ctrl, key, shift,
     ui::{self, fuzzy_match::FuzzyQuery, EditorView},
 };
+use futures_util::future::BoxFuture;
 use tui::{
     buffer::Buffer as Surface,
     widgets::{Block, BorderType, Borders},
@@ -22,7 +23,7 @@ use helix_view::{
     Document, DocumentId, Editor,
 };
 
-use super::menu::Item;
+use super::{menu::Item, overlay::Overlay};
 
 pub const MIN_AREA_WIDTH_FOR_PREVIEW: u16 = 72;
 /// Biggest file size to preview in bytes
@@ -751,3 +752,74 @@ impl<T: Item + 'static> Component for Picker<T> {
         self.prompt.cursor(area, editor)
     }
 }
+
+/// Returns a new list of options to replace the contents of the picker
+/// when called with the current picker query,
+pub type DynQueryCallback<T> =
+    Box<dyn Fn(String, &mut Editor) -> BoxFuture<'static, anyhow::Result<Vec<T>>>>;
+
+/// A picker that updates its contents via a callback whenever the
+/// query string changes. Useful for live grep, workspace symbols, etc.
+pub struct DynamicPicker<T: ui::menu::Item + Send> {
+    file_picker: FilePicker<T>,
+    query_callback: DynQueryCallback<T>,
+}
+
+impl<T: ui::menu::Item + Send> DynamicPicker<T> {
+    pub const ID: &'static str = "dynamic-picker";
+
+    pub fn new(file_picker: FilePicker<T>, query_callback: DynQueryCallback<T>) -> Self {
+        Self {
+            file_picker,
+            query_callback,
+        }
+    }
+}
+
+impl<T: Item + Send + 'static> Component for DynamicPicker<T> {
+    fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
+        self.file_picker.render(area, surface, cx);
+    }
+
+    fn handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
+        let prev_query = self.file_picker.picker.prompt.line().to_owned();
+        let event_result = self.file_picker.handle_event(event, cx);
+        let current_query = self.file_picker.picker.prompt.line();
+
+        if *current_query == prev_query || matches!(event_result, EventResult::Ignored(_)) {
+            return event_result;
+        }
+
+        let new_options = (self.query_callback)(current_query.to_owned(), cx.editor);
+
+        cx.jobs.callback(async move {
+            let new_options = new_options.await?;
+            let callback =
+                crate::job::Callback::EditorCompositor(Box::new(move |_editor, compositor| {
+                    // Wrapping of pickers in overlay is done outside the picker code,
+                    // so this is fragile and will break if wrapped in some other widget.
+                    let picker = match compositor.find_id::<Overlay<DynamicPicker<T>>>(Self::ID) {
+                        Some(overlay) => &mut overlay.content.file_picker.picker,
+                        None => return,
+                    };
+                    picker.options = new_options;
+                    picker.cursor = 0;
+                    picker.force_score();
+                }));
+            anyhow::Ok(callback)
+        });
+        EventResult::Consumed(None)
+    }
+
+    fn cursor(&self, area: Rect, ctx: &Editor) -> (Option<Position>, CursorKind) {
+        self.file_picker.cursor(area, ctx)
+    }
+
+    fn required_size(&mut self, viewport: (u16, u16)) -> Option<(u16, u16)> {
+        self.file_picker.required_size(viewport)
+    }
+
+    fn id(&self) -> Option<&'static str> {
+        Some(Self::ID)
+    }
+}

From d1f717eb8d02205ce224292f157bfe1bddd1f6db Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Tue, 19 Jul 2022 22:15:03 +0530
Subject: [PATCH 647/884] Re-request workspace symbols on keypress in picker

Most language servers limit the number of workspace symbols that
are returned with an empty query even though all symbols are
supposed to be returned, according to the spec (for perfomance
reasons). This patch adds a workspace symbol picker based on a
dynamic picker that allows re-requesting the symbols on every
keypress (i.e. when the picker query text changes). The old behavior
has been completely replaced, and I have only tested with
rust-analyzer so far.
---
 helix-term/src/commands/lsp.rs | 50 ++++++++++++++++++++++++++++++----
 1 file changed, 45 insertions(+), 5 deletions(-)

diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 810e3adf..8052dcac 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -1,3 +1,4 @@
+use futures_util::FutureExt;
 use helix_lsp::{
     block_on,
     lsp::{self, CodeAction, CodeActionOrCommand, DiagnosticSeverity, NumberOrString},
@@ -14,7 +15,8 @@ use helix_view::{apply_transaction, document::Mode, editor::Action, theme::Style
 use crate::{
     compositor::{self, Compositor},
     ui::{
-        self, lsp::SignatureHelp, overlay::overlayed, FileLocation, FilePicker, Popup, PromptEvent,
+        self, lsp::SignatureHelp, overlay::overlayed, DynamicPicker, FileLocation, FilePicker,
+        Popup, PromptEvent,
     },
 };
 
@@ -384,10 +386,48 @@ pub fn workspace_symbol_picker(cx: &mut Context) {
     cx.callback(
         future,
         move |_editor, compositor, response: Option<Vec<lsp::SymbolInformation>>| {
-            if let Some(symbols) = response {
-                let picker = sym_picker(symbols, current_url, offset_encoding);
-                compositor.push(Box::new(overlayed(picker)))
-            }
+            let symbols = match response {
+                Some(s) => s,
+                None => return,
+            };
+            let picker = sym_picker(symbols, current_url, offset_encoding);
+            let get_symbols = |query: String, editor: &mut Editor| {
+                let doc = doc!(editor);
+                let language_server = match doc.language_server() {
+                    Some(s) => s,
+                    None => {
+                        // This should not generally happen since the picker will not
+                        // even open in the first place if there is no server.
+                        return async move { Err(anyhow::anyhow!("LSP not active")) }.boxed();
+                    }
+                };
+                let symbol_request = match language_server.workspace_symbols(query) {
+                    Some(future) => future,
+                    None => {
+                        // This should also not happen since the language server must have
+                        // supported workspace symbols before to reach this block.
+                        return async move {
+                            Err(anyhow::anyhow!(
+                                "Language server does not support workspace symbols"
+                            ))
+                        }
+                        .boxed();
+                    }
+                };
+
+                let future = async move {
+                    let json = symbol_request.await?;
+                    let response: Option<Vec<lsp::SymbolInformation>> =
+                        serde_json::from_value(json)?;
+
+                    response.ok_or_else(|| {
+                        anyhow::anyhow!("No response for workspace symbols from language server")
+                    })
+                };
+                future.boxed()
+            };
+            let dyn_picker = DynamicPicker::new(picker, Box::new(get_symbols));
+            compositor.push(Box::new(overlayed(dyn_picker)))
         },
     )
 }

From a7daa02346789e43af51db2b944b0dc516354a29 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 7 Dec 2022 16:27:31 -0600
Subject: [PATCH 648/884] DynamicPicker: Use idle-timeout as debounce

This change uses the idle-timeout event to trigger fetching new results
in the DynamicPicker, so idle-timeout becomes a sort of debounce. This
prevents querying the language server overly aggressively.
---
 helix-term/src/ui/picker.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 821a282c..35597843 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -763,6 +763,7 @@ pub type DynQueryCallback<T> =
 pub struct DynamicPicker<T: ui::menu::Item + Send> {
     file_picker: FilePicker<T>,
     query_callback: DynQueryCallback<T>,
+    query: String,
 }
 
 impl<T: ui::menu::Item + Send> DynamicPicker<T> {
@@ -772,6 +773,7 @@ impl<T: ui::menu::Item + Send> DynamicPicker<T> {
         Self {
             file_picker,
             query_callback,
+            query: String::new(),
         }
     }
 }
@@ -782,14 +784,15 @@ impl<T: Item + Send + 'static> Component for DynamicPicker<T> {
     }
 
     fn handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
-        let prev_query = self.file_picker.picker.prompt.line().to_owned();
         let event_result = self.file_picker.handle_event(event, cx);
         let current_query = self.file_picker.picker.prompt.line();
 
-        if *current_query == prev_query || matches!(event_result, EventResult::Ignored(_)) {
+        if !matches!(event, Event::IdleTimeout) || self.query == *current_query {
             return event_result;
         }
 
+        self.query.clone_from(current_query);
+
         let new_options = (self.query_callback)(current_query.to_owned(), cx.editor);
 
         cx.jobs.callback(async move {

From 35cf972ce459eda6ceffb7a7c256a4bc9f4e6e39 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 7 Dec 2022 16:24:32 -0600
Subject: [PATCH 649/884] DynamicPicker: Reset idle timeout on refresh

If the new results shown by the picker select a file that hasn't been
previewed before, the idle timeout would not trigger highlighting on
that file. With this change, we reset the idle timeout and allow that
file to be highlighted on the next idle timeout event.
---
 helix-term/src/ui/picker.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 35597843..2d471aae 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -798,7 +798,7 @@ impl<T: Item + Send + 'static> Component for DynamicPicker<T> {
         cx.jobs.callback(async move {
             let new_options = new_options.await?;
             let callback =
-                crate::job::Callback::EditorCompositor(Box::new(move |_editor, compositor| {
+                crate::job::Callback::EditorCompositor(Box::new(move |editor, compositor| {
                     // Wrapping of pickers in overlay is done outside the picker code,
                     // so this is fragile and will break if wrapped in some other widget.
                     let picker = match compositor.find_id::<Overlay<DynamicPicker<T>>>(Self::ID) {
@@ -808,6 +808,7 @@ impl<T: Item + Send + 'static> Component for DynamicPicker<T> {
                     picker.options = new_options;
                     picker.cursor = 0;
                     picker.force_score();
+                    editor.reset_idle_timer();
                 }));
             anyhow::Ok(callback)
         });

From 2a60de74f9ccc935fa65031cfe30c62cf07bbbaf Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 8 Dec 2022 19:54:15 -0600
Subject: [PATCH 650/884] workspace symbols: Default to empty Vec on None

A language server might send None as the response to workspace symbols.
We should treat this as the empty Vec rather than the server sending
an error status. This fixes the interaction with gopls which uses
None to mean no matching symbols.
---
 helix-term/src/commands/lsp.rs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 8052dcac..86b0c5fa 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -386,10 +386,7 @@ pub fn workspace_symbol_picker(cx: &mut Context) {
     cx.callback(
         future,
         move |_editor, compositor, response: Option<Vec<lsp::SymbolInformation>>| {
-            let symbols = match response {
-                Some(s) => s,
-                None => return,
-            };
+            let symbols = response.unwrap_or_default();
             let picker = sym_picker(symbols, current_url, offset_encoding);
             let get_symbols = |query: String, editor: &mut Editor| {
                 let doc = doc!(editor);
@@ -420,9 +417,7 @@ pub fn workspace_symbol_picker(cx: &mut Context) {
                     let response: Option<Vec<lsp::SymbolInformation>> =
                         serde_json::from_value(json)?;
 
-                    response.ok_or_else(|| {
-                        anyhow::anyhow!("No response for workspace symbols from language server")
-                    })
+                    Ok(response.unwrap_or_default())
                 };
                 future.boxed()
             };

From 42ad1a9e043e2e0fb148924ff79b9abbe06907ae Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 15 Dec 2022 02:57:31 -0600
Subject: [PATCH 651/884] Select diagnostic range in goto_*_diag commands
 (#4713)

This roughly matches the behavior of the diagnostic picker: when
jumping to a diagnostic with `[d`/`]d`/`[D`/`]D`, the range of the
diagnostic is selected instead of the start point.
---
 helix-term/src/commands.rs | 50 +++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 1310417e..0f04ecba 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2789,35 +2789,28 @@ fn exit_select_mode(cx: &mut Context) {
     }
 }
 
-fn goto_pos(editor: &mut Editor, pos: usize) {
-    let (view, doc) = current!(editor);
-
-    push_jump(view, doc);
-    doc.set_selection(view.id, Selection::point(pos));
-    align_view(doc, view, Align::Center);
-}
-
 fn goto_first_diag(cx: &mut Context) {
-    let doc = doc!(cx.editor);
-    let pos = match doc.diagnostics().first() {
-        Some(diag) => diag.range.start,
+    let (view, doc) = current!(cx.editor);
+    let selection = match doc.diagnostics().first() {
+        Some(diag) => Selection::single(diag.range.start, diag.range.end),
         None => return,
     };
-    goto_pos(cx.editor, pos);
+    doc.set_selection(view.id, selection);
+    align_view(doc, view, Align::Center);
 }
 
 fn goto_last_diag(cx: &mut Context) {
-    let doc = doc!(cx.editor);
-    let pos = match doc.diagnostics().last() {
-        Some(diag) => diag.range.start,
+    let (view, doc) = current!(cx.editor);
+    let selection = match doc.diagnostics().last() {
+        Some(diag) => Selection::single(diag.range.start, diag.range.end),
         None => return,
     };
-    goto_pos(cx.editor, pos);
+    doc.set_selection(view.id, selection);
+    align_view(doc, view, Align::Center);
 }
 
 fn goto_next_diag(cx: &mut Context) {
-    let editor = &mut cx.editor;
-    let (view, doc) = current!(editor);
+    let (view, doc) = current!(cx.editor);
 
     let cursor_pos = doc
         .selection(view.id)
@@ -2830,17 +2823,16 @@ fn goto_next_diag(cx: &mut Context) {
         .find(|diag| diag.range.start > cursor_pos)
         .or_else(|| doc.diagnostics().first());
 
-    let pos = match diag {
-        Some(diag) => diag.range.start,
+    let selection = match diag {
+        Some(diag) => Selection::single(diag.range.start, diag.range.end),
         None => return,
     };
-
-    goto_pos(editor, pos);
+    doc.set_selection(view.id, selection);
+    align_view(doc, view, Align::Center);
 }
 
 fn goto_prev_diag(cx: &mut Context) {
-    let editor = &mut cx.editor;
-    let (view, doc) = current!(editor);
+    let (view, doc) = current!(cx.editor);
 
     let cursor_pos = doc
         .selection(view.id)
@@ -2854,12 +2846,14 @@ fn goto_prev_diag(cx: &mut Context) {
         .find(|diag| diag.range.start < cursor_pos)
         .or_else(|| doc.diagnostics().last());
 
-    let pos = match diag {
-        Some(diag) => diag.range.start,
+    let selection = match diag {
+        // NOTE: the selection is reversed because we're jumping to the
+        // previous diagnostic.
+        Some(diag) => Selection::single(diag.range.end, diag.range.start),
         None => return,
     };
-
-    goto_pos(editor, pos);
+    doc.set_selection(view.id, selection);
+    align_view(doc, view, Align::Center);
 }
 
 fn goto_first_change(cx: &mut Context) {

From f916915b53fa6fedd3f9106bcf58163083cc052e Mon Sep 17 00:00:00 2001
From: Roberto Vidal <vidal.roberto.j@gmail.com>
Date: Thu, 15 Dec 2022 09:59:34 +0100
Subject: [PATCH 652/884] add redraw command (#4354)

* add redraw command

* update docs

* Update helix-term/src/commands/typed.rs

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* update docs

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/generated/typable-cmd.md |  1 +
 helix-term/src/commands/typed.rs  | 29 +++++++++++++++++++++++++++++
 helix-term/src/compositor.rs      |  4 ++++
 3 files changed, 34 insertions(+)

diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index 66e6ac03..269d63e3 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -73,3 +73,4 @@
 | `:pipe` | Pipe each selection to the shell command. |
 | `:pipe-to` | Pipe each selection to the shell command, ignoring output. |
 | `:run-shell-command`, `:sh` | Run a shell command |
+| `:redraw` | Clear and re-render the whole UI |
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index cb387fcb..90dde7e1 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1808,6 +1808,28 @@ fn run_shell_command(
     Ok(())
 }
 
+fn redraw(
+    cx: &mut compositor::Context,
+    _args: &[Cow<str>],
+    event: PromptEvent,
+) -> anyhow::Result<()> {
+    if event != PromptEvent::Validate {
+        return Ok(());
+    }
+
+    let callback = Box::pin(async move {
+        let call: job::Callback = Box::new(|_editor, compositor| {
+            compositor.clear().expect("unable to redraw");
+        });
+
+        Ok(call)
+    });
+
+    cx.jobs.callback(callback);
+
+    Ok(())
+}
+
 pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
         TypableCommand {
             name: "quit",
@@ -2323,6 +2345,13 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
             fun: run_shell_command,
             completer: Some(completers::directory),
         },
+        TypableCommand {
+            name: "redraw",
+            aliases: &[],
+            doc: "Clear and re-render the whole UI",
+            fun: redraw,
+            completer: None,
+        },
     ];
 
 pub static TYPABLE_COMMAND_MAP: Lazy<HashMap<&'static str, &'static TypableCommand>> =
diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs
index 9dad3620..18620b7b 100644
--- a/helix-term/src/compositor.rs
+++ b/helix-term/src/compositor.rs
@@ -197,6 +197,10 @@ impl Compositor {
             .find(|component| component.id() == Some(id))
             .and_then(|component| component.as_any_mut().downcast_mut())
     }
+
+    pub fn clear(&mut self) -> std::io::Result<()> {
+        self.terminal.clear()
+    }
 }
 
 // View casting, taken straight from Cursive

From 5c4a9cba9a14ca10437e979c884d2ccba78ef1e7 Mon Sep 17 00:00:00 2001
From: Sebastian Zivota <loewenheim@users.noreply.github.com>
Date: Thu, 15 Dec 2022 14:20:26 +0100
Subject: [PATCH 653/884] Restore deleted goto_pos function (#5164)

---
 helix-term/src/commands.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 0f04ecba..6cf49464 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2789,6 +2789,14 @@ fn exit_select_mode(cx: &mut Context) {
     }
 }
 
+fn goto_pos(editor: &mut Editor, pos: usize) {
+    let (view, doc) = current!(editor);
+
+    push_jump(view, doc);
+    doc.set_selection(view.id, Selection::point(pos));
+    align_view(doc, view, Align::Center);
+}
+
 fn goto_first_diag(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
     let selection = match doc.diagnostics().first() {

From ec9aa6690244bccefac24037c9f7a659816bffdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Thu, 15 Dec 2022 22:23:06 +0900
Subject: [PATCH 654/884] Remove redraw to fix build

---
 book/src/generated/typable-cmd.md |  1 -
 helix-term/src/commands/typed.rs  | 29 -----------------------------
 helix-term/src/compositor.rs      |  4 ----
 3 files changed, 34 deletions(-)

diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index 269d63e3..66e6ac03 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -73,4 +73,3 @@
 | `:pipe` | Pipe each selection to the shell command. |
 | `:pipe-to` | Pipe each selection to the shell command, ignoring output. |
 | `:run-shell-command`, `:sh` | Run a shell command |
-| `:redraw` | Clear and re-render the whole UI |
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 90dde7e1..cb387fcb 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1808,28 +1808,6 @@ fn run_shell_command(
     Ok(())
 }
 
-fn redraw(
-    cx: &mut compositor::Context,
-    _args: &[Cow<str>],
-    event: PromptEvent,
-) -> anyhow::Result<()> {
-    if event != PromptEvent::Validate {
-        return Ok(());
-    }
-
-    let callback = Box::pin(async move {
-        let call: job::Callback = Box::new(|_editor, compositor| {
-            compositor.clear().expect("unable to redraw");
-        });
-
-        Ok(call)
-    });
-
-    cx.jobs.callback(callback);
-
-    Ok(())
-}
-
 pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
         TypableCommand {
             name: "quit",
@@ -2345,13 +2323,6 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
             fun: run_shell_command,
             completer: Some(completers::directory),
         },
-        TypableCommand {
-            name: "redraw",
-            aliases: &[],
-            doc: "Clear and re-render the whole UI",
-            fun: redraw,
-            completer: None,
-        },
     ];
 
 pub static TYPABLE_COMMAND_MAP: Lazy<HashMap<&'static str, &'static TypableCommand>> =
diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs
index 18620b7b..9dad3620 100644
--- a/helix-term/src/compositor.rs
+++ b/helix-term/src/compositor.rs
@@ -197,10 +197,6 @@ impl Compositor {
             .find(|component| component.id() == Some(id))
             .and_then(|component| component.as_any_mut().downcast_mut())
     }
-
-    pub fn clear(&mut self) -> std::io::Result<()> {
-        self.terminal.clear()
-    }
 }
 
 // View casting, taken straight from Cursive

From 3e6887648c386372839e29028a3459d4674ce68b Mon Sep 17 00:00:00 2001
From: alice <alice@ayaya.dev>
Date: Fri, 16 Dec 2022 15:43:58 +0100
Subject: [PATCH 655/884] set 'c++' as a recognised extension for cpp (#5183)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index e28476d3..d03726e7 100644
--- a/languages.toml
+++ b/languages.toml
@@ -190,7 +190,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-c", rev = "7175a6dd
 name = "cpp"
 scope = "source.cpp"
 injection-regex = "cpp"
-file-types = ["cc", "hh", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino"]
+file-types = ["cc", "hh", "c++", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino"]
 roots = []
 comment-token = "//"
 language-server = { command = "clangd" }

From 9c9c775a27f23b2fa5c8c856af0b15671916efd6 Mon Sep 17 00:00:00 2001
From: Ifiok Jr <ifiokotung@gmail.com>
Date: Sat, 17 Dec 2022 15:09:14 +0000
Subject: [PATCH 656/884] Fix a typo in the docs (#5191)

---
 book/src/keymap.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 139e8fdd..15329400 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -317,7 +317,7 @@ Mappings in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaire
 | `]c`     | Go to next comment (**TS**)                  | `goto_next_comment`   |
 | `[c`     | Go to previous comment (**TS**)              | `goto_prev_comment`   |
 | `]T`     | Go to next test (**TS**)                     | `goto_next_test`      |
-| `]T`     | Go to previous test (**TS**)                 | `goto_prev_test`      |
+| `[T`     | Go to previous test (**TS**)                 | `goto_prev_test`      |
 | `]p`     | Go to next paragraph                         | `goto_next_paragraph` |
 | `[p`     | Go to previous paragraph                     | `goto_prev_paragraph` |
 | `]g`     | Go to next change                            | `goto_next_change`    |

From b12c65678aacc577b070c70307ef6fce528e4d85 Mon Sep 17 00:00:00 2001
From: Eric Thorburn <60004386+hyderix@users.noreply.github.com>
Date: Sat, 17 Dec 2022 20:03:18 +0100
Subject: [PATCH 657/884] Print the binary required by the debug adapter
 (#5195)

This commit addresses issue 5193, where the author
requested that the name of the binary needed is printed along
with the rest of the health information.

This commit adds a format! macro which formats in the name of the
binary and then it will be printed along with the rest of the
debug information. The value in cmd is referenced to the call
to which, and then consumed upon the call to format!
---
 helix-term/src/health.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/health.rs b/helix-term/src/health.rs
index e8fbb84d..6558fe19 100644
--- a/helix-term/src/health.rs
+++ b/helix-term/src/health.rs
@@ -281,9 +281,9 @@ fn probe_protocol(protocol_name: &str, server_cmd: Option<String>) -> std::io::R
     writeln!(stdout, "Configured {}: {}", protocol_name, cmd_name)?;
 
     if let Some(cmd) = server_cmd {
-        let path = match which::which(cmd) {
+        let path = match which::which(&cmd) {
             Ok(path) => path.display().to_string().green(),
-            Err(_) => "Not found in $PATH".to_string().red(),
+            Err(_) => format!("'{}' not found in $PATH", cmd).red(),
         };
         writeln!(stdout, "Binary for {}: {}", protocol_name, path)?;
     }

From e6a2df8c798537a7dc5aff264eeccc773525aa6c Mon Sep 17 00:00:00 2001
From: Alex Kladov <aleksey.kladov@gmail.com>
Date: Sat, 17 Dec 2022 19:30:43 +0000
Subject: [PATCH 658/884] Better sorting in picker in case of ties (#5169)

---
 helix-term/src/ui/mod.rs    |  3 ++-
 helix-term/src/ui/picker.rs | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 5b5924bf..ade1d8cf 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -207,13 +207,14 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
 
     // Cap the number of files if we aren't in a git project, preventing
     // hangs when using the picker in your home directory
-    let files: Vec<_> = if root.join(".git").exists() {
+    let mut files: Vec<PathBuf> = if root.join(".git").exists() {
         files.collect()
     } else {
         // const MAX: usize = 8192;
         const MAX: usize = 100_000;
         files.take(MAX).collect()
     };
+    files.sort();
 
     log::debug!("file_picker init {:?}", Instant::now().duration_since(now));
 
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 2d471aae..aad3f81c 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -12,7 +12,10 @@ use tui::{
 use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
 use tui::widgets::Widget;
 
-use std::{cmp::Ordering, time::Instant};
+use std::{
+    cmp::{self, Ordering},
+    time::Instant,
+};
 use std::{collections::HashMap, io::Read, path::PathBuf};
 
 use crate::ui::{Prompt, PromptEvent};
@@ -344,11 +347,17 @@ impl<T: Item + 'static> Component for FilePicker<T> {
 
 #[derive(PartialEq, Eq, Debug)]
 struct PickerMatch {
-    index: usize,
     score: i64,
+    index: usize,
     len: usize,
 }
 
+impl PickerMatch {
+    fn key(&self) -> impl Ord {
+        (cmp::Reverse(self.score), self.len, self.index)
+    }
+}
+
 impl PartialOrd for PickerMatch {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
         Some(self.cmp(other))
@@ -357,10 +366,7 @@ impl PartialOrd for PickerMatch {
 
 impl Ord for PickerMatch {
     fn cmp(&self, other: &Self) -> Ordering {
-        self.score
-            .cmp(&other.score)
-            .reverse()
-            .then_with(|| self.len.cmp(&other.len))
+        self.key().cmp(&other.key())
     }
 }
 
@@ -502,6 +508,7 @@ impl<T: Item> Picker<T> {
                         })
                 }),
         );
+
         self.matches.sort_unstable();
     }
 

From aecb524e503363c2eed2a5a72d8fd881aae18e4b Mon Sep 17 00:00:00 2001
From: Jonas Everaert <62475953+Jomy10@users.noreply.github.com>
Date: Sat, 17 Dec 2022 20:34:00 +0100
Subject: [PATCH 659/884] Crystal language support (#4993)

---
 book/src/generated/lang-support.md     |  1 +
 languages.toml                         | 12 +++++
 runtime/queries/crystal/highlights.scm | 66 ++++++++++++++++++++++++++
 3 files changed, 79 insertions(+)
 create mode 100644 runtime/queries/crystal/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 1400fa87..73e0bfcd 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -16,6 +16,7 @@
 | common-lisp | ✓ |  |  | `cl-lsp` |
 | cpon | ✓ |  | ✓ |  |
 | cpp | ✓ | ✓ | ✓ | `clangd` |
+| crystal | ✓ |  |  |  |
 | css | ✓ |  |  | `vscode-css-language-server` |
 | cue | ✓ |  |  | `cuelsp` |
 | d | ✓ | ✓ | ✓ | `serve-d` |
diff --git a/languages.toml b/languages.toml
index d03726e7..42495e5c 100644
--- a/languages.toml
+++ b/languages.toml
@@ -223,6 +223,18 @@ args = { console = "internalConsole", attachCommands = [ "platform select remote
 name = "cpp"
 source = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "d5e90fba898f320db48d81ddedd78d52c67c1fed" }
 
+[[language]]
+name = "crystal"
+scope = "source.cr"
+file-types = ["cr"]
+roots = ["shard.yml", "shard.lock"]
+comment-token = "#"
+indent = { tab-width = 2, unit = "  " }
+
+[[grammar]]
+name = "crystal"
+source = { git = "https://github.com/will/tree-sitter-crystal", rev = "15597b307b18028b04d288561f9c29794621562b" }
+
 [[language]]
 name = "c-sharp"
 scope = "source.csharp"
diff --git a/runtime/queries/crystal/highlights.scm b/runtime/queries/crystal/highlights.scm
new file mode 100644
index 00000000..33a53e7f
--- /dev/null
+++ b/runtime/queries/crystal/highlights.scm
@@ -0,0 +1,66 @@
+[
+  "class"
+  "struct"
+  "module"
+
+  "def"
+  "alias"
+  "do"
+  "end"
+
+  "require"
+  "include"
+  "extend"
+] @keyword
+
+[
+  "[" "]"
+  "(" ")"
+  "{" "}"
+] @punctuation.bracket
+
+(operator) @operator
+
+(comment) @comment
+
+; literals
+
+(nil) @constant.builtin
+(bool) @constant.builtin.boolean
+
+(integer) @constant.numeric.integer
+(float) @constant.numeric.float
+
+[
+  (string)
+  (char)
+  (commandLiteral)
+] @string
+
+(symbol) @string.special.symbol
+
+(regex) @string.special.regex
+
+; variables
+
+(local_variable) @variable
+
+[
+  (instance_variable)
+  (class_variable)
+] @variable.other.member
+
+(constant) @constant
+
+; type defintitions
+
+(type_identifier) @constructor
+
+; method definition/call
+(identifier) @function.method
+
+; types
+(generic_type) @type
+(union_type) @type
+(type_identifier) @type
+

From 042d03269ecbe68e0461548bcf6918324c967bbb Mon Sep 17 00:00:00 2001
From: g-s-k <george@georgekaplan.xyz>
Date: Sat, 17 Dec 2022 20:44:08 +0100
Subject: [PATCH 660/884] Add support for MATLAB/Octave files (#5192)

---
 book/src/generated/lang-support.md    |  1 +
 languages.toml                        | 13 ++++
 runtime/queries/matlab/highlights.scm | 97 +++++++++++++++++++++++++++
 3 files changed, 111 insertions(+)
 create mode 100644 runtime/queries/matlab/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 73e0bfcd..1a3aed79 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -78,6 +78,7 @@
 | make | ✓ |  |  |  |
 | markdown | ✓ |  |  | `marksman` |
 | markdown.inline | ✓ |  |  |  |
+| matlab | ✓ |  |  |  |
 | mermaid | ✓ |  |  |  |
 | meson | ✓ |  | ✓ |  |
 | mint |  |  |  | `mint` |
diff --git a/languages.toml b/languages.toml
index 42495e5c..8972a6e9 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2068,3 +2068,16 @@ indent = { tab-width = 4, unit = "    " }
 [[grammar]]
 name = "mermaid"
 source = { git = "https://github.com/monaqa/tree-sitter-mermaid", rev = "d787c66276e7e95899230539f556e8b83ee16f6d" }
+
+[[language]]
+name = "matlab"
+scope = "source.m"
+file-types = ["m"]
+comment-token = "%"
+shebangs = ["octave-cli", "matlab"]
+roots = []
+indent = { tab-width = 2, unit = "  " }
+
+[[grammar]]
+name = "matlab"
+source = { git = "https://github.com/mstanciu552/tree-sitter-matlab", rev = "2d5d3d5193718a86477d4335aba5b34e79147326" }
diff --git a/runtime/queries/matlab/highlights.scm b/runtime/queries/matlab/highlights.scm
new file mode 100644
index 00000000..c0e23e91
--- /dev/null
+++ b/runtime/queries/matlab/highlights.scm
@@ -0,0 +1,97 @@
+  ; highlights.scm
+
+function_keyword: (function_keyword) @keyword.function
+
+(function_definition
+function_name: (identifier) @function
+(end) @function)
+
+(parameter_list (identifier) @variable.parameter)
+
+[
+    "if"
+    "elseif"
+    "else"
+    "switch"
+    "case"
+    "otherwise"
+] @keyword.control.conditional
+
+(if_statement (end) @keyword.control.conditional)
+(switch_statement (end) @keyword.control.conditional)
+
+["for" "while"] @keyword.control.repeat
+(for_statement (end) @keyword.control.repeat)
+(while_statement (end) @keyword.control.repeat)
+
+["try" "catch"] @keyword.control.exception
+(try_statement (end) @keyword.control.exception)
+
+(function_definition end: (end) @keyword)
+
+["return" "break" "continue"] @keyword.return
+
+(
+(identifier) @constant.builtin
+(#any-of? @constant.builtin "true" "false")
+)
+
+(
+    (identifier) @constant.builtin
+    (#eq? @constant.builtin "end")
+)
+
+;; Punctuations
+
+[";" ","] @punctuation.special
+(argument_list "," @punctuation.delimiter)
+(vector_definition ["," ";"] @punctuation.delimiter)
+(cell_definition ["," ";"] @punctuation.delimiter)
+":" @punctuation.delimiter
+(parameter_list "," @punctuation.delimiter)
+(return_value "," @punctuation.delimiter)
+
+; ;; Brackets
+
+[
+ "("
+ ")"
+ "["
+ "]"
+ "{"
+ "}"
+] @punctuation.bracket
+
+;; Operators
+"=" @operator
+(operation [ ">"
+            "<"
+            "=="
+            "<="
+            ">="
+            "=<"
+            "=>"
+            "~="
+            "*"
+            ".*"
+            "/"
+            "\\"
+            "./"
+            "^"
+            ".^"
+            "+"] @operator)
+
+;; boolean operator
+[
+    "&&"
+    "||"
+] @operator
+
+;; Number
+(number) @constant.numeric
+
+;; String
+(string) @string
+
+;; Comment
+(comment) @comment

From 24cd7f6adf7a46b8386583b17f01839eb592a2eb Mon Sep 17 00:00:00 2001
From: Jonathan LEI <me@xjonathan.dev>
Date: Sat, 10 Dec 2022 09:56:12 +0000
Subject: [PATCH 661/884] Make prompt suggestions greyed out

---
 book/src/themes.md          |  1 +
 helix-term/src/ui/prompt.rs | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/book/src/themes.md b/book/src/themes.md
index 322caea5..0f94828e 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -268,6 +268,7 @@ These scopes are used for theming the editor interface.
 | `ui.help`                   | Description box for commands                                                                   |
 | `ui.text`                   | Command prompts, popup text, etc.                                                              |
 | `ui.text.focus`             |                                                                                                |
+| `ui.text.inactive`          | Same as `ui.text` but when the text is inactive (e.g. suggestions)                             |
 | `ui.text.info`              | The key: command text in `ui.popup.info` boxes                                                 |
 | `ui.virtual.ruler`          | Ruler columns (see the [`editor.rulers` config][editor-section])                               |
 | `ui.virtual.whitespace`     | Visible whitespace characters                                                                 |
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index b19b9a9f..5fb6745a 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -352,6 +352,7 @@ impl Prompt {
         let prompt_color = theme.get("ui.text");
         let completion_color = theme.get("ui.menu");
         let selected_color = theme.get("ui.menu.selected");
+        let suggestion_color = theme.get("ui.text.inactive");
         // completion
 
         let max_len = self
@@ -450,21 +451,29 @@ impl Prompt {
         // render buffer text
         surface.set_string(area.x, area.y + line, &self.prompt, prompt_color);
 
-        let input: Cow<str> = if self.line.is_empty() {
+        let (input, is_suggestion): (Cow<str>, bool) = if self.line.is_empty() {
             // latest value in the register list
-            self.history_register
+            match self
+                .history_register
                 .and_then(|reg| cx.editor.registers.last(reg))
                 .map(|entry| entry.into())
-                .unwrap_or_else(|| Cow::from(""))
+            {
+                Some(value) => (value, true),
+                None => (Cow::from(""), false),
+            }
         } else {
-            self.line.as_str().into()
+            (self.line.as_str().into(), false)
         };
 
         surface.set_string(
             area.x + self.prompt.len() as u16,
             area.y + line,
             &input,
-            prompt_color,
+            if is_suggestion {
+                suggestion_color
+            } else {
+                prompt_color
+            },
         );
     }
 }

From ba3c24aa0268735ac57321442d458ab6a1ac662c Mon Sep 17 00:00:00 2001
From: Jonathan LEI <me@xjonathan.dev>
Date: Sat, 10 Dec 2022 09:56:37 +0000
Subject: [PATCH 662/884] Set ui.text.inactive for official themes

---
 base16_theme.toml | 1 +
 theme.toml        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/base16_theme.toml b/base16_theme.toml
index 63fc2f79..268a38df 100644
--- a/base16_theme.toml
+++ b/base16_theme.toml
@@ -7,6 +7,7 @@
 "ui.linenr.selected" = { fg = "white", bg = "black", modifiers = ["bold"] }
 "ui.selection" = { fg = "black", bg = "blue" }
 "ui.selection.primary" = { fg = "white", bg = "blue" }
+"ui.text.inactive" = { fg = "gray" }
 "comment" = { fg = "gray" }
 "ui.statusline" = { fg = "black", bg = "white" }
 "ui.statusline.inactive" = { fg = "gray", bg = "white" }
diff --git a/theme.toml b/theme.toml
index 05409319..c7b5dc84 100644
--- a/theme.toml
+++ b/theme.toml
@@ -54,6 +54,7 @@ label = "honey"
 
 "ui.text" = { fg = "lavender" }
 "ui.text.focus" = { fg = "white" }
+"ui.text.inactive" = "sirocco"
 "ui.virtual" = { fg = "comet" }
 
 "ui.virtual.indent-guide" = { fg = "comet" }

From 99b346a9238b9e7c5b9b93abdf787213c4d67f92 Mon Sep 17 00:00:00 2001
From: Lukas Werling <lukas@lwrl.de>
Date: Mon, 19 Dec 2022 18:00:47 +0100
Subject: [PATCH 663/884] tutor: Fix typos in 8.2 (#5213)

---
 runtime/tutor | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/runtime/tutor b/runtime/tutor
index 418c4195..885ea0bf 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -848,13 +848,13 @@ lines.
     Ensure your cursor is on the '>' of the arrow.
  2. Type Q to start recording.
  3. Edit the line to look like the bottom one.
- 4. Exit insert and Type Q again to stop recording.
+ 4. Exit insert and type Q again to stop recording.
  5. Move to the line below and put your cursor on '>' again.
  6. Type q to repeat the macro.
 
- --> ... sentence doesn't have it's first and last ... .
- --> ... sentence doesn't have it's first and last ... .
-     This sentence doesn't have it's first and last word.
+ --> ... sentence doesn't have its first and last ... .
+ --> ... sentence doesn't have its first and last ... .
+     This sentence doesn't have its first and last word.
 
 =================================================================
 =                        CHAPTER 8 RECAP                        =

From 45c58961424cca35bcab692b49949d45d917ef7e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Dec 2022 17:16:26 -0600
Subject: [PATCH 664/884] build(deps): bump anyhow from 1.0.66 to 1.0.68
 (#5222)

Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.66 to 1.0.68.
- [Release notes](https://github.com/dtolnay/anyhow/releases)
- [Commits](https://github.com/dtolnay/anyhow/compare/1.0.66...1.0.68)

---
updated-dependencies:
- dependency-name: anyhow
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6ae0a71f..52ed478f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -51,9 +51,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.66"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
+checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
 
 [[package]]
 name = "arc-swap"

From bcb78c9382af059ccd89dd3c53a1846f2fff1d6c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Dec 2022 17:21:30 -0600
Subject: [PATCH 665/884] build(deps): bump toml from 0.5.9 to 0.5.10 (#5224)

Bumps [toml](https://github.com/toml-rs/toml) from 0.5.9 to 0.5.10.
- [Release notes](https://github.com/toml-rs/toml/releases)
- [Commits](https://github.com/toml-rs/toml/commits/toml-v0.5.10)

---
updated-dependencies:
- dependency-name: toml
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 52ed478f..3f4b081c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2142,9 +2142,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.9"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
 dependencies = [
  "serde",
 ]

From 453c7b46993c7ecf2eb8c0549b93085907c6d6c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Dec 2022 17:21:51 -0600
Subject: [PATCH 666/884] build(deps): bump thiserror from 1.0.37 to 1.0.38
 (#5223)

Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.37 to 1.0.38.
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.37...1.0.38)

---
updated-dependencies:
- dependency-name: thiserror
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3f4b081c..7e98a0f7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2018,18 +2018,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
  "proc-macro2",
  "quote",

From 38fd20c858d166ce9e5b421722b18dc9f7d8810f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Dec 2022 17:22:27 -0600
Subject: [PATCH 667/884] build(deps): bump indoc from 1.0.7 to 1.0.8 (#5226)

Bumps [indoc](https://github.com/dtolnay/indoc) from 1.0.7 to 1.0.8.
- [Release notes](https://github.com/dtolnay/indoc/releases)
- [Commits](https://github.com/dtolnay/indoc/compare/1.0.7...1.0.8)

---
updated-dependencies:
- dependency-name: indoc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 4 ++--
 helix-term/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7e98a0f7..1b4572bb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1386,9 +1386,9 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adab1eaa3408fb7f0c777a73e7465fd5656136fc93b670eb6df3c88c2c1344e3"
+checksum = "da2d6f23ffea9d7e76c53eee25dfb67bcd8fde7f1198b0855350698c9f07c780"
 
 [[package]]
 name = "instant"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 30bfc7ea..9f2e5188 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -78,5 +78,5 @@ helix-loader = { version = "0.6", path = "../helix-loader" }
 
 [dev-dependencies]
 smallvec = "1.10"
-indoc = "1.0.6"
+indoc = "1.0.8"
 tempfile = "3.3.0"

From f7a9717088fd00f875f03ff89e7229e64eb7f5fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Dec 2022 17:24:26 -0600
Subject: [PATCH 668/884] build(deps): bump serde_json from 1.0.89 to 1.0.91
 (#5225)

Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.89 to 1.0.91.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.89...v1.0.91)

---
updated-dependencies:
- dependency-name: serde_json
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1b4572bb..e00e1f63 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1825,9 +1825,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.89"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
+checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
 dependencies = [
  "itoa",
  "ryu",

From 03baec8a2d83de59d7e8ada655022e4f81d1fa68 Mon Sep 17 00:00:00 2001
From: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
Date: Tue, 20 Dec 2022 02:36:56 +0300
Subject: [PATCH 669/884] build(nix): update inputs (#5219)

---
 flake.lock | 70 ++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 55 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index f097519e..4cf1018c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "crane": {
       "flake": false,
       "locked": {
-        "lastModified": 1661875961,
-        "narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=",
+        "lastModified": 1670900067,
+        "narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24",
+        "rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b",
         "type": "github"
       },
       "original": {
@@ -45,6 +45,7 @@
           "nci",
           "devshell"
         ],
+        "flake-parts": "flake-parts",
         "flake-utils-pre-commit": [
           "nci"
         ],
@@ -57,6 +58,9 @@
         "mach-nix": [
           "nci"
         ],
+        "nix-pypi-fetcher": [
+          "nci"
+        ],
         "nixpkgs": [
           "nci",
           "nixpkgs"
@@ -69,11 +73,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1668851003,
-        "narHash": "sha256-X7RCQQynbxStZR2m7HW38r/msMQwVl3afD6UXOCtvx4=",
+        "lastModified": 1671323629,
+        "narHash": "sha256-9KHTPjIDjfnzZ4NjpE3gGIVHVHopy6weRDYO/7Y3hF8=",
         "owner": "nix-community",
         "repo": "dream2nix",
-        "rev": "c77e8379d8fe01213ba072e40946cbfb7b58e628",
+        "rev": "2d7d68505c8619410df2c6b6463985f97cbcba6e",
         "type": "github"
       },
       "original": {
@@ -82,6 +86,24 @@
         "type": "github"
       }
     },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1668450977,
+        "narHash": "sha256-cfLhMhnvXn6x1vPm+Jow3RiFAUSCw/l1utktCw5rVA4=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "d591857e9d7dd9ddbfba0ea02b43b927c3c0f1fa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "locked": {
         "lastModified": 1659877975,
@@ -109,11 +131,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1669011203,
-        "narHash": "sha256-Lymj4HktNEFmVXtwI0Os7srDXHZbZW0Nzw3/+5Hf8ko=",
+        "lastModified": 1671430291,
+        "narHash": "sha256-UIc7H8F3N8rK72J/Vj5YJdV72tvDvYjH+UPsOFvlcsE=",
         "owner": "yusdacra",
         "repo": "nix-cargo-integration",
-        "rev": "c5133b91fc1d549087c91228bd213f2518728a4b",
+        "rev": "b1b0d38b8c3b0d0e6a38638d5bbe10b0bc67522c",
         "type": "github"
       },
       "original": {
@@ -124,11 +146,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1668905981,
-        "narHash": "sha256-RBQa/+9Uk1eFTqIOXBSBezlEbA3v5OkgP+qptQs1OxY=",
+        "lastModified": 1671359686,
+        "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "690ffff026b4e635b46f69002c0f4e81c65dfc2e",
+        "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4",
         "type": "github"
       },
       "original": {
@@ -138,6 +160,24 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "dir": "lib",
+        "lastModified": 1665349835,
+        "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1",
+        "type": "github"
+      },
+      "original": {
+        "dir": "lib",
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "nci": "nci",
@@ -153,11 +193,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1668998422,
-        "narHash": "sha256-G/BklIplCHZEeDIabaaxqgITdIXtMolRGlwxn9jG2/Q=",
+        "lastModified": 1671416426,
+        "narHash": "sha256-kpSH1Jrxfk2qd0pRPJn1eQdIOseGv5JuE+YaOrqU9s4=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "68ab029c93f8f8eed4cf3ce9a89a9fd4504b2d6e",
+        "rev": "fbaaff24f375ac25ec64268b0a0d63f91e474b7d",
         "type": "github"
       },
       "original": {

From a7146f58f00b7d15f584c630ca6e123793a0a051 Mon Sep 17 00:00:00 2001
From: farwyler <1705805+farwyler@users.noreply.github.com>
Date: Tue, 20 Dec 2022 00:40:08 +0100
Subject: [PATCH 670/884] Add missing comment injection for nix (#5208)

---
 runtime/queries/nix/injections.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtime/queries/nix/injections.scm b/runtime/queries/nix/injections.scm
index 82d79cc7..a1a0ebb8 100644
--- a/runtime/queries/nix/injections.scm
+++ b/runtime/queries/nix/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
+
 ; mark arbitary languages with a comment
 ((((comment) @injection.language) .
   (indented_string_expression (string_fragment) @injection.content))

From bdeefbfb23077fcbbfe1e7df6c6ac88516244bbc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Dec 2022 17:49:23 -0600
Subject: [PATCH 671/884] build(deps): bump serde from 1.0.150 to 1.0.151
 (#5221)

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.150 to 1.0.151.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.150...v1.0.151)

---
updated-dependencies:
- dependency-name: serde
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e00e1f63..a6ca9495 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1805,18 +1805,18 @@ checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
 
 [[package]]
 name = "serde"
-version = "1.0.150"
+version = "1.0.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91"
+checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.150"
+version = "1.0.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e"
+checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8"
 dependencies = [
  "proc-macro2",
  "quote",

From 6ab8591715daf932d0dc45d0d5fb9e5a272f2fe1 Mon Sep 17 00:00:00 2001
From: Chirikumbrah <78883260+Chirikumbrah@users.noreply.github.com>
Date: Wed, 21 Dec 2022 02:33:14 +0300
Subject: [PATCH 672/884] Better diagnostics highlighting for Dracula theme.
 (#5236)

---
 runtime/themes/dracula.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtime/themes/dracula.toml b/runtime/themes/dracula.toml
index 90bdb446..0f459311 100644
--- a/runtime/themes/dracula.toml
+++ b/runtime/themes/dracula.toml
@@ -55,6 +55,9 @@
 "markup.quote" = { fg = "yellow", modifiers = ["italic"] }
 "markup.raw" = { fg = "foreground" }
 
+"diagnostic".underline = { color = "orange", style = "curl" }
+"diagnostic.error".underline = { color = "red", style = "curl" }
+
 [palette]
 background = "#282a36"
 background_dark = "#21222c"

From d0a5e11c28a3ad2533b79e2922ca06aa7036516c Mon Sep 17 00:00:00 2001
From: LeoniePhiline <22329650+LeoniePhiline@users.noreply.github.com>
Date: Thu, 22 Dec 2022 00:10:12 +0100
Subject: [PATCH 673/884] fix(theme): Replace invalid `cyan` by `blue` in line
 with original theme (#5250)

---
 runtime/themes/monokai_pro_spectrum.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/themes/monokai_pro_spectrum.toml b/runtime/themes/monokai_pro_spectrum.toml
index 89575e3a..f5787ca8 100644
--- a/runtime/themes/monokai_pro_spectrum.toml
+++ b/runtime/themes/monokai_pro_spectrum.toml
@@ -53,7 +53,7 @@
 "constructor" = "blue"
 "function" = "green"
 "function.macro" = { fg = "blue" }
-"function.builtin" = { fg = "cyan" }
+"function.builtin" = { fg = "blue" }
 
 # operator, tags, units, punctuations
 "operator" = "red"

From c4263d6a56c6490b34a43c7d393fce321514b6ef Mon Sep 17 00:00:00 2001
From: Chickenkeeper <artofchrism@gmail.com>
Date: Wed, 21 Dec 2022 23:10:45 +0000
Subject: [PATCH 674/884] Fix & Tweak Rust's Syntax Highlighting (#5238)

---
 runtime/queries/rust/highlights.scm | 31 ++++++++---------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm
index d3c29270..66058034 100644
--- a/runtime/queries/rust/highlights.scm
+++ b/runtime/queries/rust/highlights.scm
@@ -45,7 +45,8 @@
   "'" @label
   (identifier) @label)
 (loop_label
-  (identifier) @type)
+  "'" @label
+  (identifier) @label)
 
 ; ---
 ; Punctuation
@@ -102,8 +103,6 @@
 (closure_parameters
 	(identifier) @variable.parameter)
 
-
-
 ; -------
 ; Keywords
 ; -------
@@ -129,9 +128,7 @@
 [
   "break"
   "continue"
-
   "return"
-
   "await"
 ] @keyword.control.return
 
@@ -154,10 +151,7 @@
   "trait"
   "for"
 
-  "unsafe"
   "default"
-  "macro_rules!"
-
   "async"
 ] @keyword
 
@@ -165,13 +159,13 @@
   "struct"
   "enum"
   "union"
-
   "type"
 ] @keyword.storage.type
 
 "let" @keyword.storage
-
 "fn" @keyword.function
+"unsafe" @keyword.special
+"macro_rules!" @function.macro
 
 (mutable_specifier) @keyword.storage.modifier.mut
 
@@ -202,11 +196,11 @@
 
 (call_expression
   function: [
-    ((identifier) @type.variant
-      (#match? @type.variant "^[A-Z]"))
+    ((identifier) @type.enum.variant
+      (#match? @type.enum.variant "^[A-Z]"))
     (scoped_identifier
-      name: ((identifier) @type.variant
-        (#match? @type.variant "^[A-Z]")))
+      name: ((identifier) @type.enum.variant
+        (#match? @type.enum.variant "^[A-Z]")))
   ])
 
 ; ---
@@ -237,8 +231,6 @@
 ((identifier) @type
   (#match? @type "^[A-Z]"))
 
-
-
 (attribute
   (identifier) @_macro
   arguments: (token_tree (identifier) @constant.numeric.integer)
@@ -246,7 +238,6 @@
 )
 @special
 
-
 ; -------
 ; Functions
 ; -------
@@ -303,8 +294,6 @@
 (metavariable) @variable.parameter
 (fragment_specifier) @type
 
-
-
 ; -------
 ; Operators
 ; -------
@@ -350,8 +339,6 @@
   "'"
 ] @operator
 
-
-
 ; -------
 ; Paths
 ; -------
@@ -382,8 +369,6 @@
 (scoped_type_identifier
   path: (identifier) @namespace)
 
-
-
 ; -------
 ; Remaining Identifiers
 ; -------

From 7905086b55eac2a817c16fe3a9ab987e718324c8 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 22 Dec 2022 19:21:02 -0600
Subject: [PATCH 675/884] Fix HTML injection within markdown (#5265)

HTML nodes should be combined injections in the markdown block
grammar. When nodes are together the highlighting works properly but
when there is markdown content between HTML nodes like in a `<details>`
tag, the highlighting of the closing tag breaks since tree-sitter-html
looks for opening and closing tags.
---
 runtime/queries/markdown/injections.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/runtime/queries/markdown/injections.scm b/runtime/queries/markdown/injections.scm
index e184db15..e8839351 100644
--- a/runtime/queries/markdown/injections.scm
+++ b/runtime/queries/markdown/injections.scm
@@ -5,7 +5,10 @@
     (language) @injection.language)
   (code_fence_content) @injection.content (#set! injection.include-unnamed-children))
 
-((html_block) @injection.content (#set! injection.language "html") (#set! injection.include-unnamed-children))
+((html_block) @injection.content
+ (#set! injection.language "html")
+ (#set! injection.include-unnamed-children)
+ (#set! injection.combined))
 
 ((pipe_table_cell) @injection.content (#set! injection.language "markdown.inline") (#set! injection.include-unnamed-children))
 

From 7a1fa0c74fb2c3b7b1c9aea9aa77c5c612e0bd12 Mon Sep 17 00:00:00 2001
From: Gioele De Vitti <gioele@devgioele.xyz>
Date: Fri, 23 Dec 2022 02:12:49 +0000
Subject: [PATCH 676/884] tutor: Add a content cycling section (#5161)

---
 runtime/tutor | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/runtime/tutor b/runtime/tutor
index 885ea0bf..1fc5605e 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -985,11 +985,33 @@ lines.
  --> How much would would a wouldchuck chuck
  --> if a wouldchuck could chuck would?
 
- Note: Additionally, Alt-( and Alt-) cycle the *contents* of the
-       selections as well.
+
+
+
+=================================================================
+=             10.2 CYCLING THE CONTENT OF SELECTIONS            =
+=================================================================
+
+ Type Alt-) and Alt-( to cycle the content of the selections
+ forward and backward respectively.
+
+ 1. Move the cursor to the line marked '-->' below.
+ 2. Select both lines with xx or 2x.
+ 3. Type s to select, type "through|water|know" and enter.
+ 4. Use Alt-( and Alt-) to cycle the content of the selections.
+
+ --> Jumping through the water,
+ --> daring to know.
+
+
+
+
+
+
+
 
 =================================================================
-=                     10.2 CHANGING CASE                        =
+=                     10.3 CHANGING CASE                        =
 =================================================================
 
  Type ~ to switch the case of all selected letters.
@@ -1011,7 +1033,7 @@ lines.
  --> THIS sentence should ALL BE IN uppercase!
 
 =================================================================
-=                   10.3 SPLITTING SELECTIONS                   =
+=                   10.4 SPLITTING SELECTIONS                   =
 =================================================================
 
  Type S to split each selection on a regex pattern.
@@ -1039,6 +1061,7 @@ letters! that is not good grammar. you can fix this.
  * Use ) and ( to cycle the primary selection back and forward
    through selections respectively.
    * Type Alt-, to remove the primary selection.
+   * Type Alt-) and Alt-( to cycle the content of the selections.
 
  * Type ~ to alternate case of selected letters.
    * Use ` and Alt-` to set the case of selected letters to
@@ -1053,7 +1076,6 @@ letters! that is not good grammar. you can fix this.
 
 
 
-
 =================================================================
 =                                                               =
 =================================================================

From 1b89d3e5350f83b2ffb86a86326bd2714308ee53 Mon Sep 17 00:00:00 2001
From: Jack Allison <john123allison@gmail.com>
Date: Thu, 22 Dec 2022 21:23:34 -0500
Subject: [PATCH 677/884] Add file picker dialogue when opening a directory
 with :o (#2707)

---
 helix-term/src/commands/typed.rs | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index cb387fcb..c3a7c9fa 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -65,12 +65,28 @@ fn open(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) ->
     ensure!(!args.is_empty(), "wrong argument count");
     for arg in args {
         let (path, pos) = args::parse_file(arg);
-        let _ = cx.editor.open(&path, Action::Replace)?;
-        let (view, doc) = current!(cx.editor);
-        let pos = Selection::point(pos_at_coords(doc.text().slice(..), pos, true));
-        doc.set_selection(view.id, pos);
-        // does not affect opening a buffer without pos
-        align_view(doc, view, Align::Center);
+        // If the path is a directory, open a file picker on that directory and update the status
+        // message
+        if std::fs::canonicalize(&path)?.is_dir() {
+            let callback = async move {
+                let call: job::Callback = job::Callback::EditorCompositor(Box::new(
+                    move |editor: &mut Editor, compositor: &mut Compositor| {
+                        let picker = ui::file_picker(path, &editor.config());
+                        compositor.push(Box::new(overlayed(picker)));
+                    },
+                ));
+                Ok(call)
+            };
+            cx.jobs.callback(callback);
+        } else {
+            // Otherwise, just open the file
+            let _ = cx.editor.open(&path, Action::Replace)?;
+            let (view, doc) = current!(cx.editor);
+            let pos = Selection::point(pos_at_coords(doc.text().slice(..), pos, true));
+            doc.set_selection(view.id, pos);
+            // does not affect opening a buffer without pos
+            align_view(doc, view, Align::Center);
+        }
     }
     Ok(())
 }

From 1107296ca9bfd728258a4571be35eb7c811ff3b3 Mon Sep 17 00:00:00 2001
From: DylanBulfin <31492860+DylanBulfin@users.noreply.github.com>
Date: Thu, 22 Dec 2022 21:27:20 -0500
Subject: [PATCH 678/884] Add command to merge consecutive ranges in selection
 (#5047)

---
 book/src/keymap.md               |  1 +
 helix-core/src/selection.rs      | 95 ++++++++++++++++++++++++++++----
 helix-term/src/commands.rs       |  7 +++
 helix-term/src/keymap/default.rs |  1 +
 4 files changed, 92 insertions(+), 12 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 15329400..272c758b 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -111,6 +111,7 @@
 | `s`                   | Select all regex matches inside selections                        | `select_regex`                       |
 | `S`                   | Split selection into subselections on regex matches               | `split_selection`                    |
 | `Alt-s`               | Split selection on newlines                                       | `split_selection_on_newline`         |
+| `Alt-_ `              | Merge consecutive selections                                      | `merge_consecutive_selections`       |
 | `&`                   | Align selection in columns                                        | `align_selections`                   |
 | `_`                   | Trim whitespace from the selection                                | `trim_selections`                    |
 | `;`                   | Collapse selection onto a single cursor                           | `collapse_selection`                 |
diff --git a/helix-core/src/selection.rs b/helix-core/src/selection.rs
index 1f28ecef..ffba46ab 100644
--- a/helix-core/src/selection.rs
+++ b/helix-core/src/selection.rs
@@ -495,28 +495,53 @@ impl Selection {
 
     /// Normalizes a `Selection`.
     fn normalize(mut self) -> Self {
-        let primary = self.ranges[self.primary_index];
+        let mut primary = self.ranges[self.primary_index];
         self.ranges.sort_unstable_by_key(Range::from);
+
+        self.ranges.dedup_by(|curr_range, prev_range| {
+            if prev_range.overlaps(curr_range) {
+                let new_range = curr_range.merge(*prev_range);
+                if prev_range == &primary || curr_range == &primary {
+                    primary = new_range;
+                }
+                *prev_range = new_range;
+                true
+            } else {
+                false
+            }
+        });
+
         self.primary_index = self
             .ranges
             .iter()
             .position(|&range| range == primary)
             .unwrap();
 
-        let mut prev_i = 0;
-        for i in 1..self.ranges.len() {
-            if self.ranges[prev_i].overlaps(&self.ranges[i]) {
-                self.ranges[prev_i] = self.ranges[prev_i].merge(self.ranges[i]);
+        self
+    }
+
+    // Merges all ranges that are consecutive
+    pub fn merge_consecutive_ranges(mut self) -> Self {
+        let mut primary = self.ranges[self.primary_index];
+
+        self.ranges.dedup_by(|curr_range, prev_range| {
+            if prev_range.to() == curr_range.from() {
+                let new_range = curr_range.merge(*prev_range);
+                if prev_range == &primary || curr_range == &primary {
+                    primary = new_range;
+                }
+                *prev_range = new_range;
+                true
             } else {
-                prev_i += 1;
-                self.ranges[prev_i] = self.ranges[i];
+                false
             }
-            if i == self.primary_index {
-                self.primary_index = prev_i;
-            }
-        }
+        });
 
-        self.ranges.truncate(prev_i + 1);
+        self.primary_index = self
+            .ranges
+            .iter()
+            .position(|&range| range == primary)
+            .unwrap();
 
         self
     }
@@ -1132,6 +1157,52 @@ mod test {
             &["", "abcd", "efg", "rs", "xyz"]
         );
     }
+
+    #[test]
+    fn test_merge_consecutive_ranges() {
+        let selection = Selection::new(
+            smallvec![
+                Range::new(0, 1),
+                Range::new(1, 10),
+                Range::new(15, 20),
+                Range::new(25, 26),
+                Range::new(26, 30)
+            ],
+            4,
+        );
+
+        let result = selection.merge_consecutive_ranges();
+
+        assert_eq!(
+            result.ranges(),
+            &[Range::new(0, 10), Range::new(15, 20), Range::new(25, 30)]
+        );
+        assert_eq!(result.primary_index, 2);
+
+        let selection = Selection::new(smallvec![Range::new(0, 1)], 0);
+        let result = selection.merge_consecutive_ranges();
+
+        assert_eq!(result.ranges(), &[Range::new(0, 1)]);
+        assert_eq!(result.primary_index, 0);
+
+        let selection = Selection::new(
+            smallvec![
+                Range::new(0, 1),
+                Range::new(1, 5),
+                Range::new(5, 8),
+                Range::new(8, 10),
+                Range::new(10, 15),
+                Range::new(18, 25)
+            ],
+            3,
+        );
+
+        let result = selection.merge_consecutive_ranges();
+
+        assert_eq!(result.ranges(), &[Range::new(0, 15), Range::new(18, 25)]);
+        assert_eq!(result.primary_index, 0);
+    }
+
     #[test]
     fn test_selection_contains() {
         fn contains(a: Vec<(usize, usize)>, b: Vec<(usize, usize)>) -> bool {
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 6cf49464..437e11b5 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -244,6 +244,7 @@ impl MappableCommand {
         select_regex, "Select all regex matches inside selections",
         split_selection, "Split selections on regex matches",
         split_selection_on_newline, "Split selection on newlines",
+        merge_consecutive_selections, "Merge consecutive selections",
         search, "Search for regex pattern",
         rsearch, "Reverse search for regex pattern",
         search_next, "Select next search match",
@@ -1589,6 +1590,12 @@ fn split_selection_on_newline(cx: &mut Context) {
     doc.set_selection(view.id, selection);
 }
 
+fn merge_consecutive_selections(cx: &mut Context) {
+    let (view, doc) = current!(cx.editor);
+    let selection = doc.selection(view.id).clone().merge_consecutive_ranges();
+    doc.set_selection(view.id, selection);
+}
+
 #[allow(clippy::too_many_arguments)]
 fn search_impl(
     editor: &mut Editor,
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index ebcd125a..ef93dee0 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -76,6 +76,7 @@ pub fn default() -> HashMap<Mode, Keymap> {
 
         "s" => select_regex,
         "A-s" => split_selection_on_newline,
+        "A-_" => merge_consecutive_selections,
         "S" => split_selection,
         ";" => collapse_selection,
         "A-;" => flip_selections,

From df1830ef28a7cb49abe31a18e4bd1bcfc7eb802a Mon Sep 17 00:00:00 2001
From: jliaoh <48660001+hunterliao29@users.noreply.github.com>
Date: Thu, 22 Dec 2022 21:30:33 -0500
Subject: [PATCH 679/884] mouse operations respect scrolloff (#5255)

---
 helix-term/src/ui/editor.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index fc201853..35cf77ab 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1155,6 +1155,7 @@ impl EditorView {
                     }
 
                     editor.focus(view_id);
+                    editor.ensure_cursor_in_view(view_id);
 
                     return EventResult::Consumed(None);
                 }
@@ -1191,7 +1192,8 @@ impl EditorView {
                 let primary = selection.primary_mut();
                 *primary = primary.put_cursor(doc.text().slice(..), pos, true);
                 doc.set_selection(view.id, selection);
-
+                let view_id = view.id;
+                cxt.editor.ensure_cursor_in_view(view_id);
                 EventResult::Consumed(None)
             }
 
@@ -1213,6 +1215,7 @@ impl EditorView {
                 commands::scroll(cxt, offset, direction);
 
                 cxt.editor.tree.focus = current_view;
+                cxt.editor.ensure_cursor_in_view(current_view);
 
                 EventResult::Consumed(None)
             }

From b1ca7ddf89c048a8da0d6cfe507ac3344e6f625f Mon Sep 17 00:00:00 2001
From: cor <cor@pruijs.dev>
Date: Fri, 23 Dec 2022 15:03:54 +0100
Subject: [PATCH 680/884] Use curl underlines in the rose_pine theme (#5267)

Also fixes the color "gold" being used for too many kinds of diagnostics, now there's a more conventional choice of diagnostics colors (redish = error, yellowish = warning, blueish = hint).
---
 runtime/themes/rose_pine.toml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/runtime/themes/rose_pine.toml b/runtime/themes/rose_pine.toml
index 14e240dd..8558db3a 100644
--- a/runtime/themes/rose_pine.toml
+++ b/runtime/themes/rose_pine.toml
@@ -1,5 +1,6 @@
 # Author: RayGervais<raygervais@hotmail.ca>
 # Author: ChrisHa<chunghha@users.noreply.github.com>
+# Diagnostics patch author: cor<cor@pruijs.dev>
 
 "ui.background" = { bg = "base" }
 "ui.menu" = { fg = "text", bg = "overlay" }
@@ -45,12 +46,18 @@
 "diff.delta" = "rose"
 "diff.minus" = "love"
 
-"info" = "gold"
-"hint" = "gold"
+"info" = "foam"
+"hint" = "iris"
 "debug" = "rose"
-"diagnostic" = "rose"
+"warning" = "gold"
 "error" = "love"
 
+"diagnostic" = { modifiers = ["underlined"] }
+"diagnostic.error" = { underline = { style = "curl", color = "love" } }
+"diagnostic.warning" = { underline = { style = "curl", color = "gold" } }
+"diagnostic.info" = { underline = { style = "curl", color = "foam" } }
+"diagnostic.hint" = { underline = { style = "curl", color = "iris" } }
+
 "markup.heading.marker" = "subtle"
 "markup.heading.1" = { fg = "love", modifiers = ["bold"] }
 "markup.heading.2" = { fg = "gold", modifiers = ["bold"] }

From 24c3b00d10858a02c6c1c351a7509e204c2bc647 Mon Sep 17 00:00:00 2001
From: Nick <sop.theteachr@gmail.com>
Date: Fri, 23 Dec 2022 19:43:05 +0530
Subject: [PATCH 681/884] Avoid trailing `s` in message when only 1 file is
 opened (#5189)

---
 helix-term/src/application.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 7a50e007..5f013b9a 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -227,7 +227,11 @@ impl Application {
                         doc.set_selection(view_id, pos);
                     }
                 }
-                editor.set_status(format!("Loaded {} files.", nr_of_files));
+                editor.set_status(format!(
+                    "Loaded {} file{}.",
+                    nr_of_files,
+                    if nr_of_files == 1 { "" } else { "s" } // avoid "Loaded 1 files." grammo
+                ));
                 // align the view to center after all files are loaded,
                 // does not affect views without pos since it is at the top
                 let (view, doc) = current!(editor);

From f0c6e6c9eeb1f2772571bcefe02bd344fa70d62f Mon Sep 17 00:00:00 2001
From: Erasin <erasinoo@gmail.com>
Date: Sat, 24 Dec 2022 19:30:44 +0800
Subject: [PATCH 682/884] fix comment token of godot resource file (#5276)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 8972a6e9..53f65be7 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1460,7 +1460,7 @@ file-types = ["tscn","tres"]
 shebangs = []
 roots = ["project.godot"]
 auto-format = false
-comment-token = "#"
+comment-token = ";"
 indent = { tab-width = 4, unit = "\t" }
 
 [[grammar]]

From eb4ec3271005e9de7960a4dd08a9efbb648cb89f Mon Sep 17 00:00:00 2001
From: alois31 <36605164+alois31@users.noreply.github.com>
Date: Sat, 24 Dec 2022 14:50:39 +0100
Subject: [PATCH 683/884] Fix opening new files (#5278)

Commit 1b89d3e5350f83b2ffb86a86326bd2714308ee53 introduced a regression
where opening a new file would no longer work, because attempting to
canonicalize its path would lead to a "No such file or directory"
error. Fall back to opening a new file when encountering an error to
fix this case.
---
 helix-term/src/commands/typed.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index c3a7c9fa..c2ca1a47 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -67,7 +67,7 @@ fn open(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) ->
         let (path, pos) = args::parse_file(arg);
         // If the path is a directory, open a file picker on that directory and update the status
         // message
-        if std::fs::canonicalize(&path)?.is_dir() {
+        if let Ok(true) = std::fs::canonicalize(&path).map(|p| p.is_dir()) {
             let callback = async move {
                 let call: job::Callback = job::Callback::EditorCompositor(Box::new(
                     move |editor: &mut Editor, compositor: &mut Compositor| {

From 1af76b738dd5bdae14b025d07d3001c4ad23e071 Mon Sep 17 00:00:00 2001
From: Alex Kladov <aleksey.kladov@gmail.com>
Date: Sat, 24 Dec 2022 21:55:16 +0000
Subject: [PATCH 684/884] Add eb word selection trick to the tutor (#5247)

---
 runtime/tutor | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/runtime/tutor b/runtime/tutor
index 1fc5605e..baf32c27 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -241,7 +241,7 @@ _________________________________________________________________
 
 
 =================================================================
-=                     3.2 MORE ON MOTIONS                       =
+=                     3.2 MORE MOTIONS                          =
 =================================================================
 
  As you saw, typing w moves the cursor forward until the start
@@ -253,6 +253,19 @@ _________________________________________________________________
    e - Move forward to the end of the current word.
    b - Move backward to the beginning of the current word.
 
+ To select the word under cursor, combine e and b.
+
+ 1. Move the cursor to the line marked '-->' below.
+ 2. Move to a 'd' letter.
+ 3. Type e to select a half of the word.
+ 4. Type b to select the rest.
+
+--> The Middle Kingdom.
+
+=================================================================
+=                     3.3 WORDS AND words                       =
+=================================================================
+
  The w,e,b motions also have counterparts - W,E,B - which
  traverse WORDS instead of words. WORDS are only separated by
  whitespace, whereas words can be separated by other characters
@@ -262,8 +275,17 @@ _________________________________________________________________
 
 
 
+
+
+
+
+
+
+
+
+
 =================================================================
-=                    3.3 THE CHANGE COMMAND                     =
+=                    3.4 THE CHANGE COMMAND                     =
 =================================================================
 
  Type c to change the current selection.
@@ -285,7 +307,7 @@ _________________________________________________________________
 
 
 =================================================================
-=                   3.4 COUNTS WITH MOTIONS                     =
+=                   3.5 COUNTS WITH MOTIONS                     =
 =================================================================
 
  Type a number before a motion to repeat it that many times.
@@ -307,7 +329,7 @@ _________________________________________________________________
 
 
 =================================================================
-=                    3.5 SELECT / EXTEND MODE                   =
+=                    3.6 SELECT / EXTEND MODE                   =
 =================================================================
 
  Type v to enter Select mode.
@@ -329,7 +351,7 @@ _________________________________________________________________
 
 
 =================================================================
-=                     3.6 SELECTING LINES                       =
+=                     3.7 SELECTING LINES                       =
 =================================================================
 
  Type x to select a whole line. Type x again to select the next.
@@ -351,7 +373,7 @@ _________________________________________________________________
       subsequent lines. X on an empty line does nothing.
 
 =================================================================
-=                   3.7 COLLAPSING SELECTIONS                   =
+=                   3.8 COLLAPSING SELECTIONS                   =
 =================================================================
 
  Type ; to collapse selections to single cursors.

From a637461677bed1468af5a5d86c57113de3345247 Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <socvirnyl.estela@gmail.com>
Date: Tue, 27 Dec 2022 03:11:42 +0800
Subject: [PATCH 685/884] tutor: add chapter for commenting lines (#5211)

---
 runtime/tutor | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/runtime/tutor b/runtime/tutor
index baf32c27..408f7451 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -1099,10 +1099,58 @@ letters! that is not good grammar. you can fix this.
 
 
 =================================================================
-=                                                               =
+=                     11.1 COMMENTING A LINE                    =
 =================================================================
 
+Type Ctrl-c to comment the line under your cursor.
+To uncomment the line, press Ctrl-c again.
 
+1. Move your cursor to the line marked '-->' below.
+2. Now comment the line marked with '-->'.
+3. Now try uncommenting the line.
+
+--> Comment me please
+
+
+
+
+
+
+
+
+
+
+=================================================================
+=                 11.2 COMMENTING MULTIPLE LINES                =
+=================================================================
+
+Using the selections and multi-cursor functionality, you can 
+comment multiple lines as long as it is under the selection or
+cursors. 
+
+1. Move your cursor to the line marked with '-->' below.
+2. Now try to select or add more cursors the other lines marked 
+   with '-->'. 
+3. Comment those lines.
+
+--> How many are you going to comment?
+--> Is this enough for a comment?
+--> What are you doing?!
+--> Stop commenting me!
+--> AAAAaargh!!!
+
+Note: If there are already commented lines under selections or
+multiple cursors, they won't be uncommented but commented again.
+
+=================================================================
+=                       CHAPTER 11 RECAP                        =
+=================================================================
+
+ * Use Ctrl-c to comment a line under your cursor. Type Ctrl-c
+   again to uncomment.
+ * To comment multiple lines, use the selections 
+   and multi-cursors before typing Ctrl-c.
+   * Commented lines cannot be uncommented but commented again.
 
 
 

From 792c2e3dbf1ae355f5cba829dff25d17d8b8c7d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Dec 2022 17:15:00 -0600
Subject: [PATCH 686/884] build(deps): bump git-repository from 0.29.0 to
 0.30.2 (#5306)

Bumps [git-repository](https://github.com/Byron/gitoxide) from 0.29.0 to 0.30.2.
- [Release notes](https://github.com/Byron/gitoxide/releases)
- [Changelog](https://github.com/Byron/gitoxide/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Byron/gitoxide/compare/git-repository-v0.29.0...git-repository-v0.30.2)

---
updated-dependencies:
- dependency-name: git-repository
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock           | 207 +++++++++++++++++++++++--------------------
 helix-vcs/Cargo.toml |   2 +-
 2 files changed, 112 insertions(+), 97 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a6ca9495..1243bc51 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -63,9 +63,9 @@ checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164"
 
 [[package]]
 name = "atoi"
-version = "1.0.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e"
+checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
 dependencies = [
  "num-traits",
 ]
@@ -120,16 +120,6 @@ version = "3.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
 
-[[package]]
-name = "byte-unit"
-version = "4.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581ad4b3d627b0c09a0ccb2912148f839acaca0b93cf54cbe42b6c674e86079c"
-dependencies = [
- "serde",
- "utf8-width",
-]
-
 [[package]]
 name = "bytecount"
 version = "0.6.3"
@@ -211,9 +201,9 @@ dependencies = [
 
 [[package]]
 name = "clru"
-version = "0.5.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "218d6bd3dde8e442a975fa1cd233c0e5fded7596bccfe39f58eca98d22421e0a"
+checksum = "b8191fa7302e03607ff0e237d4246cc043ff5b3cb9409d995172ba3bea16b807"
 
 [[package]]
 name = "codespan-reporting"
@@ -280,7 +270,7 @@ dependencies = [
  "futures-core",
  "libc",
  "mio",
- "parking_lot",
+ "parking_lot 0.12.1",
  "signal-hook",
  "signal-hook-mio",
  "winapi",
@@ -349,7 +339,7 @@ dependencies = [
  "hashbrown 0.12.3",
  "lock_api",
  "once_cell",
- "parking_lot_core",
+ "parking_lot_core 0.9.4",
 ]
 
 [[package]]
@@ -551,9 +541,9 @@ dependencies = [
 
 [[package]]
 name = "git-actor"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac9fb99c934ed45a62d9ae1e7b21949f2d869d1b82a07dcbf16ed61daa665870"
+checksum = "7def29b46f25f95a2e196323cfb336eae9965e0a3c7c35ad9506f295c3a8e234"
 dependencies = [
  "bstr 1.0.1",
  "btoi",
@@ -565,9 +555,9 @@ dependencies = [
 
 [[package]]
 name = "git-attributes"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e98446a2bf0eb5c8f29fa828d6529510a6fadeb59ce14ca98e58fa7e1e0199"
+checksum = "f0affaed361598fdd06b2a184a566c823d0b5817b09f576018248fb267193a96"
 dependencies = [
  "bstr 1.0.1",
  "compact_str",
@@ -608,9 +598,9 @@ dependencies = [
 
 [[package]]
 name = "git-config"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd1d13179bcf3dd68e83404f91a8d01c618f54eb97ef36c68ee5e6f30183a681"
+checksum = "5ff189268cfb19d5151529ac30b6b708072ebfa1075643d785232675456ec320"
 dependencies = [
  "bstr 1.0.1",
  "git-config-value",
@@ -629,9 +619,9 @@ dependencies = [
 
 [[package]]
 name = "git-config-value"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64561e9700f1fc737fa3c1c4ea55293be70dba98e45c54cf3715cb180f37a566"
+checksum = "989a90c1c630513a153c685b4249b96fdf938afc75bf7ef2ae1ccbd3d799f5db"
 dependencies = [
  "bitflags",
  "bstr 1.0.1",
@@ -642,9 +632,9 @@ dependencies = [
 
 [[package]]
 name = "git-credentials"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "621dd60288ae7b8f80bb0704f46d4d2b76fc1ec980a7804e48b02d94a927e331"
+checksum = "28da3d029be10258007699d002321a3b1ebe45e67b0e140a4cf464ba3ee79b32"
 dependencies = [
  "bstr 1.0.1",
  "git-command",
@@ -658,9 +648,9 @@ dependencies = [
 
 [[package]]
 name = "git-date"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33db9f4462b565a33507aee113f3383bf16b988d2c573f07691e34302b7aa0a"
+checksum = "8a2874ce2f3a77cb144167901ea830969e5c991eac7bfee85e6e3f53ef9fcdf2"
 dependencies = [
  "bstr 1.0.1",
  "itoa",
@@ -670,9 +660,9 @@ dependencies = [
 
 [[package]]
 name = "git-diff"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82f77407381267be95f1b26acfb32007258af342ee61729bb4271b1869bf5bb2"
+checksum = "8f30011a43908645c492dfbea7b004e10528be6bd667bf5cdc12ff4297fe1e3c"
 dependencies = [
  "git-hash",
  "git-object",
@@ -682,9 +672,9 @@ dependencies = [
 
 [[package]]
 name = "git-discover"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c2cfd1272824b126c6997ef479a71288d00fae14dc5144dfc48658f4dd24fbe"
+checksum = "93c244b1cf7cf45501116e948506c25324e33ddc613f00557ff5bfded2132009"
 dependencies = [
  "bstr 1.0.1",
  "git-hash",
@@ -696,9 +686,9 @@ dependencies = [
 
 [[package]]
 name = "git-features"
-version = "0.24.1"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7bdbe755d2129bc609437b6b18af1116f146128dda6070c15c0aa50201ac17c"
+checksum = "0f98e6ede7b790dfba16bf3c62861ae75c3719485d675b522cf7d7e748a4011c"
 dependencies = [
  "crc32fast",
  "flate2",
@@ -713,9 +703,9 @@ dependencies = [
 
 [[package]]
 name = "git-glob"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef858611602fce54b51e45671ca72f07fe6a3c0e24a0539c66b75dfd4d84bd77"
+checksum = "3908404c9b76ac7b3f636a104142378d3eaa78623cbc6eb7c7f0651979d48e8a"
 dependencies = [
  "bitflags",
  "bstr 1.0.1",
@@ -731,11 +721,21 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "git-hashtable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c52b625ad8cc360a0b7f426266f21fb07bd49b8f4ccf1b3ca7bc89424db1dec4"
+dependencies = [
+ "git-hash",
+ "hashbrown 0.13.1",
+]
+
 [[package]]
 name = "git-index"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a87c32d2e012ee316d4037b2151e5893599379ff1fc2c6adb36d2d4d1c461e2c"
+checksum = "20627f71f3a884b0ae50f9f3abb3a07d9b117d06e16110d25b85da4d71d478c0"
 dependencies = [
  "atoi",
  "bitflags",
@@ -766,9 +766,9 @@ dependencies = [
 
 [[package]]
 name = "git-mailmap"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "480eecdfaf1bfd05973678520d182dc07afa25b133db18c52575fb65b782b7ba"
+checksum = "f90e3ee2eaeebda8a12d17f4d99dff5b19d81536476020bcebb99ee121820466"
 dependencies = [
  "bstr 1.0.1",
  "git-actor",
@@ -777,9 +777,9 @@ dependencies = [
 
 [[package]]
 name = "git-object"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce0f14f9cd8f0782e843898a2fb7b0c2f5a6e37bd4cdff4409bb8ec698597dad"
+checksum = "35b658f1e3e149d88cb3e0a2234be749bb0cab65887405975dbe6f3190cf6571"
 dependencies = [
  "bstr 1.0.1",
  "btoi",
@@ -796,9 +796,9 @@ dependencies = [
 
 [[package]]
 name = "git-odb"
-version = "0.37.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13493da6cf0326454215414d29f933a1e26bdba3b9b60ad8cdcbe06f0639584b"
+checksum = "55333419bbb25aa6d39e29155f747ad8e1777fe385f70f447be9d680824d23dd"
 dependencies = [
  "arc-swap",
  "git-features",
@@ -807,16 +807,16 @@ dependencies = [
  "git-pack",
  "git-path",
  "git-quote",
- "parking_lot",
+ "parking_lot 0.12.1",
  "tempfile",
  "thiserror",
 ]
 
 [[package]]
 name = "git-pack"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa8391cbf293f0f8ffbb5e324f25741f5e1e2d35fb87b89ab222a025661e0454"
+checksum = "9ed3c9af66949553af9795b9eac9d450a5bdceee9959352cda468997ddce0d2f"
 dependencies = [
  "bytesize",
  "clru",
@@ -825,22 +825,22 @@ dependencies = [
  "git-diff",
  "git-features",
  "git-hash",
+ "git-hashtable",
  "git-object",
  "git-path",
  "git-tempfile",
  "git-traverse",
- "hash_hasher",
  "memmap2",
- "parking_lot",
+ "parking_lot 0.12.1",
  "smallvec",
  "thiserror",
 ]
 
 [[package]]
 name = "git-path"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f60cbc13bc0fdd95df5f4b80437197e2853116792894b1bf38d1a6b4a64f8c9"
+checksum = "e40e68481a06da243d3f4dfd86a4be39c24eefb535017a862e845140dcdb878a"
 dependencies = [
  "bstr 1.0.1",
  "thiserror",
@@ -848,14 +848,14 @@ dependencies = [
 
 [[package]]
 name = "git-prompt"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21c6aaeb3f0f8de91f5e0eb950282c6508e05babcedef768db5a6f085d6e5242"
+checksum = "3612a486e507dd431ef0f7108eeaafc8fd1ed7bd0f205a88554f6f91fe5dccbf"
 dependencies = [
  "git-command",
  "git-config-value",
  "nix",
- "parking_lot",
+ "parking_lot 0.12.1",
  "thiserror",
 ]
 
@@ -872,9 +872,9 @@ dependencies = [
 
 [[package]]
 name = "git-ref"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22484043921e699edc170415789f1b882c8f3546e1fbbc447a0043ef07e088c4"
+checksum = "c97b7d719e4320179fb64d081016e7faca56fed4a8ee4cf84e4697faad9235a3"
 dependencies = [
  "git-actor",
  "git-features",
@@ -891,9 +891,9 @@ dependencies = [
 
 [[package]]
 name = "git-refspec"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac2e8f36e7d5d48903b60051dfb75aedfc4ea9ba66bdffa7a9081e8d276b0107"
+checksum = "d478e9db0956d60cd386d3348b5ec093e3ae613105a7a75ff6084b886254eba8"
 dependencies = [
  "bstr 1.0.1",
  "git-hash",
@@ -905,12 +905,10 @@ dependencies = [
 
 [[package]]
 name = "git-repository"
-version = "0.29.0"
+version = "0.30.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a89cec253dd3fba44694f7468d907506a52d0055850ecd7d84f4bac07f00e73f"
+checksum = "1925a65a9fea6587e969a7a85cb239c8e1e438cf6dc520406df1b4c9d0e83bdc"
 dependencies = [
- "byte-unit",
- "clru",
  "git-actor",
  "git-attributes",
  "git-config",
@@ -921,6 +919,7 @@ dependencies = [
  "git-features",
  "git-glob",
  "git-hash",
+ "git-hashtable",
  "git-index",
  "git-lock",
  "git-mailmap",
@@ -940,6 +939,7 @@ dependencies = [
  "git-worktree",
  "log",
  "once_cell",
+ "prodash",
  "signal-hook",
  "smallvec",
  "thiserror",
@@ -948,23 +948,23 @@ dependencies = [
 
 [[package]]
 name = "git-revision"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e629289b0d7f7f2f2e46248527f5cac838e6a7cb9507eab06fc8473082db6cb6"
+checksum = "f7516b1db551756b4d3176c4b7d18ccc4b79d35dcc5e74f768c90f5bb11bb6c9"
 dependencies = [
  "bstr 1.0.1",
  "git-date",
  "git-hash",
+ "git-hashtable",
  "git-object",
- "hash_hasher",
  "thiserror",
 ]
 
 [[package]]
 name = "git-sec"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ecb370efde58da72827909292284b5c5b885e0621a342515a36976b0b3bf660"
+checksum = "9e1802e8252fa223b0ad89a393aed461132174ced1e6842a41f56dc92a3fc14f"
 dependencies = [
  "bitflags",
  "dirs",
@@ -989,21 +989,21 @@ dependencies = [
 
 [[package]]
 name = "git-traverse"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d2746935c92d252e24f9d345e0a981510596faceb7edae821b9e4c8c35c285b"
+checksum = "5e5141dde56d0c4861193c760e01fb61c7e03a32d0840ba93a0ac1c597588d4d"
 dependencies = [
  "git-hash",
+ "git-hashtable",
  "git-object",
- "hash_hasher",
  "thiserror",
 ]
 
 [[package]]
 name = "git-url"
-version = "0.11.0"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dbd91c55b1b03a833ff8278776fed272918cd61cd48efe9a97ad1fea7ef93ec"
+checksum = "8651924c9692a778f09141ca44d1bf2dada229fe9b240f1ff1bdecd9621a1a93"
 dependencies = [
  "bstr 1.0.1",
  "git-features",
@@ -1015,9 +1015,9 @@ dependencies = [
 
 [[package]]
 name = "git-validate"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdf83bae632fc064ca938ebfb987364d9083b7f98b1476805f0a2d5eebb48686"
+checksum = "0431cf9352c596dc7c8ec9066ee551ce54e63c86c3c767e5baf763f6019ff3c2"
 dependencies = [
  "bstr 1.0.1",
  "thiserror",
@@ -1025,9 +1025,9 @@ dependencies = [
 
 [[package]]
 name = "git-worktree"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eae0e0b1050208e611d5fac0d8366b29ef3f83849767ff9c4bcf570f0d5dc2b"
+checksum = "17d748c54c3d904c914b987654a1416c7abe7cf048fdc83eeae69e6ac3d76f20"
 dependencies = [
  "bstr 1.0.1",
  "git-attributes",
@@ -1093,12 +1093,6 @@ dependencies = [
  "memmap2",
 ]
 
-[[package]]
-name = "hash_hasher"
-version = "2.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74721d007512d0cb3338cd20f0654ac913920061a4c4d0d8708edb3f2a698c0c"
-
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -1258,7 +1252,7 @@ dependencies = [
  "helix-core",
  "imara-diff",
  "log",
- "parking_lot",
+ "parking_lot 0.12.1",
  "tempfile",
  "tokio",
 ]
@@ -1531,14 +1525,14 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.25.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
+checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694"
 dependencies = [
- "autocfg",
  "bitflags",
  "cfg-if",
  "libc",
+ "static_assertions",
 ]
 
 [[package]]
@@ -1595,6 +1589,17 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
 
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
 [[package]]
 name = "parking_lot"
 version = "0.12.1"
@@ -1602,7 +1607,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
  "lock_api",
- "parking_lot_core",
+ "parking_lot_core 0.9.4",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "winapi",
 ]
 
 [[package]]
@@ -1647,12 +1666,14 @@ dependencies = [
 
 [[package]]
 name = "prodash"
-version = "21.1.0"
+version = "22.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e13d7bd38cdab08b3a8b780cedcc54238c84fdca4084eb188807b308bcf11e6"
+checksum = "38e2b91fcc982d0d8ae5e9d477561c73e09c24c5c19bac4858e202f6f065a13e"
 dependencies = [
  "bytesize",
+ "dashmap",
  "human_format",
+ "parking_lot 0.11.2",
 ]
 
 [[package]]
@@ -2110,7 +2131,7 @@ dependencies = [
  "memchr",
  "mio",
  "num_cpus",
- "parking_lot",
+ "parking_lot 0.12.1",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
@@ -2235,12 +2256,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "utf8-width"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1"
-
 [[package]]
 name = "version_check"
 version = "0.9.4"
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index e54cf828..8e713638 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -16,7 +16,7 @@ helix-core = { version = "0.6", path = "../helix-core" }
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
 parking_lot = "0.12"
 
-git-repository = { version = "0.29", default-features = false , optional = true }
+git-repository = { version = "0.30", default-features = false , optional = true }
 imara-diff = "0.1.5"
 
 log = "0.4"

From eed80ef1c231a27ea76e6cb1b8800b299f56d834 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Dec 2022 17:28:21 -0600
Subject: [PATCH 687/884] build(deps): bump serde from 1.0.151 to 1.0.152
 (#5307)

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.151 to 1.0.152.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.151...v1.0.152)

---
updated-dependencies:
- dependency-name: serde
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1243bc51..3592e621 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1826,18 +1826,18 @@ checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
 
 [[package]]
 name = "serde"
-version = "1.0.151"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0"
+checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.151"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8"
+checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
 dependencies = [
  "proc-macro2",
  "quote",

From ebaf01924dd0e6251535d88ec0a2a00e88680d6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Dec 2022 17:28:40 -0600
Subject: [PATCH 688/884] build(deps): bump cc from 1.0.77 to 1.0.78 (#5308)

Bumps [cc](https://github.com/rust-lang/cc-rs) from 1.0.77 to 1.0.78.
- [Release notes](https://github.com/rust-lang/cc-rs/releases)
- [Commits](https://github.com/rust-lang/cc-rs/compare/1.0.77...1.0.78)

---
updated-dependencies:
- dependency-name: cc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3592e621..96c39fd5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -155,9 +155,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.77"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
+checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
 
 [[package]]
 name = "cfg-if"

From 1f4d277013783c9c537444299ba4e558b9047fe2 Mon Sep 17 00:00:00 2001
From: farwyler <1705805+farwyler@users.noreply.github.com>
Date: Tue, 27 Dec 2022 15:57:09 +0100
Subject: [PATCH 689/884] Allow custom preprocessors for 'vue' injections
 (#5268)

---
 runtime/queries/vue/injections.scm | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/runtime/queries/vue/injections.scm b/runtime/queries/vue/injections.scm
index 73df868b..1b053e74 100644
--- a/runtime/queries/vue/injections.scm
+++ b/runtime/queries/vue/injections.scm
@@ -8,13 +8,37 @@
   (raw_text) @injection.content)
  (#set! injection.language "javascript"))
 
+; <script>
 ((script_element
+    (start_tag) @_no_lang
+    (raw_text) @injection.content)
+  (#not-match? @_no_lang "lang=")
+  (#set! injection.language "javascript"))
+
+; <script lang="...">
+((script_element
+  (start_tag
+    (attribute
+    (attribute_name) @_attr_name
+    (quoted_attribute_value (attribute_value) @injection.language)))
   (raw_text) @injection.content)
- (#set! injection.language "javascript"))
+  (#eq? @_attr_name "lang"))
 
+; <style>
 ((style_element
-  (raw_text) @injection.content)
- (#set! injection.language "css"))
+    (start_tag) @_no_lang
+    (raw_text) @injection.content)
+  (#not-match? @_no_lang "lang=")
+  (#set! injection.language "css"))
+
+; <style lang="...">
+((style_element
+  (start_tag
+    (attribute
+      (attribute_name) @_attr_name
+      (quoted_attribute_value (attribute_value) @injection.language)))
+   (raw_text) @injection.content)
+ (#eq? @_attr_name "lang"))
 
 ((comment) @injection.content
  (#set! injection.language "comment"))

From 7ac72a39cbcaeda31c717418bde068f9bfc32d0e Mon Sep 17 00:00:00 2001
From: leonqadirie <39130739+leonqadirie@users.noreply.github.com>
Date: Wed, 28 Dec 2022 01:55:40 +0100
Subject: [PATCH 690/884] Fix kanagawa theme lint and added git gutter colors
 (#5273)

* Fix kanagawa theme lint

Comprises 4 changes:
1. added "sumiInk3" as ui.cursorline.primary bg color
2. switched the cursor bg and fg colors (now in line with original theme)
3. added ui.menu and ui.selected colors
4. separated ui.selection and ui.selection.primary

* Add git gutter colors to kanagawa theme

In line with original:
autumnGreen for adds
autumnRed for deletes
autumnYellow for changes

* Add indent-guides and linenr.selected to kanagawa

* indent-guides are sumiInk4
* Add ui.linenr.selected is roninYellow

* Set ui.help bg to sumiInk1
---
 runtime/themes/kanagawa.toml | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/runtime/themes/kanagawa.toml b/runtime/themes/kanagawa.toml
index 50a7c0a7..faeeeb83 100644
--- a/runtime/themes/kanagawa.toml
+++ b/runtime/themes/kanagawa.toml
@@ -7,10 +7,14 @@
 # because of some theming differences, it's not an exact copy of the original.
 
 ## User interface
-"ui.selection" = { bg = "waveBlue1" }
+"ui.selection" = { bg = "waveBlue2" }
+"ui.selection.primary" = { bg = "waveBlue1" }
 "ui.background" = { fg = "fujiWhite", bg = "sumiInk1" }
 
 "ui.linenr" = { fg = "sumiInk4" }
+"ui.linenr.selected" = { fg = "roninYellow" }
+
+"ui.virtual.indent-guide" = "sumiInk4"
 
 "ui.statusline" = { fg = "oldWhite", bg = "sumiInk0" }
 "ui.statusline.inactive" = { fg = "fujiGray", bg = "sumiInk0" }
@@ -23,15 +27,19 @@
 
 "ui.popup" = { fg = "fujiWhite", bg = "sumiInk0" }
 "ui.window" = { fg = "fujiWhite" }
-"ui.help" = { fg = "fujiWhite", bg = "waveBlue1" }
+"ui.help" = { fg = "fujiWhite", bg = "sumiInk1" }
 "ui.text" = "fujiWhite"
 "ui.text.focus" = { fg = "fujiWhite", bg = "waveBlue1", modifiers = ["bold"] }
 "ui.virtual" = "waveBlue1"
 
-"ui.cursor" = { fg = "fujiWhite", bg = "waveBlue1"}
-"ui.cursor.primary" = { fg = "seaFoam", bg = "waveBlue1" }
+"ui.cursor" = { fg = "waveBlue1", bg = "fujiWhite"}
+"ui.cursor.primary" = { fg = "waveBlue1", bg = "seaFoam" }
 "ui.cursor.match" = { fg = "seaFoam", modifiers = ["bold"] }
 "ui.highlight" = { fg = "fujiWhite", bg = "waveBlue2" }
+"ui.menu" = { fg = "fujiWhite", bg = "sumiInk1" }
+"ui.menu.selected" = { fg = "fujiWhite", bg = "waveBlue1" }
+
+"ui.cursorline.primary" = { bg = "sumiInk3"}
 
 diagnostic = { modifiers = ["underlined"] }
 
@@ -40,6 +48,11 @@ warning = "roninYellow"
 info = "waveAqua1"
 hint = "dragonBlue"
 
+## Git gutter
+"diff.plus" = "autumnGreen"
+"diff.minus" = "autumnRed"
+"diff.delta" = "autumnYellow"
+
 ## Syntax highlighting
 "type" = "waveAqua2"
 "constant" = "surimiOrange"
@@ -54,8 +67,8 @@ hint = "dragonBlue"
 "variable.other.member" = "carpYellow"
 "label" = "springBlue"
 "punctuation" = "springViolet2"
-"punctuation.delimiter" = "springViolet2" 
-"punctuation.bracket" = "springViolet2" 
+"punctuation.delimiter" = "springViolet2"
+"punctuation.bracket" = "springViolet2"
 "keyword" = "oniViolet"
 "keyword.directive" = "peachRed"
 "operator" = "boatYellow2"
@@ -122,4 +135,4 @@ sakuraPink    = "#D27E99" # numbers
 waveRed       = "#E46876" # standout specials 1, e.g. builtin variables
 peachRed      = "#FF5D62" # standout specials 2, e.g. exception handling, returns
 surimiOrange  = "#FFA066" # constants, imports, booleans
-katanaGray    = "#717C7C" # deprecated
\ No newline at end of file
+katanaGray    = "#717C7C" # deprecated

From 5f2fe5fca516fa2b55d3020004ab0cec60251e89 Mon Sep 17 00:00:00 2001
From: Triton171 <daniel.ebert@protonmail.com>
Date: Thu, 29 Dec 2022 16:23:40 +0100
Subject: [PATCH 691/884] Fix erroneous indent between closers of auto-pairs
 (#5330)

inserting a newline between 2 closers of an auto-pair.
---
 helix-core/src/auto_pairs.rs | 2 +-
 helix-term/src/commands.rs   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/helix-core/src/auto_pairs.rs b/helix-core/src/auto_pairs.rs
index 072c93d0..31f9d364 100644
--- a/helix-core/src/auto_pairs.rs
+++ b/helix-core/src/auto_pairs.rs
@@ -17,7 +17,7 @@ pub const DEFAULT_PAIRS: &[(char, char)] = &[
 ];
 
 /// The type that represents the collection of auto pairs,
-/// keyed by the opener.
+/// keyed by both opener and closer.
 #[derive(Debug, Clone)]
 pub struct AutoPairs(HashMap<char, Pair>);
 
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 437e11b5..7ee1d77c 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3173,8 +3173,7 @@ pub mod insert {
                 let on_auto_pair = doc
                     .auto_pairs(cx.editor)
                     .and_then(|pairs| pairs.get(prev))
-                    .and_then(|pair| if pair.close == curr { Some(pair) } else { None })
-                    .is_some();
+                    .map_or(false, |pair| pair.open == prev && pair.close == curr);
 
                 let local_offs = if on_auto_pair {
                     let inner_indent = indent.clone() + doc.indent_style.as_str();

From 3fe3f2c4ee1c483ad2d1f31dc34e33f15fc977db Mon Sep 17 00:00:00 2001
From: Yevgnen <Yevgnen@users.noreply.github.com>
Date: Thu, 29 Dec 2022 23:24:03 +0800
Subject: [PATCH 692/884] Update `emacs` theme diff colors (#5334)

---
 runtime/themes/emacs.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/themes/emacs.toml b/runtime/themes/emacs.toml
index cc725df8..b3a46b92 100644
--- a/runtime/themes/emacs.toml
+++ b/runtime/themes/emacs.toml
@@ -72,9 +72,9 @@
 "ui.cursorline.primary" = { bg = "darkseagreen2" }
 "ui.cursorline.secondary" = { bg = "darkseagreen2" }
 
-"diff.plus" = { fg = "#22aa22", bg = "#eeffee" }
-"diff.delta" = { fg = "#aaaa22", bg = "#ffffcc" }
-"diff.minus" = { fg = "#aa2222", bg = "#ffdddd" }
+"diff.plus" = { fg = "green3" }
+"diff.delta" = { fg = "orange2" }
+"diff.minus" = { fg = "red2" }
 
 "error" = { fg = "red1" }
 "warning" = { fg = "dark_orange" }

From 9d15b852093480d852e47dd9f0157828c2130298 Mon Sep 17 00:00:00 2001
From: willful759 <30967965+willful759@users.noreply.github.com>
Date: Thu, 29 Dec 2022 09:51:23 -0600
Subject: [PATCH 693/884] Reload language config with `:config-reload` (#5239)

---
 helix-term/src/application.rs | 57 +++++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 23 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 5f013b9a..83e853b1 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -397,38 +397,49 @@ impl Application {
         self.editor.refresh_config();
     }
 
+    /// refresh language config after config change
+    fn refresh_language_config(&mut self) -> Result<(), Error> {
+        let syntax_config = helix_core::config::user_syntax_loader()
+            .map_err(|err| anyhow::anyhow!("Failed to load language config: {}", err))?;
+
+        self.syn_loader = std::sync::Arc::new(syntax::Loader::new(syntax_config));
+        for document in self.editor.documents.values_mut() {
+            document.detect_language(self.syn_loader.clone());
+        }
+
+        Ok(())
+    }
+
     /// Refresh theme after config change
-    fn refresh_theme(&mut self, config: &Config) {
+    fn refresh_theme(&mut self, config: &Config) -> Result<(), Error> {
         if let Some(theme) = config.theme.clone() {
             let true_color = self.true_color();
-            match self.theme_loader.load(&theme) {
-                Ok(theme) => {
-                    if true_color || theme.is_16_color() {
-                        self.editor.set_theme(theme);
-                    } else {
-                        self.editor
-                            .set_error("theme requires truecolor support, which is not available");
-                    }
-                }
-                Err(err) => {
-                    let err_string = format!("failed to load theme `{}` - {}", theme, err);
-                    self.editor.set_error(err_string);
-                }
+            let theme = self
+                .theme_loader
+                .load(&theme)
+                .map_err(|err| anyhow::anyhow!("Failed to load theme `{}`: {}", theme, err))?;
+
+            if true_color || theme.is_16_color() {
+                self.editor.set_theme(theme);
+            } else {
+                anyhow::bail!("theme requires truecolor support, which is not available")
             }
         }
+
+        Ok(())
     }
 
     fn refresh_config(&mut self) {
-        match Config::load_default() {
-            Ok(config) => {
-                self.refresh_theme(&config);
+        let mut refresh_config = || -> Result<(), Error> {
+            let default_config = Config::load_default()
+                .map_err(|err| anyhow::anyhow!("Failed to load config: {}", err))?;
+            self.refresh_language_config()?;
+            self.refresh_theme(&default_config)?;
+            Ok(())
+        };
 
-                // Store new config
-                self.config.store(Arc::new(config));
-            }
-            Err(err) => {
-                self.editor.set_error(err.to_string());
-            }
+        if let Err(err) = refresh_config() {
+            self.editor.set_error(err.to_string());
         }
     }
 

From 6c9541148873ff5350bf082ace3b04f2efe52dcd Mon Sep 17 00:00:00 2001
From: iobtl <59901837+iobtl@users.noreply.github.com>
Date: Fri, 30 Dec 2022 00:13:06 +0800
Subject: [PATCH 694/884] Expand `~` when parsing file paths in `:open` (#5329)

---
 helix-term/src/commands/typed.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index c2ca1a47..5c0cd654 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -65,6 +65,7 @@ fn open(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) ->
     ensure!(!args.is_empty(), "wrong argument count");
     for arg in args {
         let (path, pos) = args::parse_file(arg);
+        let path = helix_core::path::expand_tilde(&path);
         // If the path is a directory, open a file picker on that directory and update the status
         // message
         if let Ok(true) = std::fs::canonicalize(&path).map(|p| p.is_dir()) {

From 6f8f9cac9a05bb986a3b5d141104563de3528e29 Mon Sep 17 00:00:00 2001
From: k12ish <45272873+k12ish@users.noreply.github.com>
Date: Fri, 30 Dec 2022 14:09:15 +0000
Subject: [PATCH 695/884] Add bash syntax highlighting for `.bash_aliases`
 (#5347)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 53f65be7..75ab4951 100644
--- a/languages.toml
+++ b/languages.toml
@@ -537,7 +537,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-ruby", rev = "4c600
 name = "bash"
 scope = "source.bash"
 injection-regex = "(shell|bash|zsh|sh)"
-file-types = ["sh", "bash", "zsh", ".bash_login", ".bash_logout", ".bash_profile", ".bashrc", ".profile", ".zshenv", ".zlogin", ".zlogout", ".zprofile", ".zshrc", "APKBUILD", "PKGBUILD", "eclass", "ebuild", "bazelrc"]
+file-types = ["sh", "bash", "zsh", ".bash_login", ".bash_logout", ".bash_profile", ".bashrc", ".profile", ".zshenv", ".zlogin", ".zlogout", ".zprofile", ".zshrc", "APKBUILD", "PKGBUILD", "eclass", "ebuild", "bazelrc", ".bash_aliases"]
 shebangs = ["sh", "bash", "dash", "zsh"]
 roots = []
 comment-token = "#"

From b813b1a659e39fbe4c1a757ec837a132c6fadbf9 Mon Sep 17 00:00:00 2001
From: mrjerzy <36932167+mrjerzy@users.noreply.github.com>
Date: Fri, 30 Dec 2022 15:11:06 +0100
Subject: [PATCH 696/884] Add tutor example for WORDS (#5304)

---
 runtime/tutor | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/runtime/tutor b/runtime/tutor
index 408f7451..8336a516 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -271,17 +271,17 @@ _________________________________________________________________
  whitespace, whereas words can be separated by other characters
  in addition to whitespace.
 
- All of these motions select the text they traverse.
-
-
-
-
-
-
-
-
-
-
+ 1. Move the cursor to the beginning of the line marked with '-->'.
+ 2. Type w repeatedly to select individual words until you
+    reach the end of the line.
+ 3. Note that 'one-of-a-kind' required 7 keystrokes to be
+    traversed. '"modal"' required 3 keystrokes.
+ 4. Move the cursor back to beginning of the line marked '-->'.
+ 5. Type W repeatedly to select individual WORDS.
+ 6. Note that 'one-of-a-kind' and '"modal"' have been selected
+    both with one keystroke each.
+
+--> Helix is a one-of-a-kind "modal" text editor
 
 
 =================================================================

From 63dcaae1b9083396fb3faaef9eaa2421f7e48fb9 Mon Sep 17 00:00:00 2001
From: jliaoh <48660001+hunterliao29@users.noreply.github.com>
Date: Fri, 30 Dec 2022 09:15:30 -0500
Subject: [PATCH 697/884] Fix theme inheritance for default themes (#5218)

---
 helix-view/src/theme.rs | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index b2c8a79f..cb0d3ac4 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -14,15 +14,23 @@ use toml::{map::Map, Value};
 use crate::graphics::UnderlineStyle;
 pub use crate::graphics::{Color, Modifier, Style};
 
+pub static DEFAULT_THEME_DATA: Lazy<Value> = Lazy::new(|| {
+    toml::from_slice(include_bytes!("../../theme.toml")).expect("Failed to parse default theme")
+});
+
+pub static BASE16_DEFAULT_THEME_DATA: Lazy<Value> = Lazy::new(|| {
+    toml::from_slice(include_bytes!("../../base16_theme.toml"))
+        .expect("Failed to parse base 16 default theme")
+});
+
 pub static DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| Theme {
     name: "default".into(),
-    ..toml::from_slice(include_bytes!("../../theme.toml")).expect("Failed to parse default theme")
+    ..Theme::from(DEFAULT_THEME_DATA.clone())
 });
 
 pub static BASE16_DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| Theme {
-    name: "base16_theme".into(),
-    ..toml::from_slice(include_bytes!("../../base16_theme.toml"))
-        .expect("Failed to parse base 16 default theme")
+    name: "base16_default".into(),
+    ..Theme::from(BASE16_DEFAULT_THEME_DATA.clone())
 });
 
 #[derive(Clone, Debug)]
@@ -78,11 +86,16 @@ impl Loader {
                 )
             })?;
 
-            let parent_theme_toml = self.load_theme(
-                parent_theme_name,
-                base_them_name,
-                base_them_name == parent_theme_name,
-            )?;
+            let parent_theme_toml = match parent_theme_name {
+                // load default themes's toml from const.
+                "default" => DEFAULT_THEME_DATA.clone(),
+                "base16_default" => BASE16_DEFAULT_THEME_DATA.clone(),
+                _ => self.load_theme(
+                    parent_theme_name,
+                    base_them_name,
+                    base_them_name == parent_theme_name,
+                )?,
+            };
 
             self.merge_themes(parent_theme_toml, theme_toml)
         } else {

From c9ed42cdec95b67b0d0ed15218daff37358ca86f Mon Sep 17 00:00:00 2001
From: Nick <sop.theteachr@gmail.com>
Date: Sat, 31 Dec 2022 19:48:14 +0530
Subject: [PATCH 698/884] Add a status line element that shows just the
 basename of the file (#5318)

---
 book/src/configuration.md       |  1 +
 helix-term/src/ui/statusline.rs | 21 +++++++++++++++++++++
 helix-view/src/editor.rs        |  5 ++++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 0890d283..a35482e6 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -97,6 +97,7 @@ The following statusline elements can be configured:
 | `mode` | The current editor mode (`mode.normal`/`mode.insert`/`mode.select`) |
 | `spinner` | A progress spinner indicating LSP activity |
 | `file-name` | The path/name of the opened file |
+| `file-base-name` | The basename of the opened file |
 | `file-encoding` | The encoding of the opened file if it differs from UTF-8 |
 | `file-line-ending` | The file line endings (CRLF or LF) |
 | `total-line-numbers` | The total line numbers of the opened file |
diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index 501faea3..a25b4540 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -139,6 +139,7 @@ where
     match element_id {
         helix_view::editor::StatusLineElement::Mode => render_mode,
         helix_view::editor::StatusLineElement::Spinner => render_lsp_spinner,
+        helix_view::editor::StatusLineElement::FileBaseName => render_file_base_name,
         helix_view::editor::StatusLineElement::FileName => render_file_name,
         helix_view::editor::StatusLineElement::FileEncoding => render_file_encoding,
         helix_view::editor::StatusLineElement::FileLineEnding => render_file_line_ending,
@@ -426,6 +427,26 @@ where
     write(context, title, None);
 }
 
+fn render_file_base_name<F>(context: &mut RenderContext, write: F)
+where
+    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
+{
+    let title = {
+        let rel_path = context.doc.relative_path();
+        let path = rel_path
+            .as_ref()
+            .and_then(|p| p.as_path().file_name().map(|s| s.to_string_lossy()))
+            .unwrap_or_else(|| SCRATCH_BUFFER_NAME.into());
+        format!(
+            " {}{} ",
+            path,
+            if context.doc.is_modified() { "[+]" } else { "" }
+        )
+    };
+
+    write(context, title, None);
+}
+
 fn render_separator<F>(context: &mut RenderContext, write: F)
 where
     F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index c13a6673..3521077e 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -314,7 +314,10 @@ pub enum StatusLineElement {
     /// The LSP activity spinner
     Spinner,
 
-    /// The file nane/path, including a dirty flag if it's unsaved
+    /// The base file name, including a dirty flag if it's unsaved
+    FileBaseName,
+
+    /// The relative file path, including a dirty flag if it's unsaved
     FileName,
 
     /// The file encoding

From 1b1755240db1ca01cbe1371a5b4ac58b68615382 Mon Sep 17 00:00:00 2001
From: Gabriel Dinner-David <82682503+gabydd@users.noreply.github.com>
Date: Sat, 31 Dec 2022 07:23:55 -0700
Subject: [PATCH 699/884] fix(commands): extend_line to proper line when count
 and current line selected (#5288)

---
 helix-term/src/commands.rs        | 19 ++++++--------
 helix-term/tests/test/commands.rs | 43 +++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 7ee1d77c..09c2e5df 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2053,16 +2053,10 @@ fn extend_line_impl(cx: &mut Context, extend: Extend) {
     let selection = doc.selection(view.id).clone().transform(|range| {
         let (start_line, end_line) = range.line_range(text.slice(..));
 
-        let start = text.line_to_char(match extend {
-            Extend::Above => start_line.saturating_sub(count - 1),
-            Extend::Below => start_line,
-        });
+        let start = text.line_to_char(start_line);
         let end = text.line_to_char(
-            match extend {
-                Extend::Above => end_line + 1, // the start of next line
-                Extend::Below => end_line + count,
-            }
-            .min(text.len_lines()),
+            (end_line + 1) // newline of end_line
+                .min(text.len_lines()),
         );
 
         // extend to previous/next line if current line is selected
@@ -2076,8 +2070,11 @@ fn extend_line_impl(cx: &mut Context, extend: Extend) {
             }
         } else {
             match extend {
-                Extend::Above => (end, start),
-                Extend::Below => (start, end),
+                Extend::Above => (end, text.line_to_char(start_line.saturating_sub(count - 1))),
+                Extend::Below => (
+                    start,
+                    text.line_to_char((end_line + count).min(text.len_lines())),
+                ),
             }
         };
 
diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index 95bd95b7..6e7275f5 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -311,3 +311,46 @@ async fn test_undo_redo() -> anyhow::Result<()> {
 
     Ok(())
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_extend_line() -> anyhow::Result<()> {
+    // extend with line selected then count
+    test((
+        platform_line(indoc! {"\
+            #[l|]#orem
+            ipsum
+            dolor
+            
+            "})
+        .as_str(),
+        "x2x",
+        platform_line(indoc! {"\
+            #[lorem
+            ipsum
+            dolor
+            |]#
+            "})
+        .as_str(),
+    ))
+    .await?;
+
+    // extend with count on partial selection
+    test((
+        platform_line(indoc! {"\
+            #[l|]#orem
+            ipsum
+            
+            "})
+        .as_str(),
+        "2x",
+        platform_line(indoc! {"\
+            #[lorem
+            ipsum
+            |]#
+            "})
+        .as_str(),
+    ))
+    .await?;
+
+    Ok(())
+}

From febe1a5172f346bcb52138e1f9c3d16c212d5a3c Mon Sep 17 00:00:00 2001
From: Jonathan LEI <me@xjonathan.dev>
Date: Sun, 1 Jan 2023 02:30:17 +0900
Subject: [PATCH 700/884] Fix comment token for sshclientconfig (#5351)

---
 languages.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/languages.toml b/languages.toml
index 75ab4951..9ad46a0b 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1579,6 +1579,7 @@ name = "sshclientconfig"
 scope = "source.sshclientconfig"
 file-types = [{ suffix = ".ssh/config" }, { suffix = "/etc/ssh/ssh_config" }]
 roots = []
+comment-token = "#"
 
 [[grammar]]
 name = "sshclientconfig"

From d6704ed11735283a777d0980afa29dc201765fdd Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 2 Jan 2023 10:12:32 -0600
Subject: [PATCH 701/884] flake: Fix devshell for darwin hosts (#5368)

Runs of `cargo build` would fail with `ld: framework not found
CoreFoundation` inside a devshell (`nix develop`) on a Darwin host.

This is fixed with two changes:

* Including the `CoreFoundation` package within the devshell's
  derivation.
* Switching from `value` to `eval` so that we append to the `RUSTFLAGS`
  environment variable rather than overwriting it. `numtide/devshell`
  already exposes the `Library/Frameworks` path within the devshell
  derivation but it was being overwritten by the manual setting of
  `RUSTFLAGS` in `env`.
---
 flake.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index fe1c6b44..673f3cf6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -82,7 +82,8 @@
           packages = with common.pkgs;
             [lld_13 cargo-flamegraph rust-analyzer]
             ++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) cargo-tarpaulin)
-            ++ (lib.optional stdenv.isLinux lldb);
+            ++ (lib.optional stdenv.isLinux lldb)
+            ++ (lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation);
           env = [
             {
               name = "HELIX_RUNTIME";
@@ -94,10 +95,10 @@
             }
             {
               name = "RUSTFLAGS";
-              value =
+              eval =
                 if common.pkgs.stdenv.isLinux
-                then "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment"
-                else "";
+                then "$RUSTFLAGS\" -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment\""
+                else "$RUSTFLAGS";
             }
           ];
         };

From d4565b4404cabc522bd60822abd374755581d751 Mon Sep 17 00:00:00 2001
From: blt__ <63462729+blt-r@users.noreply.github.com>
Date: Mon, 2 Jan 2023 21:48:09 +0400
Subject: [PATCH 702/884] Mention the icon in README.md (#5370)

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b06e8222..e4683d35 100644
--- a/README.md
+++ b/README.md
@@ -112,6 +112,7 @@ If installing from source, to use Helix in desktop environments that supports [X
 
 ```bash
 cp contrib/Helix.desktop ~/.local/share/applications
+cp contrib/helix.png ~/.local/share/icons
 ```
 
 To use another terminal than the default, you will need to modify the `.desktop` file. For example, to use `kitty`:
@@ -121,8 +122,6 @@ sed -i "s|Exec=hx %F|Exec=kitty hx %F|g" ~/.local/share/applications/Helix.deskt
 sed -i "s|Terminal=true|Terminal=false|g" ~/.local/share/applications/Helix.desktop
 ```
 
-Please note: there is no icon for Helix yet, so the system default will be used.
-
 ## macOS
 
 Helix can be installed on macOS through homebrew:

From d6d6267378df482e532a07e136b3c17c02a59bd0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 21:07:25 -0600
Subject: [PATCH 703/884] build(deps): bump once_cell from 1.16.0 to 1.17.0
 (#5373)

Bumps [once_cell](https://github.com/matklad/once_cell) from 1.16.0 to 1.17.0.
- [Release notes](https://github.com/matklad/once_cell/releases)
- [Changelog](https://github.com/matklad/once_cell/blob/master/CHANGELOG.md)
- [Commits](https://github.com/matklad/once_cell/compare/v1.16.0...v1.17.0)

---
updated-dependencies:
- dependency-name: once_cell
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock              | 4 ++--
 helix-core/Cargo.toml   | 2 +-
 helix-loader/Cargo.toml | 2 +-
 helix-term/Cargo.toml   | 2 +-
 helix-view/Cargo.toml   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 96c39fd5..25bed596 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1585,9 +1585,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
+checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
 
 [[package]]
 name = "parking_lot"
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 31b6546f..5cdc95e7 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -26,7 +26,7 @@ unicode-general-category = "0.6"
 # slab = "0.4.2"
 slotmap = "1.0"
 tree-sitter = "0.20"
-once_cell = "1.16"
+once_cell = "1.17"
 arc-swap = "1"
 regex = "1"
 bitflags = "1.3"
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index 760205e1..a3d14584 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -19,7 +19,7 @@ serde = { version = "1.0", features = ["derive"] }
 toml = "0.5"
 etcetera = "0.4"
 tree-sitter = "0.20"
-once_cell = "1.16"
+once_cell = "1.17"
 log = "0.4"
 
 # TODO: these two should be on !wasm32 only
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 9f2e5188..17541fb8 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -35,7 +35,7 @@ helix-vcs = { version = "0.6", path = "../helix-vcs" }
 helix-loader = { version = "0.6", path = "../helix-loader" }
 
 anyhow = "1"
-once_cell = "1.16"
+once_cell = "1.17"
 
 which = "4.2"
 
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 13d5da0e..35d23258 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -24,7 +24,7 @@ crossterm = { version = "0.25", optional = true }
 helix-vcs = { version = "0.6", path = "../helix-vcs" }
 
 # Conversion traits
-once_cell = "1.16"
+once_cell = "1.17"
 url = "2"
 
 arc-swap = { version = "1.5.1" }

From 8079abffc350121cb7fbceea646093e6d688a85f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 21:09:50 -0600
Subject: [PATCH 704/884] build(deps): bump ropey from 1.5.1-alpha to 1.5.1
 (#5374)

Bumps [ropey](https://github.com/cessen/ropey) from 1.5.1-alpha to 1.5.1.
- [Release notes](https://github.com/cessen/ropey/releases)
- [Changelog](https://github.com/cessen/ropey/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cessen/ropey/commits/v1.5.1)

---
updated-dependencies:
- dependency-name: ropey
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 4 ++--
 helix-core/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 25bed596..1b713793 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1783,9 +1783,9 @@ dependencies = [
 
 [[package]]
 name = "ropey"
-version = "1.5.1-alpha"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "917e62c0dee8926492dd13164b3cefaad2b0e03ab49f48c0d41635797a7409b3"
+checksum = "a4f832915525613e83f275694cb8c184f5df13ca26a9ef0ea6ce736921964c8e"
 dependencies = [
  "smallvec",
  "str_indices",
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 5cdc95e7..ca6cd51e 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -17,7 +17,7 @@ integration = []
 [dependencies]
 helix-loader = { version = "0.6", path = "../helix-loader" }
 
-ropey = { version = "1.5.1-alpha", default-features = false, features = ["simd"] }
+ropey = { version = "1.5.1", default-features = false, features = ["simd"] }
 smallvec = "1.10"
 smartstring = "1.0.1"
 unicode-segmentation = "1.10"

From 88f9cdeb3dd5181465435ed6b90e11a36e2f1597 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 21:14:50 -0600
Subject: [PATCH 705/884] build(deps): bump git-repository from 0.30.2 to
 0.31.0 (#5376)

Bumps [git-repository](https://github.com/Byron/gitoxide) from 0.30.2 to 0.31.0.
- [Release notes](https://github.com/Byron/gitoxide/releases)
- [Changelog](https://github.com/Byron/gitoxide/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Byron/gitoxide/compare/git-repository-v0.30.2...git-repository-v0.31.0)

---
updated-dependencies:
- dependency-name: git-repository
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock           | 84 ++++++++++++++++++++++----------------------
 helix-vcs/Cargo.toml |  2 +-
 2 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1b713793..68d35106 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -541,9 +541,9 @@ dependencies = [
 
 [[package]]
 name = "git-actor"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7def29b46f25f95a2e196323cfb336eae9965e0a3c7c35ad9506f295c3a8e234"
+checksum = "599cb75eb7c3bf03149b7ab70c66bc0b9a432a092b1154b49d21b49fc7e4bd93"
 dependencies = [
  "bstr 1.0.1",
  "btoi",
@@ -555,9 +555,9 @@ dependencies = [
 
 [[package]]
 name = "git-attributes"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0affaed361598fdd06b2a184a566c823d0b5817b09f576018248fb267193a96"
+checksum = "f8013dfce47c1e29236d732308933e2c77af5355ec5105755d26faf7764d3f7b"
 dependencies = [
  "bstr 1.0.1",
  "compact_str",
@@ -589,18 +589,18 @@ dependencies = [
 
 [[package]]
 name = "git-command"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6b98a6312fef79b326c0a6e15d576c2bd30f7f9d0b7964998d166049e0d7b9e"
+checksum = "215145cc1686a45bc6f9872b153a0d3f3c40a1b94173a928325e1b53dfa5e2af"
 dependencies = [
  "bstr 1.0.1",
 ]
 
 [[package]]
 name = "git-config"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ff189268cfb19d5151529ac30b6b708072ebfa1075643d785232675456ec320"
+checksum = "d1b95089db62159d7d24c13ddfb4bf949c508521d0bb25331744ef500295ceb8"
 dependencies = [
  "bstr 1.0.1",
  "git-config-value",
@@ -632,9 +632,9 @@ dependencies = [
 
 [[package]]
 name = "git-credentials"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28da3d029be10258007699d002321a3b1ebe45e67b0e140a4cf464ba3ee79b32"
+checksum = "97cd6bbe001afd6356b35ef13f2a6b0f0abc0133d1b2ecaec1033bdd769616d6"
 dependencies = [
  "bstr 1.0.1",
  "git-command",
@@ -660,9 +660,9 @@ dependencies = [
 
 [[package]]
 name = "git-diff"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f30011a43908645c492dfbea7b004e10528be6bd667bf5cdc12ff4297fe1e3c"
+checksum = "a8ae775956f509fe115b173d79e539f97539d40c1d5c5c63a61d10eaf79c857a"
 dependencies = [
  "git-hash",
  "git-object",
@@ -672,9 +672,9 @@ dependencies = [
 
 [[package]]
 name = "git-discover"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93c244b1cf7cf45501116e948506c25324e33ddc613f00557ff5bfded2132009"
+checksum = "aab20ca6af631c2bb10d59e63377ca9c9c74908586e6018ab15377967432e68b"
 dependencies = [
  "bstr 1.0.1",
  "git-hash",
@@ -686,9 +686,9 @@ dependencies = [
 
 [[package]]
 name = "git-features"
-version = "0.25.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f98e6ede7b790dfba16bf3c62861ae75c3719485d675b522cf7d7e748a4011c"
+checksum = "5ff74064fa007c5beefa89a64bb72834f32b3c497750a56c79c6802bbdb311f9"
 dependencies = [
  "crc32fast",
  "flate2",
@@ -733,9 +733,9 @@ dependencies = [
 
 [[package]]
 name = "git-index"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20627f71f3a884b0ae50f9f3abb3a07d9b117d06e16110d25b85da4d71d478c0"
+checksum = "430f5d9302a2dd5e50b6b04a3b9d0df6b3423e55908fde18333fe9cd51312027"
 dependencies = [
  "atoi",
  "bitflags",
@@ -766,9 +766,9 @@ dependencies = [
 
 [[package]]
 name = "git-mailmap"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90e3ee2eaeebda8a12d17f4d99dff5b19d81536476020bcebb99ee121820466"
+checksum = "396cef08d4ec18ea35fed043f5b003e46957603a01349dd429a4773c146fefca"
 dependencies = [
  "bstr 1.0.1",
  "git-actor",
@@ -777,9 +777,9 @@ dependencies = [
 
 [[package]]
 name = "git-object"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35b658f1e3e149d88cb3e0a2234be749bb0cab65887405975dbe6f3190cf6571"
+checksum = "fad6c2ddb376b99172dc8b651e11be4cb49cef423de4fad563ebbda4fee3fcf6"
 dependencies = [
  "bstr 1.0.1",
  "btoi",
@@ -796,9 +796,9 @@ dependencies = [
 
 [[package]]
 name = "git-odb"
-version = "0.38.1"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55333419bbb25aa6d39e29155f747ad8e1777fe385f70f447be9d680824d23dd"
+checksum = "84ea84e47ae48b95e108664d2991013507694b1b722e4183ed1c9309251b9b10"
 dependencies = [
  "arc-swap",
  "git-features",
@@ -814,9 +814,9 @@ dependencies = [
 
 [[package]]
 name = "git-pack"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed3c9af66949553af9795b9eac9d450a5bdceee9959352cda468997ddce0d2f"
+checksum = "692e9c78c57212aa76c71be9a319f80d42fe8191735b3aff5b97b8f034295774"
 dependencies = [
  "bytesize",
  "clru",
@@ -872,9 +872,9 @@ dependencies = [
 
 [[package]]
 name = "git-ref"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c97b7d719e4320179fb64d081016e7faca56fed4a8ee4cf84e4697faad9235a3"
+checksum = "b351af399166a5506369e36389d6b9aee744cfa672d0e2ea93d2b01223b1cfbe"
 dependencies = [
  "git-actor",
  "git-features",
@@ -891,9 +891,9 @@ dependencies = [
 
 [[package]]
 name = "git-refspec"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d478e9db0956d60cd386d3348b5ec093e3ae613105a7a75ff6084b886254eba8"
+checksum = "fcf699f310ba8530708f599b1ce730eb557ebc0af1a1a57b882ce3d685571092"
 dependencies = [
  "bstr 1.0.1",
  "git-hash",
@@ -905,9 +905,9 @@ dependencies = [
 
 [[package]]
 name = "git-repository"
-version = "0.30.2"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1925a65a9fea6587e969a7a85cb239c8e1e438cf6dc520406df1b4c9d0e83bdc"
+checksum = "d9e21852e326233c5f3f034a44b66215c166506e5ccf227de7e28ccdfbcfb47a"
 dependencies = [
  "git-actor",
  "git-attributes",
@@ -948,9 +948,9 @@ dependencies = [
 
 [[package]]
 name = "git-revision"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7516b1db551756b4d3176c4b7d18ccc4b79d35dcc5e74f768c90f5bb11bb6c9"
+checksum = "8b64c0d2e37eb24c8897d11a2f77371a817c3d40dc744d4a2f048f33236eef6b"
 dependencies = [
  "bstr 1.0.1",
  "git-date",
@@ -989,9 +989,9 @@ dependencies = [
 
 [[package]]
 name = "git-traverse"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5141dde56d0c4861193c760e01fb61c7e03a32d0840ba93a0ac1c597588d4d"
+checksum = "43b91ed45b561161ba56b85a83865825b7d17a6b1c6f981e831a78b93cf2cc5f"
 dependencies = [
  "git-hash",
  "git-hashtable",
@@ -1001,9 +1001,9 @@ dependencies = [
 
 [[package]]
 name = "git-url"
-version = "0.12.2"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8651924c9692a778f09141ca44d1bf2dada229fe9b240f1ff1bdecd9621a1a93"
+checksum = "c85af407ed0dbb8d8da2a7241827d2fd5681186d9dab3570fc8dd8d6152ec48f"
 dependencies = [
  "bstr 1.0.1",
  "git-features",
@@ -1025,9 +1025,9 @@ dependencies = [
 
 [[package]]
 name = "git-worktree"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17d748c54c3d904c914b987654a1416c7abe7cf048fdc83eeae69e6ac3d76f20"
+checksum = "ffc45b5ac445d0f8719def12303f037966f810cf399ebe0daf29217865df9a49"
 dependencies = [
  "bstr 1.0.1",
  "git-attributes",
@@ -1666,9 +1666,9 @@ dependencies = [
 
 [[package]]
 name = "prodash"
-version = "22.1.0"
+version = "23.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38e2b91fcc982d0d8ae5e9d477561c73e09c24c5c19bac4858e202f6f065a13e"
+checksum = "5d8c414345b4a98cbcd0e8d8829c8f54b47a7ed4fb771c45b7c5c6c0ae23dc4c"
 dependencies = [
  "bytesize",
  "dashmap",
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index 8e713638..3fd25655 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -16,7 +16,7 @@ helix-core = { version = "0.6", path = "../helix-core" }
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
 parking_lot = "0.12"
 
-git-repository = { version = "0.30", default-features = false , optional = true }
+git-repository = { version = "0.31", default-features = false , optional = true }
 imara-diff = "0.1.5"
 
 log = "0.4"

From a895a4e53a81da2264fee9dd3b5eec313794ea0b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 21:29:23 -0600
Subject: [PATCH 706/884] build(deps): bump arc-swap from 1.5.1 to 1.6.0
 (#5375)

Bumps [arc-swap](https://github.com/vorner/arc-swap) from 1.5.1 to 1.6.0.
- [Release notes](https://github.com/vorner/arc-swap/releases)
- [Changelog](https://github.com/vorner/arc-swap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vorner/arc-swap/compare/v1.5.1...v1.6.0)

---
updated-dependencies:
- dependency-name: arc-swap
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 4 ++--
 helix-term/Cargo.toml | 2 +-
 helix-view/Cargo.toml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 68d35106..8dd65615 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -57,9 +57,9 @@ checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
 
 [[package]]
 name = "arc-swap"
-version = "1.5.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164"
+checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
 
 [[package]]
 name = "atoi"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 17541fb8..895a0882 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -45,7 +45,7 @@ crossterm = { version = "0.25", features = ["event-stream"] }
 signal-hook = "0.3"
 tokio-stream = "0.1"
 futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
-arc-swap = { version = "1.5.1" }
+arc-swap = { version = "1.6.0" }
 
 # Logging
 fern = "0.6"
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 35d23258..46fd5810 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -27,7 +27,7 @@ helix-vcs = { version = "0.6", path = "../helix-vcs" }
 once_cell = "1.17"
 url = "2"
 
-arc-swap = { version = "1.5.1" }
+arc-swap = { version = "1.6.0" }
 
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
 tokio-stream = "0.1"

From 0dbee9590baed10bef3c6c32420b8a5802204657 Mon Sep 17 00:00:00 2001
From: Ethan Kiang <zyklotomic@users.noreply.github.com>
Date: Tue, 3 Jan 2023 21:24:48 +0800
Subject: [PATCH 707/884] Fix language config reload logic (#5381)

---
 helix-term/src/application.rs    | 10 ++++++++--
 helix-term/src/commands/typed.rs |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 83e853b1..729047e3 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -403,6 +403,7 @@ impl Application {
             .map_err(|err| anyhow::anyhow!("Failed to load language config: {}", err))?;
 
         self.syn_loader = std::sync::Arc::new(syntax::Loader::new(syntax_config));
+        self.editor.syn_loader = self.syn_loader.clone();
         for document in self.editor.documents.values_mut() {
             document.detect_language(self.syn_loader.clone());
         }
@@ -438,8 +439,13 @@ impl Application {
             Ok(())
         };
 
-        if let Err(err) = refresh_config() {
-            self.editor.set_error(err.to_string());
+        match refresh_config() {
+            Ok(_) => {
+                self.editor.set_status("Config refreshed");
+            }
+            Err(err) => {
+                self.editor.set_error(err.to_string());
+            }
         }
     }
 
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 5c0cd654..de24c4fb 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1797,7 +1797,7 @@ fn run_shell_command(
     let shell = &cx.editor.config().shell;
     let (output, success) = shell_impl(shell, &args.join(" "), None)?;
     if success {
-        cx.editor.set_status("Command succeed");
+        cx.editor.set_status("Command succeeded");
     } else {
         cx.editor.set_error("Command failed");
     }

From 5627c604effd36a4ecd319518e9315e34cfbb0be Mon Sep 17 00:00:00 2001
From: Julius de Bruijn <bruijn@prisma.io>
Date: Fri, 6 Jan 2023 12:12:51 +0000
Subject: [PATCH 708/884] Update Prisma tree-sitter for view support (#5417)

---
 languages.toml                        | 2 +-
 runtime/queries/prisma/highlights.scm | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 9ad46a0b..5f16d17b 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1677,7 +1677,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "prisma"
-source = { git = "https://github.com/victorhqc/tree-sitter-prisma", rev = "17a59236ac25413b81b1613ea6ba5d8d52d7cd6c" }
+source = { git = "https://github.com/victorhqc/tree-sitter-prisma", rev = "eca2596a355b1a9952b4f80f8f9caed300a272b5" }
 
 [[language]]
 name = "clojure"
diff --git a/runtime/queries/prisma/highlights.scm b/runtime/queries/prisma/highlights.scm
index b5c0c4ae..dfd5292d 100644
--- a/runtime/queries/prisma/highlights.scm
+++ b/runtime/queries/prisma/highlights.scm
@@ -8,6 +8,7 @@
 
 (arguments) @variable.other.member
 (model_declaration (identifier) @type)
+(view_declaration (identifier) @type)
 
 [
  "datasource"
@@ -15,6 +16,7 @@
  "generator"
  "model"
  "type"
+ "view"
 ] @keyword
 
 [

From 0196cccb0cfdba6a7fd9630549522f7052ad8853 Mon Sep 17 00:00:00 2001
From: Howard Halim <howardhalim@gmail.com>
Date: Fri, 6 Jan 2023 07:44:34 -0500
Subject: [PATCH 709/884] Fix typos (#5415)

---
 book/src/keymap.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 272c758b..b38a1f44 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -323,8 +323,8 @@ Mappings in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaire
 | `[p`     | Go to previous paragraph                     | `goto_prev_paragraph` |
 | `]g`     | Go to next change                            | `goto_next_change`    |
 | `[g`     | Go to previous change                        | `goto_prev_change`    |
-| `]G`     | Go to first change                           | `goto_first_change`   |
-| `[G`     | Go to last change                            | `goto_last_change`    |
+| `[G`     | Go to first change                           | `goto_first_change`   |
+| `]G`     | Go to last change                            | `goto_last_change`    |
 | `[Space` | Add newline above                            | `add_newline_above`   |
 | `]Space` | Add newline below                            | `add_newline_below`   |
 

From 532531c3ca3824fa8fa75ca802d3b60e69e72682 Mon Sep 17 00:00:00 2001
From: Dom H <dom@hxy.io>
Date: Fri, 6 Jan 2023 12:59:13 +0000
Subject: [PATCH 710/884] Add runtime queries for `tfvars` (based on `hcl`)
 (#5396)

---
 book/src/generated/lang-support.md    | 2 +-
 runtime/queries/tfvars/folds.scm      | 1 +
 runtime/queries/tfvars/highlights.scm | 1 +
 runtime/queries/tfvars/indents.scm    | 1 +
 runtime/queries/tfvars/injections.scm | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/tfvars/folds.scm
 create mode 100644 runtime/queries/tfvars/highlights.scm
 create mode 100644 runtime/queries/tfvars/indents.scm
 create mode 100644 runtime/queries/tfvars/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 1a3aed79..babb9941 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -120,7 +120,7 @@
 | swift | ✓ |  |  | `sourcekit-lsp` |
 | tablegen | ✓ | ✓ | ✓ |  |
 | task | ✓ |  |  |  |
-| tfvars |  |  |  | `terraform-ls` |
+| tfvars | ✓ |  | ✓ | `terraform-ls` |
 | toml | ✓ |  |  | `taplo` |
 | tsq | ✓ |  |  |  |
 | tsx | ✓ | ✓ | ✓ | `typescript-language-server` |
diff --git a/runtime/queries/tfvars/folds.scm b/runtime/queries/tfvars/folds.scm
new file mode 100644
index 00000000..0e5ffc2d
--- /dev/null
+++ b/runtime/queries/tfvars/folds.scm
@@ -0,0 +1 @@
+; inherits: hcl
diff --git a/runtime/queries/tfvars/highlights.scm b/runtime/queries/tfvars/highlights.scm
new file mode 100644
index 00000000..0e5ffc2d
--- /dev/null
+++ b/runtime/queries/tfvars/highlights.scm
@@ -0,0 +1 @@
+; inherits: hcl
diff --git a/runtime/queries/tfvars/indents.scm b/runtime/queries/tfvars/indents.scm
new file mode 100644
index 00000000..0e5ffc2d
--- /dev/null
+++ b/runtime/queries/tfvars/indents.scm
@@ -0,0 +1 @@
+; inherits: hcl
diff --git a/runtime/queries/tfvars/injections.scm b/runtime/queries/tfvars/injections.scm
new file mode 100644
index 00000000..0e5ffc2d
--- /dev/null
+++ b/runtime/queries/tfvars/injections.scm
@@ -0,0 +1 @@
+; inherits: hcl

From f2fff9b9c95759385dbb5c84846ec35c9159d215 Mon Sep 17 00:00:00 2001
From: Jens Getreu <getreu@web.de>
Date: Fri, 6 Jan 2023 14:59:55 +0200
Subject: [PATCH 711/884] Autumn theme: adjust selection background (#5397)

---
 runtime/themes/autumn.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/themes/autumn.toml b/runtime/themes/autumn.toml
index 501675da..935c72e5 100644
--- a/runtime/themes/autumn.toml
+++ b/runtime/themes/autumn.toml
@@ -75,7 +75,7 @@ my_black      = "#212121" # Cursorline
 my_gray0      = "#262626" # Default Background
 my_gray1      = "#2b2b2b" # Ruler
 my_gray2      = "#323232" # Lighter Background (Used for status bars, line number and folding marks)
-my_gray3      = "#505050" # Selection Background
+my_gray3      = "#3d3d3d" # Selection Background
 my_gray4      = "#7c7c7c" # Comments, Invisibles, Line Highlighting
 my_gray5      = "#a8a8a8" # Dark Foreground (Used for status bars)
 my_gray6      = "#c8c8c8" # Light Foreground (Not often used)

From bd5da8010899ef55b1c4c623ebebbb91e99dcbb4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Jan 2023 18:58:51 -0600
Subject: [PATCH 712/884] build(deps): bump tokio from 1.23.0 to 1.23.1 (#5434)

Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.23.0 to 1.23.1.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.23.0...tokio-1.23.1)

---
updated-dependencies:
- dependency-name: tokio
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8dd65615..329a24c8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2121,9 +2121,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.23.0"
+version = "1.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46"
+checksum = "38a54aca0c15d014013256222ba0ebed095673f89345dd79119d912eb561b7a8"
 dependencies = [
  "autocfg",
  "bytes",

From 9f0d939f2535187157c0aae324c6614872684354 Mon Sep 17 00:00:00 2001
From: OwO Swordsman <29553973+OwOSwordsman@users.noreply.github.com>
Date: Sat, 7 Jan 2023 00:35:37 -0500
Subject: [PATCH 713/884] Add GitHub themes (#5353)

* Add github themes

* Increase contrast for hover and completion menus

* Use inheritance for the GitHub themes
---
 runtime/themes/github_dark.toml               | 228 ++++++++++++++++++
 runtime/themes/github_dark_colorblind.toml    | 151 ++++++++++++
 runtime/themes/github_dark_dimmed.toml        | 151 ++++++++++++
 runtime/themes/github_dark_high_contrast.toml | 151 ++++++++++++
 runtime/themes/github_dark_tritanopia.toml    | 151 ++++++++++++
 runtime/themes/github_light.toml              | 228 ++++++++++++++++++
 runtime/themes/github_light_colorblind.toml   | 151 ++++++++++++
 .../themes/github_light_high_contrast.toml    | 151 ++++++++++++
 runtime/themes/github_light_tritanopia.toml   | 151 ++++++++++++
 9 files changed, 1513 insertions(+)
 create mode 100644 runtime/themes/github_dark.toml
 create mode 100644 runtime/themes/github_dark_colorblind.toml
 create mode 100644 runtime/themes/github_dark_dimmed.toml
 create mode 100644 runtime/themes/github_dark_high_contrast.toml
 create mode 100644 runtime/themes/github_dark_tritanopia.toml
 create mode 100644 runtime/themes/github_light.toml
 create mode 100644 runtime/themes/github_light_colorblind.toml
 create mode 100644 runtime/themes/github_light_high_contrast.toml
 create mode 100644 runtime/themes/github_light_tritanopia.toml

diff --git a/runtime/themes/github_dark.toml b/runtime/themes/github_dark.toml
new file mode 100644
index 00000000..cdb97aa3
--- /dev/null
+++ b/runtime/themes/github_dark.toml
@@ -0,0 +1,228 @@
+# Author : OwOSwordsman <owoswordsman@gmail.com>
+# An unofficial GitHub theme, generated using colors from: https://primer.style/primitives/colors
+# Credit goes to the original VSCode theme: https://github.com/primer/github-vscode-theme
+# Only the Light and Dark variants were specifically tested
+
+attribute = "fg.default"
+keyword = "scale.red.3"
+"keyword.directive" = "scale.red.3"          # -- preprocessor comments (#if in C)
+namespace = "scale.orange.2"
+punctuation = "fg.default"
+"punctuation.delimiter" = "fg.default"
+operator = "scale.red.3"
+special = "scale.blue.1"
+"variable.other.member" = "fg.default"
+variable = "fg.default"
+"variable.parameter" = "scale.orange.2"
+"variable.builtin" = "scale.red.3"
+type = "scale.orange.2"
+"type.builtin" = "scale.blue.2"
+constructor = "scale.purple.2"
+function = "scale.purple.2"
+"function.macro" = "scale.purple.2"
+tag = "scale.green.1"
+comment = "fg.muted"
+constant = "scale.blue.2"
+"constant.builtin" = "scale.blue.2"
+string = "scale.blue.1"
+"constant.numeric" = "scale.blue.2"
+"constant.character.escape" = "scale.blue.2"
+# used for lifetimes
+label = "scale.red.3"
+
+"markup.heading" = "scale.blue.2"
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.link.url" = { modifiers = ["underlined"] }
+"markup.link.text" = { fg = "scale.blue.1", modifiers = ["underlined"] }
+"markup.raw" = "scale.blue.2"
+
+"diff.plus" = "open.fg"
+"diff.minus" = "closed.fg"
+"diff.delta" = "attention.fg"
+
+"ui.background" = { bg = "canvas.default" }
+"ui.background.separator" = { fg = "fg.subtle" }
+"ui.linenr" = { fg = "fg.subtle" }
+"ui.linenr.selected" = { fg = "fg.default" }
+"ui.statusline" = { fg = "fg.muted", bg = "scale.gray.7" }
+"ui.statusline.active" = { fg = "fg.default", bg = "canvas.default", underline = { color = "scale.coral.3", style = "line" } }
+"ui.statusline.normal" = { fg = "fg.default", bg = "accent.muted" }
+"ui.statusline.insert" = { fg = "fg.default", bg = "attention.muted" }
+"ui.statusline.select" = { fg = "fg.default", bg = "sponsors.muted" }
+"ui.popup" = { bg = "scale.gray.8" }
+"ui.popup.info" = { fg = "fg.default", bg = "canvas.overlay" }
+"ui.window" = { fg = "border.default" }
+"ui.help" = { fg = "fg.default", bg = "canvas.overlay" }
+
+"ui.text" = { fg = "fg.muted" }
+"ui.text.focus" = { fg = "fg.default" }
+"ui.text.inactive" = "fg.subtle"
+"ui.virtual" = { fg = "scale.gray.6" }
+
+"ui.selection" = { bg = "scale.blue.8" }
+"ui.selection.primary" = { bg = "scale.blue.7" }
+"ui.cursor.match" = { fg = "attention.fg", modifiers = [
+    "bold",
+], underline = { style = "line" } }
+"ui.cursor" = { modifiers = ["reversed"] }
+"ui.cursorline.primary" = { bg = "canvas.subtle" }
+
+"ui.menu" = { fg = "fg.default", bg = "canvas.overlay" }
+"ui.menu.selected" = { bg = "scale.gray.4" }
+"ui.menu.scroll" = { fg = "scale.gray.5", bg = "canvas.overlay" }
+
+"diagnostic.hint" = { underline = { color = "success.fg", style = "curl" } }
+"diagnostic.info" = { underline = { color = "accent.fg", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "attention.fg", style = "curl" } }
+"diagnostic.error" = { underline = { color = "danger.fg", style = "curl" } }
+
+hint = "success.fg"
+info = "accent.fg"
+warning = "attention.fg"
+error = "danger.fg"
+
+[palette]
+"accent.emphasis" = "#1f6feb"
+"accent.fg" = "#58a6ff"
+"accent.muted" = "#388bfd66"
+"accent.subtle" = "#388bfd26"
+"attention.emphasis" = "#9e6a03"
+"attention.fg" = "#d29922"
+"attention.muted" = "#bb800966"
+"attention.subtle" = "#bb800926"
+"border.default" = "#30363d"
+"border.muted" = "#21262d"
+"border.subtle" = "#f0f6fc1a"
+"canvas.default" = "#0d1117"
+"canvas.inset" = "#010409"
+"canvas.overlay" = "#161b22"
+"canvas.subtle" = "#161b22"
+"closed.emphasis" = "#da3633"
+"closed.fg" = "#f85149"
+"closed.muted" = "#f8514966"
+"closed.subtle" = "#f8514926"
+"danger.emphasis" = "#da3633"
+"danger.fg" = "#f85149"
+"danger.muted" = "#f8514966"
+"danger.subtle" = "#f8514926"
+"done.emphasis" = "#8957e5"
+"done.fg" = "#a371f7"
+"done.muted" = "#a371f766"
+"done.subtle" = "#a371f726"
+"fg.default" = "#c9d1d9"
+"fg.muted" = "#8b949e"
+"fg.onEmphasis" = "#ffffff"
+"fg.subtle" = "#6e7681"
+"neutral.emphasis" = "#6e7681"
+"neutral.emphasisPlus" = "#6e7681"
+"neutral.muted" = "#6e768166"
+"neutral.subtle" = "#6e76811a"
+"open.emphasis" = "#238636"
+"open.fg" = "#3fb950"
+"open.muted" = "#2ea04366"
+"open.subtle" = "#2ea04326"
+"scale.black" = "#010409"
+"scale.blue.0" = "#cae8ff"
+"scale.blue.1" = "#a5d6ff"
+"scale.blue.2" = "#79c0ff"
+"scale.blue.3" = "#58a6ff"
+"scale.blue.4" = "#388bfd"
+"scale.blue.5" = "#1f6feb"
+"scale.blue.6" = "#1158c7"
+"scale.blue.7" = "#0d419d"
+"scale.blue.8" = "#0c2d6b"
+"scale.blue.9" = "#051d4d"
+"scale.coral.0" = "#ffddd2"
+"scale.coral.1" = "#ffc2b2"
+"scale.coral.2" = "#ffa28b"
+"scale.coral.3" = "#f78166"
+"scale.coral.4" = "#ea6045"
+"scale.coral.5" = "#cf462d"
+"scale.coral.6" = "#ac3220"
+"scale.coral.7" = "#872012"
+"scale.coral.8" = "#640d04"
+"scale.coral.9" = "#460701"
+"scale.gray.0" = "#f0f6fc"
+"scale.gray.1" = "#c9d1d9"
+"scale.gray.2" = "#b1bac4"
+"scale.gray.3" = "#8b949e"
+"scale.gray.4" = "#6e7681"
+"scale.gray.5" = "#484f58"
+"scale.gray.6" = "#30363d"
+"scale.gray.7" = "#21262d"
+"scale.gray.8" = "#161b22"
+"scale.gray.9" = "#0d1117"
+"scale.green.0" = "#aff5b4"
+"scale.green.1" = "#7ee787"
+"scale.green.2" = "#56d364"
+"scale.green.3" = "#3fb950"
+"scale.green.4" = "#2ea043"
+"scale.green.5" = "#238636"
+"scale.green.6" = "#196c2e"
+"scale.green.7" = "#0f5323"
+"scale.green.8" = "#033a16"
+"scale.green.9" = "#04260f"
+"scale.orange.0" = "#ffdfb6"
+"scale.orange.1" = "#ffc680"
+"scale.orange.2" = "#ffa657"
+"scale.orange.3" = "#f0883e"
+"scale.orange.4" = "#db6d28"
+"scale.orange.5" = "#bd561d"
+"scale.orange.6" = "#9b4215"
+"scale.orange.7" = "#762d0a"
+"scale.orange.8" = "#5a1e02"
+"scale.orange.9" = "#3d1300"
+"scale.pink.0" = "#ffdaec"
+"scale.pink.1" = "#ffbedd"
+"scale.pink.2" = "#ff9bce"
+"scale.pink.3" = "#f778ba"
+"scale.pink.4" = "#db61a2"
+"scale.pink.5" = "#bf4b8a"
+"scale.pink.6" = "#9e3670"
+"scale.pink.7" = "#7d2457"
+"scale.pink.8" = "#5e103e"
+"scale.pink.9" = "#42062a"
+"scale.purple.0" = "#eddeff"
+"scale.purple.1" = "#e2c5ff"
+"scale.purple.2" = "#d2a8ff"
+"scale.purple.3" = "#bc8cff"
+"scale.purple.4" = "#a371f7"
+"scale.purple.5" = "#8957e5"
+"scale.purple.6" = "#6e40c9"
+"scale.purple.7" = "#553098"
+"scale.purple.8" = "#3c1e70"
+"scale.purple.9" = "#271052"
+"scale.red.0" = "#ffdcd7"
+"scale.red.1" = "#ffc1ba"
+"scale.red.2" = "#ffa198"
+"scale.red.3" = "#ff7b72"
+"scale.red.4" = "#f85149"
+"scale.red.5" = "#da3633"
+"scale.red.6" = "#b62324"
+"scale.red.7" = "#8e1519"
+"scale.red.8" = "#67060c"
+"scale.red.9" = "#490202"
+"scale.white" = "#ffffff"
+"scale.yellow.0" = "#f8e3a1"
+"scale.yellow.1" = "#f2cc60"
+"scale.yellow.2" = "#e3b341"
+"scale.yellow.3" = "#d29922"
+"scale.yellow.4" = "#bb8009"
+"scale.yellow.5" = "#9e6a03"
+"scale.yellow.6" = "#845306"
+"scale.yellow.7" = "#693e00"
+"scale.yellow.8" = "#4b2900"
+"scale.yellow.9" = "#341a00"
+"severe.emphasis" = "#bd561d"
+"severe.fg" = "#db6d28"
+"severe.muted" = "#db6d2866"
+"severe.subtle" = "#db6d2826"
+"sponsors.emphasis" = "#bf4b8a"
+"sponsors.fg" = "#db61a2"
+"sponsors.muted" = "#db61a266"
+"sponsors.subtle" = "#db61a226"
+"success.emphasis" = "#238636"
+"success.fg" = "#3fb950"
+"success.muted" = "#2ea04366"
+"success.subtle" = "#2ea04326"
diff --git a/runtime/themes/github_dark_colorblind.toml b/runtime/themes/github_dark_colorblind.toml
new file mode 100644
index 00000000..afc80692
--- /dev/null
+++ b/runtime/themes/github_dark_colorblind.toml
@@ -0,0 +1,151 @@
+# Author : OwOSwordsman <owoswordsman@gmail.com>
+# An unofficial GitHub theme, generated using colors from: https://primer.style/primitives/colors
+# Credit goes to the original VSCode theme: https://github.com/primer/github-vscode-theme
+# Only the Light and Dark variants were specifically tested
+
+inherits = "github_dark"
+
+[palette]
+"accent.emphasis" = "#1f6feb"
+"accent.fg" = "#58a6ff"
+"accent.muted" = "#388bfd66"
+"accent.subtle" = "#388bfd26"
+"attention.emphasis" = "#9e6a03"
+"attention.fg" = "#d29922"
+"attention.muted" = "#bb800966"
+"attention.subtle" = "#bb800926"
+"border.default" = "#30363d"
+"border.muted" = "#21262d"
+"border.subtle" = "#f0f6fc1a"
+"canvas.default" = "#0d1117"
+"canvas.inset" = "#010409"
+"canvas.overlay" = "#161b22"
+"canvas.subtle" = "#161b22"
+"closed.emphasis" = "#6e7681"
+"closed.fg" = "#8b949e"
+"closed.muted" = "#6e768166"
+"closed.subtle" = "#6e76811a"
+"danger.emphasis" = "#b76100"
+"danger.fg" = "#d47616"
+"danger.muted" = "#d4761666"
+"danger.subtle" = "#d4761626"
+"done.emphasis" = "#8957e5"
+"done.fg" = "#a371f7"
+"done.muted" = "#a371f766"
+"done.subtle" = "#a371f726"
+"fg.default" = "#c9d1d9"
+"fg.muted" = "#8b949e"
+"fg.onEmphasis" = "#ffffff"
+"fg.subtle" = "#6e7681"
+"neutral.emphasis" = "#6e7681"
+"neutral.emphasisPlus" = "#6e7681"
+"neutral.muted" = "#6e768166"
+"neutral.subtle" = "#6e76811a"
+"open.emphasis" = "#b76100"
+"open.fg" = "#ec8e2c"
+"open.muted" = "#d4761666"
+"open.subtle" = "#d4761626"
+"scale.black" = "#010409"
+"scale.blue.0" = "#cae8ff"
+"scale.blue.1" = "#a5d6ff"
+"scale.blue.2" = "#79c0ff"
+"scale.blue.3" = "#58a6ff"
+"scale.blue.4" = "#388bfd"
+"scale.blue.5" = "#1f6feb"
+"scale.blue.6" = "#1158c7"
+"scale.blue.7" = "#0d419d"
+"scale.blue.8" = "#0c2d6b"
+"scale.blue.9" = "#051d4d"
+"scale.coral.0" = "#ffddd2"
+"scale.coral.1" = "#ffc2b2"
+"scale.coral.2" = "#ffa28b"
+"scale.coral.3" = "#f78166"
+"scale.coral.4" = "#ea6045"
+"scale.coral.5" = "#cf462d"
+"scale.coral.6" = "#ac3220"
+"scale.coral.7" = "#872012"
+"scale.coral.8" = "#640d04"
+"scale.coral.9" = "#460701"
+"scale.gray.0" = "#f0f6fc"
+"scale.gray.1" = "#c9d1d9"
+"scale.gray.2" = "#b1bac4"
+"scale.gray.3" = "#8b949e"
+"scale.gray.4" = "#6e7681"
+"scale.gray.5" = "#484f58"
+"scale.gray.6" = "#30363d"
+"scale.gray.7" = "#21262d"
+"scale.gray.8" = "#161b22"
+"scale.gray.9" = "#0d1117"
+"scale.green.0" = "#cae8ff"
+"scale.green.1" = "#a5d6ff"
+"scale.green.2" = "#79c0ff"
+"scale.green.3" = "#58a6ff"
+"scale.green.4" = "#388bfd"
+"scale.green.5" = "#1f6feb"
+"scale.green.6" = "#1158c7"
+"scale.green.7" = "#0d419d"
+"scale.green.8" = "#0c2d6b"
+"scale.green.9" = "#051d4d"
+"scale.orange.0" = "#ffe2bb"
+"scale.orange.1" = "#ffc981"
+"scale.orange.2" = "#fdac54"
+"scale.orange.3" = "#ec8e2c"
+"scale.orange.4" = "#d47616"
+"scale.orange.5" = "#b76100"
+"scale.orange.6" = "#914d04"
+"scale.orange.7" = "#6c3906"
+"scale.orange.8" = "#4e2906"
+"scale.orange.9" = "#331c04"
+"scale.pink.0" = "#ffdaec"
+"scale.pink.1" = "#ffbedd"
+"scale.pink.2" = "#ff9bce"
+"scale.pink.3" = "#f778ba"
+"scale.pink.4" = "#db61a2"
+"scale.pink.5" = "#bf4b8a"
+"scale.pink.6" = "#9e3670"
+"scale.pink.7" = "#7d2457"
+"scale.pink.8" = "#5e103e"
+"scale.pink.9" = "#42062a"
+"scale.purple.0" = "#eddeff"
+"scale.purple.1" = "#e2c5ff"
+"scale.purple.2" = "#d2a8ff"
+"scale.purple.3" = "#bc8cff"
+"scale.purple.4" = "#a371f7"
+"scale.purple.5" = "#8957e5"
+"scale.purple.6" = "#6e40c9"
+"scale.purple.7" = "#553098"
+"scale.purple.8" = "#3c1e70"
+"scale.purple.9" = "#271052"
+"scale.red.0" = "#ffe2bb"
+"scale.red.1" = "#ffc981"
+"scale.red.2" = "#fdac54"
+"scale.red.3" = "#ec8e2c"
+"scale.red.4" = "#d47616"
+"scale.red.5" = "#b76100"
+"scale.red.6" = "#914d04"
+"scale.red.7" = "#6c3906"
+"scale.red.8" = "#4e2906"
+"scale.red.9" = "#331c04"
+"scale.white" = "#ffffff"
+"scale.yellow.0" = "#f8e3a1"
+"scale.yellow.1" = "#f2cc60"
+"scale.yellow.2" = "#e3b341"
+"scale.yellow.3" = "#d29922"
+"scale.yellow.4" = "#bb8009"
+"scale.yellow.5" = "#9e6a03"
+"scale.yellow.6" = "#845306"
+"scale.yellow.7" = "#693e00"
+"scale.yellow.8" = "#4b2900"
+"scale.yellow.9" = "#341a00"
+"severe.emphasis" = "#b76100"
+"severe.fg" = "#d47616"
+"severe.muted" = "#d4761666"
+"severe.subtle" = "#d4761626"
+"sponsors.emphasis" = "#bf4b8a"
+"sponsors.fg" = "#db61a2"
+"sponsors.muted" = "#db61a266"
+"sponsors.subtle" = "#db61a226"
+"success.emphasis" = "#1f6feb"
+"success.fg" = "#58a6ff"
+"success.muted" = "#388bfd66"
+"success.subtle" = "#388bfd26"
diff --git a/runtime/themes/github_dark_dimmed.toml b/runtime/themes/github_dark_dimmed.toml
new file mode 100644
index 00000000..b8783d04
--- /dev/null
+++ b/runtime/themes/github_dark_dimmed.toml
@@ -0,0 +1,151 @@
+# Author : OwOSwordsman <owoswordsman@gmail.com>
+# An unofficial GitHub theme, generated using colors from: https://primer.style/primitives/colors
+# Credit goes to the original VSCode theme: https://github.com/primer/github-vscode-theme
+# Only the Light and Dark variants were specifically tested
+
+inherits = "github_dark"
+
+[palette]
+"accent.emphasis" = "#316dca"
+"accent.fg" = "#539bf5"
+"accent.muted" = "#4184e466"
+"accent.subtle" = "#4184e426"
+"attention.emphasis" = "#966600"
+"attention.fg" = "#c69026"
+"attention.muted" = "#ae7c1466"
+"attention.subtle" = "#ae7c1426"
+"border.default" = "#444c56"
+"border.muted" = "#373e47"
+"border.subtle" = "#cdd9e51a"
+"canvas.default" = "#22272e"
+"canvas.inset" = "#1c2128"
+"canvas.overlay" = "#2d333b"
+"canvas.subtle" = "#2d333b"
+"closed.emphasis" = "#c93c37"
+"closed.fg" = "#e5534b"
+"closed.muted" = "#e5534b66"
+"closed.subtle" = "#e5534b26"
+"danger.emphasis" = "#c93c37"
+"danger.fg" = "#e5534b"
+"danger.muted" = "#e5534b66"
+"danger.subtle" = "#e5534b26"
+"done.emphasis" = "#8256d0"
+"done.fg" = "#986ee2"
+"done.muted" = "#986ee266"
+"done.subtle" = "#986ee226"
+"fg.default" = "#adbac7"
+"fg.muted" = "#768390"
+"fg.onEmphasis" = "#cdd9e5"
+"fg.subtle" = "#636e7b"
+"neutral.emphasis" = "#636e7b"
+"neutral.emphasisPlus" = "#636e7b"
+"neutral.muted" = "#636e7b66"
+"neutral.subtle" = "#636e7b1a"
+"open.emphasis" = "#347d39"
+"open.fg" = "#57ab5a"
+"open.muted" = "#46954a66"
+"open.subtle" = "#46954a26"
+"scale.black" = "#1c2128"
+"scale.blue.0" = "#c6e6ff"
+"scale.blue.1" = "#96d0ff"
+"scale.blue.2" = "#6cb6ff"
+"scale.blue.3" = "#539bf5"
+"scale.blue.4" = "#4184e4"
+"scale.blue.5" = "#316dca"
+"scale.blue.6" = "#255ab2"
+"scale.blue.7" = "#1b4b91"
+"scale.blue.8" = "#143d79"
+"scale.blue.9" = "#0f2d5c"
+"scale.coral.0" = "#ffdacf"
+"scale.coral.1" = "#ffb9a5"
+"scale.coral.2" = "#f79981"
+"scale.coral.3" = "#ec775c"
+"scale.coral.4" = "#de5b41"
+"scale.coral.5" = "#c2442d"
+"scale.coral.6" = "#a93524"
+"scale.coral.7" = "#8d291b"
+"scale.coral.8" = "#771d13"
+"scale.coral.9" = "#5d1008"
+"scale.gray.0" = "#cdd9e5"
+"scale.gray.1" = "#adbac7"
+"scale.gray.2" = "#909dab"
+"scale.gray.3" = "#768390"
+"scale.gray.4" = "#636e7b"
+"scale.gray.5" = "#545d68"
+"scale.gray.6" = "#444c56"
+"scale.gray.7" = "#373e47"
+"scale.gray.8" = "#2d333b"
+"scale.gray.9" = "#22272e"
+"scale.green.0" = "#b4f1b4"
+"scale.green.1" = "#8ddb8c"
+"scale.green.2" = "#6bc46d"
+"scale.green.3" = "#57ab5a"
+"scale.green.4" = "#46954a"
+"scale.green.5" = "#347d39"
+"scale.green.6" = "#2b6a30"
+"scale.green.7" = "#245829"
+"scale.green.8" = "#1b4721"
+"scale.green.9" = "#113417"
+"scale.orange.0" = "#ffddb0"
+"scale.orange.1" = "#ffbc6f"
+"scale.orange.2" = "#f69d50"
+"scale.orange.3" = "#e0823d"
+"scale.orange.4" = "#cc6b2c"
+"scale.orange.5" = "#ae5622"
+"scale.orange.6" = "#94471b"
+"scale.orange.7" = "#7f3913"
+"scale.orange.8" = "#682d0f"
+"scale.orange.9" = "#4d210c"
+"scale.pink.0" = "#ffd7eb"
+"scale.pink.1" = "#ffb3d8"
+"scale.pink.2" = "#fc8dc7"
+"scale.pink.3" = "#e275ad"
+"scale.pink.4" = "#c96198"
+"scale.pink.5" = "#ae4c82"
+"scale.pink.6" = "#983b6e"
+"scale.pink.7" = "#7e325a"
+"scale.pink.8" = "#69264a"
+"scale.pink.9" = "#551639"
+"scale.purple.0" = "#eedcff"
+"scale.purple.1" = "#dcbdfb"
+"scale.purple.2" = "#dcbdfb"
+"scale.purple.3" = "#b083f0"
+"scale.purple.4" = "#986ee2"
+"scale.purple.5" = "#8256d0"
+"scale.purple.6" = "#6b44bc"
+"scale.purple.7" = "#5936a2"
+"scale.purple.8" = "#472c82"
+"scale.purple.9" = "#352160"
+"scale.red.0" = "#ffd8d3"
+"scale.red.1" = "#ffb8b0"
+"scale.red.2" = "#ff938a"
+"scale.red.3" = "#f47067"
+"scale.red.4" = "#e5534b"
+"scale.red.5" = "#c93c37"
+"scale.red.6" = "#ad2e2c"
+"scale.red.7" = "#922323"
+"scale.red.8" = "#78191b"
+"scale.red.9" = "#5d0f12"
+"scale.white" = "#cdd9e5"
+"scale.yellow.0" = "#fbe090"
+"scale.yellow.1" = "#eac55f"
+"scale.yellow.2" = "#daaa3f"
+"scale.yellow.3" = "#c69026"
+"scale.yellow.4" = "#ae7c14"
+"scale.yellow.5" = "#966600"
+"scale.yellow.6" = "#805400"
+"scale.yellow.7" = "#6c4400"
+"scale.yellow.8" = "#593600"
+"scale.yellow.9" = "#452700"
+"severe.emphasis" = "#ae5622"
+"severe.fg" = "#cc6b2c"
+"severe.muted" = "#cc6b2c66"
+"severe.subtle" = "#cc6b2c26"
+"sponsors.emphasis" = "#ae4c82"
+"sponsors.fg" = "#c96198"
+"sponsors.muted" = "#c9619866"
+"sponsors.subtle" = "#c9619826"
+"success.emphasis" = "#347d39"
+"success.fg" = "#57ab5a"
+"success.muted" = "#46954a66"
+"success.subtle" = "#46954a26"
diff --git a/runtime/themes/github_dark_high_contrast.toml b/runtime/themes/github_dark_high_contrast.toml
new file mode 100644
index 00000000..59d2c8f2
--- /dev/null
+++ b/runtime/themes/github_dark_high_contrast.toml
@@ -0,0 +1,151 @@
+# Author : OwOSwordsman <owoswordsman@gmail.com>
+# An unofficial GitHub theme, generated using colors from: https://primer.style/primitives/colors
+# Credit goes to the original VSCode theme: https://github.com/primer/github-vscode-theme
+# Only the Light and Dark variants were specifically tested
+
+inherits = "github_dark"
+
+[palette]
+"accent.emphasis" = "#409eff"
+"accent.fg" = "#71b7ff"
+"accent.muted" = "#409eff"
+"accent.subtle" = "#409eff26"
+"attention.emphasis" = "#e09b13"
+"attention.fg" = "#f0b72f"
+"attention.muted" = "#e09b13"
+"attention.subtle" = "#e09b1326"
+"border.default" = "#7a828e"
+"border.muted" = "#7a828e"
+"border.subtle" = "#7a828e"
+"canvas.default" = "#0a0c10"
+"canvas.inset" = "#010409"
+"canvas.overlay" = "#272b33"
+"canvas.subtle" = "#272b33"
+"closed.emphasis" = "#ff6a69"
+"closed.fg" = "#ff6a69"
+"closed.muted" = "#ff6a6966"
+"closed.subtle" = "#ff6a6926"
+"danger.emphasis" = "#ff6a69"
+"danger.fg" = "#ff6a69"
+"danger.muted" = "#ff6a69"
+"danger.subtle" = "#ff6a6926"
+"done.emphasis" = "#b87fff"
+"done.fg" = "#b780ff"
+"done.muted" = "#b780ff"
+"done.subtle" = "#b780ff26"
+"fg.default" = "#f0f3f6"
+"fg.muted" = "#f0f3f6"
+"fg.onEmphasis" = "#0a0c10"
+"fg.subtle" = "#9ea7b3"
+"neutral.emphasis" = "#9ea7b3"
+"neutral.emphasisPlus" = "#ffffff"
+"neutral.muted" = "#9ea7b366"
+"neutral.subtle" = "#9ea7b31a"
+"open.emphasis" = "#09b43a"
+"open.fg" = "#26cd4d"
+"open.muted" = "#09b43a66"
+"open.subtle" = "#09b43a26"
+"scale.black" = "#010409"
+"scale.blue.0" = "#caeaff"
+"scale.blue.1" = "#addcff"
+"scale.blue.2" = "#91cbff"
+"scale.blue.3" = "#71b7ff"
+"scale.blue.4" = "#409eff"
+"scale.blue.5" = "#409eff"
+"scale.blue.6" = "#318bf8"
+"scale.blue.7" = "#2672f3"
+"scale.blue.8" = "#1e60d5"
+"scale.blue.9" = "#194fb1"
+"scale.coral.0" = "#ffded4"
+"scale.coral.1" = "#ffcbb9"
+"scale.coral.2" = "#ffb39b"
+"scale.coral.3" = "#ff967d"
+"scale.coral.4" = "#fc704f"
+"scale.coral.5" = "#fc704f"
+"scale.coral.6" = "#f75133"
+"scale.coral.7" = "#e03b21"
+"scale.coral.8" = "#c62612"
+"scale.coral.9" = "#a91500"
+"scale.gray.0" = "#ffffff"
+"scale.gray.1" = "#f0f3f6"
+"scale.gray.2" = "#d9dee3"
+"scale.gray.3" = "#bdc4cc"
+"scale.gray.4" = "#9ea7b3"
+"scale.gray.5" = "#7a828e"
+"scale.gray.6" = "#525964"
+"scale.gray.7" = "#272b33"
+"scale.gray.8" = "#272b33"
+"scale.gray.9" = "#0a0c10"
+"scale.green.0" = "#acf7b6"
+"scale.green.1" = "#72f088"
+"scale.green.2" = "#4ae168"
+"scale.green.3" = "#26cd4d"
+"scale.green.4" = "#09b43a"
+"scale.green.5" = "#09b43a"
+"scale.green.6" = "#02a232"
+"scale.green.7" = "#008c2c"
+"scale.green.8" = "#007728"
+"scale.green.9" = "#006222"
+"scale.orange.0" = "#ffe1b4"
+"scale.orange.1" = "#ffcf86"
+"scale.orange.2" = "#ffb757"
+"scale.orange.3" = "#fe9a2d"
+"scale.orange.4" = "#e7811d"
+"scale.orange.5" = "#e7811d"
+"scale.orange.6" = "#d57014"
+"scale.orange.7" = "#bf5e0a"
+"scale.orange.8" = "#a74c00"
+"scale.orange.9" = "#8f3c00"
+"scale.pink.0" = "#ffdceb"
+"scale.pink.1" = "#ffc7e1"
+"scale.pink.2" = "#ffadd4"
+"scale.pink.3" = "#ff8dc7"
+"scale.pink.4" = "#ef6eb1"
+"scale.pink.5" = "#ef6eb1"
+"scale.pink.6" = "#e456a3"
+"scale.pink.7" = "#d23d91"
+"scale.pink.8" = "#b72c7d"
+"scale.pink.9" = "#9c1d6a"
+"scale.purple.0" = "#f0dfff"
+"scale.purple.1" = "#e6ccff"
+"scale.purple.2" = "#dbb7ff"
+"scale.purple.3" = "#cb9eff"
+"scale.purple.4" = "#b780ff"
+"scale.purple.5" = "#b87fff"
+"scale.purple.6" = "#a66bff"
+"scale.purple.7" = "#954ffd"
+"scale.purple.8" = "#8031f7"
+"scale.purple.9" = "#6921d7"
+"scale.red.0" = "#ffdedb"
+"scale.red.1" = "#ffc9c7"
+"scale.red.2" = "#ffb1af"
+"scale.red.3" = "#ff9492"
+"scale.red.4" = "#ff6a69"
+"scale.red.5" = "#ff6a69"
+"scale.red.6" = "#ff4445"
+"scale.red.7" = "#e82a2f"
+"scale.red.8" = "#cc1421"
+"scale.red.9" = "#ad0116"
+"scale.white" = "#ffffff"
+"scale.yellow.0" = "#fbe59e"
+"scale.yellow.1" = "#fbd669"
+"scale.yellow.2" = "#f7c843"
+"scale.yellow.3" = "#f0b72f"
+"scale.yellow.4" = "#e09b13"
+"scale.yellow.5" = "#e09b13"
+"scale.yellow.6" = "#c88508"
+"scale.yellow.7" = "#ae7104"
+"scale.yellow.8" = "#945d02"
+"scale.yellow.9" = "#7b4900"
+"severe.emphasis" = "#e7811d"
+"severe.fg" = "#e7811d"
+"severe.muted" = "#e7811d"
+"severe.subtle" = "#e7811d26"
+"sponsors.emphasis" = "#ef6eb1"
+"sponsors.fg" = "#ef6eb1"
+"sponsors.muted" = "#ef6eb1"
+"sponsors.subtle" = "#ef6eb126"
+"success.emphasis" = "#09b43a"
+"success.fg" = "#26cd4d"
+"success.muted" = "#09b43a"
+"success.subtle" = "#09b43a26"
diff --git a/runtime/themes/github_dark_tritanopia.toml b/runtime/themes/github_dark_tritanopia.toml
new file mode 100644
index 00000000..d9221751
--- /dev/null
+++ b/runtime/themes/github_dark_tritanopia.toml
@@ -0,0 +1,151 @@
+# Author : OwOSwordsman <owoswordsman@gmail.com>
+# An unofficial GitHub theme, generated using colors from: https://primer.style/primitives/colors
+# Credit goes to the original VSCode theme: https://github.com/primer/github-vscode-theme
+# Only the Light and Dark variants were specifically tested
+
+inherits = "github_dark"
+
+[palette]
+"accent.emphasis" = "#1f6feb"
+"accent.fg" = "#58a6ff"
+"accent.muted" = "#388bfd66"
+"accent.subtle" = "#388bfd26"
+"attention.emphasis" = "#9e6a03"
+"attention.fg" = "#d29922"
+"attention.muted" = "#bb800966"
+"attention.subtle" = "#bb800926"
+"border.default" = "#30363d"
+"border.muted" = "#21262d"
+"border.subtle" = "#f0f6fc1a"
+"canvas.default" = "#0d1117"
+"canvas.inset" = "#010409"
+"canvas.overlay" = "#161b22"
+"canvas.subtle" = "#161b22"
+"closed.emphasis" = "#6e7681"
+"closed.fg" = "#8b949e"
+"closed.muted" = "#6e768166"
+"closed.subtle" = "#6e76811a"
+"danger.emphasis" = "#da3633"
+"danger.fg" = "#f85149"
+"danger.muted" = "#f8514966"
+"danger.subtle" = "#f8514926"
+"done.emphasis" = "#8957e5"
+"done.fg" = "#a371f7"
+"done.muted" = "#a371f766"
+"done.subtle" = "#a371f726"
+"fg.default" = "#c9d1d9"
+"fg.muted" = "#8b949e"
+"fg.onEmphasis" = "#ffffff"
+"fg.subtle" = "#6e7681"
+"neutral.emphasis" = "#6e7681"
+"neutral.emphasisPlus" = "#6e7681"
+"neutral.muted" = "#6e768166"
+"neutral.subtle" = "#6e76811a"
+"open.emphasis" = "#da3633"
+"open.fg" = "#ff7b72"
+"open.muted" = "#f8514966"
+"open.subtle" = "#f8514926"
+"scale.black" = "#010409"
+"scale.blue.0" = "#cae8ff"
+"scale.blue.1" = "#a5d6ff"
+"scale.blue.2" = "#79c0ff"
+"scale.blue.3" = "#58a6ff"
+"scale.blue.4" = "#388bfd"
+"scale.blue.5" = "#1f6feb"
+"scale.blue.6" = "#1158c7"
+"scale.blue.7" = "#0d419d"
+"scale.blue.8" = "#0c2d6b"
+"scale.blue.9" = "#051d4d"
+"scale.coral.0" = "#ffddd2"
+"scale.coral.1" = "#ffc2b2"
+"scale.coral.2" = "#ffa28b"
+"scale.coral.3" = "#f78166"
+"scale.coral.4" = "#ea6045"
+"scale.coral.5" = "#cf462d"
+"scale.coral.6" = "#ac3220"
+"scale.coral.7" = "#872012"
+"scale.coral.8" = "#640d04"
+"scale.coral.9" = "#460701"
+"scale.gray.0" = "#f0f6fc"
+"scale.gray.1" = "#c9d1d9"
+"scale.gray.2" = "#b1bac4"
+"scale.gray.3" = "#8b949e"
+"scale.gray.4" = "#6e7681"
+"scale.gray.5" = "#484f58"
+"scale.gray.6" = "#30363d"
+"scale.gray.7" = "#21262d"
+"scale.gray.8" = "#161b22"
+"scale.gray.9" = "#0d1117"
+"scale.green.0" = "#cae8ff"
+"scale.green.1" = "#a5d6ff"
+"scale.green.2" = "#79c0ff"
+"scale.green.3" = "#58a6ff"
+"scale.green.4" = "#388bfd"
+"scale.green.5" = "#1f6feb"
+"scale.green.6" = "#1158c7"
+"scale.green.7" = "#0d419d"
+"scale.green.8" = "#0c2d6b"
+"scale.green.9" = "#051d4d"
+"scale.orange.0" = "#ffdcd7"
+"scale.orange.1" = "#ffc1ba"
+"scale.orange.2" = "#ffa198"
+"scale.orange.3" = "#ff7b72"
+"scale.orange.4" = "#f85149"
+"scale.orange.5" = "#da3633"
+"scale.orange.6" = "#b62324"
+"scale.orange.7" = "#8e1519"
+"scale.orange.8" = "#67060c"
+"scale.orange.9" = "#490202"
+"scale.pink.0" = "#ffdaec"
+"scale.pink.1" = "#ffbedd"
+"scale.pink.2" = "#ff9bce"
+"scale.pink.3" = "#f778ba"
+"scale.pink.4" = "#db61a2"
+"scale.pink.5" = "#bf4b8a"
+"scale.pink.6" = "#9e3670"
+"scale.pink.7" = "#7d2457"
+"scale.pink.8" = "#5e103e"
+"scale.pink.9" = "#42062a"
+"scale.purple.0" = "#eddeff"
+"scale.purple.1" = "#e2c5ff"
+"scale.purple.2" = "#d2a8ff"
+"scale.purple.3" = "#bc8cff"
+"scale.purple.4" = "#a371f7"
+"scale.purple.5" = "#8957e5"
+"scale.purple.6" = "#6e40c9"
+"scale.purple.7" = "#553098"
+"scale.purple.8" = "#3c1e70"
+"scale.purple.9" = "#271052"
+"scale.red.0" = "#ffdcd7"
+"scale.red.1" = "#ffc1ba"
+"scale.red.2" = "#ffa198"
+"scale.red.3" = "#ff7b72"
+"scale.red.4" = "#f85149"
+"scale.red.5" = "#da3633"
+"scale.red.6" = "#b62324"
+"scale.red.7" = "#8e1519"
+"scale.red.8" = "#67060c"
+"scale.red.9" = "#490202"
+"scale.white" = "#ffffff"
+"scale.yellow.0" = "#f8e3a1"
+"scale.yellow.1" = "#f2cc60"
+"scale.yellow.2" = "#e3b341"
+"scale.yellow.3" = "#d29922"
+"scale.yellow.4" = "#bb8009"
+"scale.yellow.5" = "#9e6a03"
+"scale.yellow.6" = "#845306"
+"scale.yellow.7" = "#693e00"
+"scale.yellow.8" = "#4b2900"
+"scale.yellow.9" = "#341a00"
+"severe.emphasis" = "#da3633"
+"severe.fg" = "#f85149"
+"severe.muted" = "#f8514966"
+"severe.subtle" = "#f8514926"
+"sponsors.emphasis" = "#bf4b8a"
+"sponsors.fg" = "#db61a2"
+"sponsors.muted" = "#db61a266"
+"sponsors.subtle" = "#db61a226"
+"success.emphasis" = "#1f6feb"
+"success.fg" = "#58a6ff"
+"success.muted" = "#388bfd66"
+"success.subtle" = "#388bfd26"
diff --git a/runtime/themes/github_light.toml b/runtime/themes/github_light.toml
new file mode 100644
index 00000000..d9969729
--- /dev/null
+++ b/runtime/themes/github_light.toml
@@ -0,0 +1,228 @@
+# Author : OwOSwordsman <owoswordsman@gmail.com>
+# An unofficial GitHub theme, generated using colors from: https://primer.style/primitives/colors
+# Credit goes to the original VSCode theme: https://github.com/primer/github-vscode-theme
+# Only the Light and Dark variants were specifically tested
+
+attribute = "fg.default"
+keyword = "scale.red.5"
+"keyword.directive" = "scale.red.5"          # -- preprocessor comments (#if in C)
+namespace = "scale.orange.6"
+punctuation = "fg.default"
+"punctuation.delimiter" = "fg.default"
+operator = "scale.red.5"
+special = "scale.blue.8"
+"variable.other.member" = "fg.default"
+variable = "fg.default"
+"variable.parameter" = "scale.orange.6"
+"variable.builtin" = "scale.red.5"
+type = "scale.orange.6"
+"type.builtin" = "scale.blue.6"
+constructor = "done.fg"
+function = "done.fg"
+"function.macro" = "done.fg"
+tag = "scale.green.6"
+comment = "fg.muted"
+constant = "scale.blue.6"
+"constant.builtin" = "scale.blue.6"
+string = "scale.blue.8"
+"constant.numeric" = "scale.blue.6"
+"constant.character.escape" = "scale.blue.6"
+# used for lifetimes
+label = "scale.red.5"
+
+"markup.heading" = "scale.blue.6"
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.link.url" = { modifiers = ["underlined"] }
+"markup.link.text" = { fg = "scale.blue.8", modifiers = ["underlined"] }
+"markup.raw" = "scale.blue.6"
+
+"diff.plus" = "open.fg"
+"diff.minus" = "closed.fg"
+"diff.delta" = "attention.fg"
+
+"ui.background" = { bg = "canvas.default" }
+"ui.background.separator" = { fg = "fg.subtle" }
+"ui.linenr" = { fg = "fg.subtle" }
+"ui.linenr.selected" = { fg = "fg.default" }
+"ui.statusline" = { fg = "fg.muted", bg = "neutral.subtle" }
+"ui.statusline.active" = { fg = "fg.default", bg = "canvas.default", underline = { color = "scale.coral.3", style = "line" } }
+"ui.statusline.normal" = { fg = "fg.default", bg = "accent.muted" }
+"ui.statusline.insert" = { fg = "fg.default", bg = "attention.muted" }
+"ui.statusline.select" = { fg = "fg.default", bg = "sponsors.muted" }
+"ui.popup" = { bg = "scale.gray.0" }
+"ui.popup.info" = { fg = "fg.default", bg = "scale.gray.0" }
+"ui.window" = { fg = "border.default" }
+"ui.help" = { fg = "fg.default", bg = "scale.gray.0" }
+
+"ui.text" = { fg = "fg.muted" }
+"ui.text.focus" = { fg = "fg.default" }
+"ui.text.inactive" = "fg.subtle"
+"ui.virtual" = { fg = "scale.gray.2" }
+
+"ui.selection" = { bg = "scale.blue.0" }
+"ui.selection.primary" = { bg = "scale.blue.1" }
+"ui.cursor.match" = { fg = "attention.fg", modifiers = [
+    "bold",
+], underline = { style = "line" } }
+"ui.cursor" = { modifiers = ["reversed"] }
+"ui.cursorline.primary" = { bg = "canvas.subtle" }
+
+"ui.menu" = { fg = "fg.default", bg = "scale.gray.0" }
+"ui.menu.selected" = { bg = "scale.gray.1" }
+"ui.menu.scroll" = { fg = "scale.gray.2", bg = "scale.gray.0" }
+
+"diagnostic.hint" = { underline = { color = "success.fg", style = "curl" } }
+"diagnostic.info" = { underline = { color = "accent.fg", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "attention.fg", style = "curl" } }
+"diagnostic.error" = { underline = { color = "danger.fg", style = "curl" } }
+
+hint = "success.fg"
+info = "accent.fg"
+warning = "attention.fg"
+error = "danger.fg"
+
+[palette]
+"accent.emphasis" = "#0969da"
+"accent.fg" = "#0969da"
+"accent.muted" = "#54aeff66"
+"accent.subtle" = "#ddf4ff"
+"attention.emphasis" = "#bf8700"
+"attention.fg" = "#9a6700"
+"attention.muted" = "#d4a72c66"
+"attention.subtle" = "#fff8c5"
+"border.default" = "#d0d7de"
+"border.muted" = "#d8dee4"
+"border.subtle" = "#1b1f2426"
+"canvas.default" = "#ffffff"
+"canvas.inset" = "#f6f8fa"
+"canvas.overlay" = "#ffffff"
+"canvas.subtle" = "#f6f8fa"
+"closed.emphasis" = "#cf222e"
+"closed.fg" = "#cf222e"
+"closed.muted" = "#ff818266"
+"closed.subtle" = "#ffebe9"
+"danger.emphasis" = "#cf222e"
+"danger.fg" = "#cf222e"
+"danger.muted" = "#ff818266"
+"danger.subtle" = "#ffebe9"
+"done.emphasis" = "#8250df"
+"done.fg" = "#8250df"
+"done.muted" = "#c297ff66"
+"done.subtle" = "#fbefff"
+"fg.default" = "#24292f"
+"fg.muted" = "#57606a"
+"fg.onEmphasis" = "#ffffff"
+"fg.subtle" = "#6e7781"
+"neutral.emphasis" = "#6e7781"
+"neutral.emphasisPlus" = "#24292f"
+"neutral.muted" = "#afb8c133"
+"neutral.subtle" = "#eaeef280"
+"open.emphasis" = "#2da44e"
+"open.fg" = "#1a7f37"
+"open.muted" = "#4ac26b66"
+"open.subtle" = "#dafbe1"
+"scale.black" = "#1b1f24"
+"scale.blue.0" = "#ddf4ff"
+"scale.blue.1" = "#b6e3ff"
+"scale.blue.2" = "#80ccff"
+"scale.blue.3" = "#54aeff"
+"scale.blue.4" = "#218bff"
+"scale.blue.5" = "#0969da"
+"scale.blue.6" = "#0550ae"
+"scale.blue.7" = "#033d8b"
+"scale.blue.8" = "#0a3069"
+"scale.blue.9" = "#002155"
+"scale.coral.0" = "#fff0eb"
+"scale.coral.1" = "#ffd6cc"
+"scale.coral.2" = "#ffb4a1"
+"scale.coral.3" = "#fd8c73"
+"scale.coral.4" = "#ec6547"
+"scale.coral.5" = "#c4432b"
+"scale.coral.6" = "#9e2f1c"
+"scale.coral.7" = "#801f0f"
+"scale.coral.8" = "#691105"
+"scale.coral.9" = "#510901"
+"scale.gray.0" = "#f6f8fa"
+"scale.gray.1" = "#eaeef2"
+"scale.gray.2" = "#d0d7de"
+"scale.gray.3" = "#afb8c1"
+"scale.gray.4" = "#8c959f"
+"scale.gray.5" = "#6e7781"
+"scale.gray.6" = "#57606a"
+"scale.gray.7" = "#424a53"
+"scale.gray.8" = "#32383f"
+"scale.gray.9" = "#24292f"
+"scale.green.0" = "#dafbe1"
+"scale.green.1" = "#aceebb"
+"scale.green.2" = "#6fdd8b"
+"scale.green.3" = "#4ac26b"
+"scale.green.4" = "#2da44e"
+"scale.green.5" = "#1a7f37"
+"scale.green.6" = "#116329"
+"scale.green.7" = "#044f1e"
+"scale.green.8" = "#003d16"
+"scale.green.9" = "#002d11"
+"scale.orange.0" = "#fff1e5"
+"scale.orange.1" = "#ffd8b5"
+"scale.orange.2" = "#ffb77c"
+"scale.orange.3" = "#fb8f44"
+"scale.orange.4" = "#e16f24"
+"scale.orange.5" = "#bc4c00"
+"scale.orange.6" = "#953800"
+"scale.orange.7" = "#762c00"
+"scale.orange.8" = "#5c2200"
+"scale.orange.9" = "#471700"
+"scale.pink.0" = "#ffeff7"
+"scale.pink.1" = "#ffd3eb"
+"scale.pink.2" = "#ffadda"
+"scale.pink.3" = "#ff80c8"
+"scale.pink.4" = "#e85aad"
+"scale.pink.5" = "#bf3989"
+"scale.pink.6" = "#99286e"
+"scale.pink.7" = "#772057"
+"scale.pink.8" = "#611347"
+"scale.pink.9" = "#4d0336"
+"scale.purple.0" = "#fbefff"
+"scale.purple.1" = "#ecd8ff"
+"scale.purple.2" = "#d8b9ff"
+"scale.purple.3" = "#c297ff"
+"scale.purple.4" = "#a475f9"
+"scale.purple.5" = "#8250df"
+"scale.purple.6" = "#6639ba"
+"scale.purple.7" = "#512a97"
+"scale.purple.8" = "#3e1f79"
+"scale.purple.9" = "#2e1461"
+"scale.red.0" = "#ffebe9"
+"scale.red.1" = "#ffcecb"
+"scale.red.2" = "#ffaba8"
+"scale.red.3" = "#ff8182"
+"scale.red.4" = "#fa4549"
+"scale.red.5" = "#cf222e"
+"scale.red.6" = "#a40e26"
+"scale.red.7" = "#82071e"
+"scale.red.8" = "#660018"
+"scale.red.9" = "#4c0014"
+"scale.white" = "#ffffff"
+"scale.yellow.0" = "#fff8c5"
+"scale.yellow.1" = "#fae17d"
+"scale.yellow.2" = "#eac54f"
+"scale.yellow.3" = "#d4a72c"
+"scale.yellow.4" = "#bf8700"
+"scale.yellow.5" = "#9a6700"
+"scale.yellow.6" = "#7d4e00"
+"scale.yellow.7" = "#633c01"
+"scale.yellow.8" = "#4d2d00"
+"scale.yellow.9" = "#3b2300"
+"severe.emphasis" = "#bc4c00"
+"severe.fg" = "#bc4c00"
+"severe.muted" = "#fb8f4466"
+"severe.subtle" = "#fff1e5"
+"sponsors.emphasis" = "#bf3989"
+"sponsors.fg" = "#bf3989"
+"sponsors.muted" = "#ff80c866"
+"sponsors.subtle" = "#ffeff7"
+"success.emphasis" = "#2da44e"
+"success.fg" = "#1a7f37"
+"success.muted" = "#4ac26b66"
+"success.subtle" = "#dafbe1"
diff --git a/runtime/themes/github_light_colorblind.toml b/runtime/themes/github_light_colorblind.toml
new file mode 100644
index 00000000..295fecd8
--- /dev/null
+++ b/runtime/themes/github_light_colorblind.toml
@@ -0,0 +1,151 @@
+# Author : OwOSwordsman <owoswordsman@gmail.com>
+# An unofficial GitHub theme, generated using colors from: https://primer.style/primitives/colors
+# Credit goes to the original VSCode theme: https://github.com/primer/github-vscode-theme
+# Only the Light and Dark variants were specifically tested
+
+inherits = "github_light"
+
+[palette]
+"accent.emphasis" = "#0969da"
+"accent.fg" = "#0969da"
+"accent.muted" = "#54aeff66"
+"accent.subtle" = "#ddf4ff"
+"attention.emphasis" = "#bf8700"
+"attention.fg" = "#9a6700"
+"attention.muted" = "#d4a72c66"
+"attention.subtle" = "#fff8c5"
+"border.default" = "#d0d7de"
+"border.muted" = "#d8dee4"
+"border.subtle" = "#1b1f2426"
+"canvas.default" = "#ffffff"
+"canvas.inset" = "#f6f8fa"
+"canvas.overlay" = "#ffffff"
+"canvas.subtle" = "#f6f8fa"
+"closed.emphasis" = "#6e7781"
+"closed.fg" = "#6e7781"
+"closed.muted" = "#afb8c166"
+"closed.subtle" = "#f6f8fa"
+"danger.emphasis" = "#b35900"
+"danger.fg" = "#b35900"
+"danger.muted" = "#f7993966"
+"danger.subtle" = "#fff5e8"
+"done.emphasis" = "#8250df"
+"done.fg" = "#8250df"
+"done.muted" = "#c297ff66"
+"done.subtle" = "#fbefff"
+"fg.default" = "#24292f"
+"fg.muted" = "#57606a"
+"fg.onEmphasis" = "#ffffff"
+"fg.subtle" = "#6e7781"
+"neutral.emphasis" = "#6e7781"
+"neutral.emphasisPlus" = "#24292f"
+"neutral.muted" = "#afb8c133"
+"neutral.subtle" = "#eaeef280"
+"open.emphasis" = "#dd7815"
+"open.fg" = "#b35900"
+"open.muted" = "#f7993966"
+"open.subtle" = "#fff5e8"
+"scale.black" = "#1b1f24"
+"scale.blue.0" = "#ddf4ff"
+"scale.blue.1" = "#b6e3ff"
+"scale.blue.2" = "#80ccff"
+"scale.blue.3" = "#54aeff"
+"scale.blue.4" = "#218bff"
+"scale.blue.5" = "#0969da"
+"scale.blue.6" = "#0550ae"
+"scale.blue.7" = "#033d8b"
+"scale.blue.8" = "#0a3069"
+"scale.blue.9" = "#002155"
+"scale.coral.0" = "#fff0eb"
+"scale.coral.1" = "#ffd6cc"
+"scale.coral.2" = "#ffb4a1"
+"scale.coral.3" = "#fd8c73"
+"scale.coral.4" = "#ec6547"
+"scale.coral.5" = "#c4432b"
+"scale.coral.6" = "#9e2f1c"
+"scale.coral.7" = "#801f0f"
+"scale.coral.8" = "#691105"
+"scale.coral.9" = "#510901"
+"scale.gray.0" = "#f6f8fa"
+"scale.gray.1" = "#eaeef2"
+"scale.gray.2" = "#d0d7de"
+"scale.gray.3" = "#afb8c1"
+"scale.gray.4" = "#8c959f"
+"scale.gray.5" = "#6e7781"
+"scale.gray.6" = "#57606a"
+"scale.gray.7" = "#424a53"
+"scale.gray.8" = "#32383f"
+"scale.gray.9" = "#24292f"
+"scale.green.0" = "#ddf4ff"
+"scale.green.1" = "#b6e3ff"
+"scale.green.2" = "#80ccff"
+"scale.green.3" = "#54aeff"
+"scale.green.4" = "#218bff"
+"scale.green.5" = "#0969da"
+"scale.green.6" = "#0550ae"
+"scale.green.7" = "#033d8b"
+"scale.green.8" = "#0a3069"
+"scale.green.9" = "#002155"
+"scale.orange.0" = "#fff5e8"
+"scale.orange.1" = "#ffddb0"
+"scale.orange.2" = "#ffbc6d"
+"scale.orange.3" = "#f79939"
+"scale.orange.4" = "#dd7815"
+"scale.orange.5" = "#b35900"
+"scale.orange.6" = "#8a4600"
+"scale.orange.7" = "#6f3800"
+"scale.orange.8" = "#572c00"
+"scale.orange.9" = "#412000"
+"scale.pink.0" = "#ffeff7"
+"scale.pink.1" = "#ffd3eb"
+"scale.pink.2" = "#ffadda"
+"scale.pink.3" = "#ff80c8"
+"scale.pink.4" = "#e85aad"
+"scale.pink.5" = "#bf3989"
+"scale.pink.6" = "#99286e"
+"scale.pink.7" = "#772057"
+"scale.pink.8" = "#611347"
+"scale.pink.9" = "#4d0336"
+"scale.purple.0" = "#fbefff"
+"scale.purple.1" = "#ecd8ff"
+"scale.purple.2" = "#d8b9ff"
+"scale.purple.3" = "#c297ff"
+"scale.purple.4" = "#a475f9"
+"scale.purple.5" = "#8250df"
+"scale.purple.6" = "#6639ba"
+"scale.purple.7" = "#512a97"
+"scale.purple.8" = "#3e1f79"
+"scale.purple.9" = "#2e1461"
+"scale.red.0" = "#fff5e8"
+"scale.red.1" = "#ffddb0"
+"scale.red.2" = "#ffbc6d"
+"scale.red.3" = "#f79939"
+"scale.red.4" = "#dd7815"
+"scale.red.5" = "#b35900"
+"scale.red.6" = "#8a4600"
+"scale.red.7" = "#6f3800"
+"scale.red.8" = "#572c00"
+"scale.red.9" = "#412000"
+"scale.white" = "#ffffff"
+"scale.yellow.0" = "#fff8c5"
+"scale.yellow.1" = "#fae17d"
+"scale.yellow.2" = "#eac54f"
+"scale.yellow.3" = "#d4a72c"
+"scale.yellow.4" = "#bf8700"
+"scale.yellow.5" = "#9a6700"
+"scale.yellow.6" = "#7d4e00"
+"scale.yellow.7" = "#633c01"
+"scale.yellow.8" = "#4d2d00"
+"scale.yellow.9" = "#3b2300"
+"severe.emphasis" = "#b35900"
+"severe.fg" = "#b35900"
+"severe.muted" = "#f7993966"
+"severe.subtle" = "#fff5e8"
+"sponsors.emphasis" = "#bf3989"
+"sponsors.fg" = "#bf3989"
+"sponsors.muted" = "#ff80c866"
+"sponsors.subtle" = "#ffeff7"
+"success.emphasis" = "#218bff"
+"success.fg" = "#0969da"
+"success.muted" = "#54aeff66"
+"success.subtle" = "#ddf4ff"
diff --git a/runtime/themes/github_light_high_contrast.toml b/runtime/themes/github_light_high_contrast.toml
new file mode 100644
index 00000000..f4fbd4df
--- /dev/null
+++ b/runtime/themes/github_light_high_contrast.toml
@@ -0,0 +1,151 @@
+# Author : OwOSwordsman <owoswordsman@gmail.com>
+# An unofficial GitHub theme, generated using colors from: https://primer.style/primitives/colors
+# Credit goes to the original VSCode theme: https://github.com/primer/github-vscode-theme
+# Only the Light and Dark variants were specifically tested
+
+inherits = "github_light"
+
+[palette]
+"accent.emphasis" = "#0349b4"
+"accent.fg" = "#0349b4"
+"accent.muted" = "#368cf9"
+"accent.subtle" = "#dff7ff"
+"attention.emphasis" = "#744500"
+"attention.fg" = "#744500"
+"attention.muted" = "#b58407"
+"attention.subtle" = "#fcf7be"
+"border.default" = "#20252c"
+"border.muted" = "#88929d"
+"border.subtle" = "#010409cc"
+"canvas.default" = "#ffffff"
+"canvas.inset" = "#ffffff"
+"canvas.overlay" = "#ffffff"
+"canvas.subtle" = "#e7ecf0"
+"closed.emphasis" = "#a0111f"
+"closed.fg" = "#a0111f"
+"closed.muted" = "#ee5a5d66"
+"closed.subtle" = "#fff0ee"
+"danger.emphasis" = "#a0111f"
+"danger.fg" = "#a0111f"
+"danger.muted" = "#ee5a5d"
+"danger.subtle" = "#fff0ee"
+"done.emphasis" = "#622cbc"
+"done.fg" = "#622cbc"
+"done.muted" = "#a371f7"
+"done.subtle" = "#faf0fe"
+"fg.default" = "#0e1116"
+"fg.muted" = "#0e1116"
+"fg.onEmphasis" = "#ffffff"
+"fg.subtle" = "#66707b"
+"neutral.emphasis" = "#66707b"
+"neutral.emphasisPlus" = "#0e1116"
+"neutral.muted" = "#acb6c033"
+"neutral.subtle" = "#e7ecf0"
+"open.emphasis" = "#117f32"
+"open.fg" = "#055d20"
+"open.muted" = "#26a14866"
+"open.subtle" = "#d2fedb"
+"scale.black" = "#010409"
+"scale.blue.0" = "#dff7ff"
+"scale.blue.1" = "#9cd7ff"
+"scale.blue.2" = "#67b3fd"
+"scale.blue.3" = "#368cf9"
+"scale.blue.4" = "#1168e3"
+"scale.blue.5" = "#0349b4"
+"scale.blue.6" = "#023b95"
+"scale.blue.7" = "#022f7a"
+"scale.blue.8" = "#032563"
+"scale.blue.9" = "#021a4a"
+"scale.coral.0" = "#fff0ed"
+"scale.coral.1" = "#ffc2b6"
+"scale.coral.2" = "#ff8f7e"
+"scale.coral.3" = "#ef5b48"
+"scale.coral.4" = "#cd3425"
+"scale.coral.5" = "#9f1710"
+"scale.coral.6" = "#870706"
+"scale.coral.7" = "#6f0107"
+"scale.coral.8" = "#5b0002"
+"scale.coral.9" = "#430200"
+"scale.gray.0" = "#ffffff"
+"scale.gray.1" = "#e7ecf0"
+"scale.gray.2" = "#ced5dc"
+"scale.gray.3" = "#acb6c0"
+"scale.gray.4" = "#88929d"
+"scale.gray.5" = "#66707b"
+"scale.gray.6" = "#4b535d"
+"scale.gray.7" = "#343b43"
+"scale.gray.8" = "#20252c"
+"scale.gray.9" = "#0e1116"
+"scale.green.0" = "#d2fedb"
+"scale.green.1" = "#82e596"
+"scale.green.2" = "#43c663"
+"scale.green.3" = "#26a148"
+"scale.green.4" = "#117f32"
+"scale.green.5" = "#055d20"
+"scale.green.6" = "#024c1a"
+"scale.green.7" = "#013d14"
+"scale.green.8" = "#003110"
+"scale.green.9" = "#00230b"
+"scale.orange.0" = "#fff2d5"
+"scale.orange.1" = "#ffc67b"
+"scale.orange.2" = "#f99636"
+"scale.orange.3" = "#dc6d1a"
+"scale.orange.4" = "#b45105"
+"scale.orange.5" = "#873800"
+"scale.orange.6" = "#702c00"
+"scale.orange.7" = "#5b2300"
+"scale.orange.8" = "#491b00"
+"scale.orange.9" = "#361200"
+"scale.pink.0" = "#feeff7"
+"scale.pink.1" = "#ffbde0"
+"scale.pink.2" = "#fc87ca"
+"scale.pink.3" = "#ed4baf"
+"scale.pink.4" = "#c9248e"
+"scale.pink.5" = "#971368"
+"scale.pink.6" = "#7d0c57"
+"scale.pink.7" = "#660847"
+"scale.pink.8" = "#53043a"
+"scale.pink.9" = "#3e022b"
+"scale.purple.0" = "#faf0fe"
+"scale.purple.1" = "#e0c5ff"
+"scale.purple.2" = "#c49bff"
+"scale.purple.3" = "#a371f7"
+"scale.purple.4" = "#844ae7"
+"scale.purple.5" = "#622cbc"
+"scale.purple.6" = "#512598"
+"scale.purple.7" = "#411d7b"
+"scale.purple.8" = "#341763"
+"scale.purple.9" = "#260f49"
+"scale.red.0" = "#fff0ee"
+"scale.red.1" = "#ffc1bc"
+"scale.red.2" = "#ff8e8a"
+"scale.red.3" = "#ee5a5d"
+"scale.red.4" = "#d5232c"
+"scale.red.5" = "#a0111f"
+"scale.red.6" = "#86061d"
+"scale.red.7" = "#6e011a"
+"scale.red.8" = "#5a0016"
+"scale.red.9" = "#430011"
+"scale.white" = "#ffffff"
+"scale.yellow.0" = "#fcf7be"
+"scale.yellow.1" = "#f0ce53"
+"scale.yellow.2" = "#d5a824"
+"scale.yellow.3" = "#b58407"
+"scale.yellow.4" = "#956400"
+"scale.yellow.5" = "#744500"
+"scale.yellow.6" = "#603700"
+"scale.yellow.7" = "#4e2c00"
+"scale.yellow.8" = "#3f2200"
+"scale.yellow.9" = "#2e1800"
+"severe.emphasis" = "#873800"
+"severe.fg" = "#873800"
+"severe.muted" = "#dc6d1a"
+"severe.subtle" = "#fff2d5"
+"sponsors.emphasis" = "#971368"
+"sponsors.fg" = "#971368"
+"sponsors.muted" = "#ed4baf"
+"sponsors.subtle" = "#feeff7"
+"success.emphasis" = "#055d20"
+"success.fg" = "#055d20"
+"success.muted" = "#26a148"
+"success.subtle" = "#d2fedb"
diff --git a/runtime/themes/github_light_tritanopia.toml b/runtime/themes/github_light_tritanopia.toml
new file mode 100644
index 00000000..646539ba
--- /dev/null
+++ b/runtime/themes/github_light_tritanopia.toml
@@ -0,0 +1,151 @@
+# Author : OwOSwordsman <owoswordsman@gmail.com>
+# An unofficial GitHub theme, generated using colors from: https://primer.style/primitives/colors
+# Credit goes to the original VSCode theme: https://github.com/primer/github-vscode-theme
+# Only the Light and Dark variants were specifically tested
+
+inherits = "github_light"
+
+[palette]
+"accent.emphasis" = "#0969da"
+"accent.fg" = "#0969da"
+"accent.muted" = "#54aeff66"
+"accent.subtle" = "#ddf4ff"
+"attention.emphasis" = "#bf8700"
+"attention.fg" = "#9a6700"
+"attention.muted" = "#d4a72c66"
+"attention.subtle" = "#fff8c5"
+"border.default" = "#d0d7de"
+"border.muted" = "#d8dee4"
+"border.subtle" = "#1b1f2426"
+"canvas.default" = "#ffffff"
+"canvas.inset" = "#f6f8fa"
+"canvas.overlay" = "#ffffff"
+"canvas.subtle" = "#f6f8fa"
+"closed.emphasis" = "#6e7781"
+"closed.fg" = "#6e7781"
+"closed.muted" = "#afb8c166"
+"closed.subtle" = "#f6f8fa"
+"danger.emphasis" = "#cf222e"
+"danger.fg" = "#cf222e"
+"danger.muted" = "#ff818266"
+"danger.subtle" = "#ffebe9"
+"done.emphasis" = "#8250df"
+"done.fg" = "#8250df"
+"done.muted" = "#c297ff66"
+"done.subtle" = "#fbefff"
+"fg.default" = "#24292f"
+"fg.muted" = "#57606a"
+"fg.onEmphasis" = "#ffffff"
+"fg.subtle" = "#6e7781"
+"neutral.emphasis" = "#6e7781"
+"neutral.emphasisPlus" = "#24292f"
+"neutral.muted" = "#afb8c133"
+"neutral.subtle" = "#eaeef280"
+"open.emphasis" = "#fa4549"
+"open.fg" = "#cf222e"
+"open.muted" = "#ff818266"
+"open.subtle" = "#ffebe9"
+"scale.black" = "#1b1f24"
+"scale.blue.0" = "#ddf4ff"
+"scale.blue.1" = "#b6e3ff"
+"scale.blue.2" = "#80ccff"
+"scale.blue.3" = "#54aeff"
+"scale.blue.4" = "#218bff"
+"scale.blue.5" = "#0969da"
+"scale.blue.6" = "#0550ae"
+"scale.blue.7" = "#033d8b"
+"scale.blue.8" = "#0a3069"
+"scale.blue.9" = "#002155"
+"scale.coral.0" = "#fff0eb"
+"scale.coral.1" = "#ffd6cc"
+"scale.coral.2" = "#ffb4a1"
+"scale.coral.3" = "#fd8c73"
+"scale.coral.4" = "#ec6547"
+"scale.coral.5" = "#c4432b"
+"scale.coral.6" = "#9e2f1c"
+"scale.coral.7" = "#801f0f"
+"scale.coral.8" = "#691105"
+"scale.coral.9" = "#510901"
+"scale.gray.0" = "#f6f8fa"
+"scale.gray.1" = "#eaeef2"
+"scale.gray.2" = "#d0d7de"
+"scale.gray.3" = "#afb8c1"
+"scale.gray.4" = "#8c959f"
+"scale.gray.5" = "#6e7781"
+"scale.gray.6" = "#57606a"
+"scale.gray.7" = "#424a53"
+"scale.gray.8" = "#32383f"
+"scale.gray.9" = "#24292f"
+"scale.green.0" = "#ddf4ff"
+"scale.green.1" = "#b6e3ff"
+"scale.green.2" = "#80ccff"
+"scale.green.3" = "#54aeff"
+"scale.green.4" = "#218bff"
+"scale.green.5" = "#0969da"
+"scale.green.6" = "#0550ae"
+"scale.green.7" = "#033d8b"
+"scale.green.8" = "#0a3069"
+"scale.green.9" = "#002155"
+"scale.orange.0" = "#ffebe9"
+"scale.orange.1" = "#ffcecb"
+"scale.orange.2" = "#ffaba8"
+"scale.orange.3" = "#ff8182"
+"scale.orange.4" = "#fa4549"
+"scale.orange.5" = "#cf222e"
+"scale.orange.6" = "#a40e26"
+"scale.orange.7" = "#82071e"
+"scale.orange.8" = "#660018"
+"scale.orange.9" = "#4c0014"
+"scale.pink.0" = "#ffeff7"
+"scale.pink.1" = "#ffd3eb"
+"scale.pink.2" = "#ffadda"
+"scale.pink.3" = "#ff80c8"
+"scale.pink.4" = "#e85aad"
+"scale.pink.5" = "#bf3989"
+"scale.pink.6" = "#99286e"
+"scale.pink.7" = "#772057"
+"scale.pink.8" = "#611347"
+"scale.pink.9" = "#4d0336"
+"scale.purple.0" = "#fbefff"
+"scale.purple.1" = "#ecd8ff"
+"scale.purple.2" = "#d8b9ff"
+"scale.purple.3" = "#c297ff"
+"scale.purple.4" = "#a475f9"
+"scale.purple.5" = "#8250df"
+"scale.purple.6" = "#6639ba"
+"scale.purple.7" = "#512a97"
+"scale.purple.8" = "#3e1f79"
+"scale.purple.9" = "#2e1461"
+"scale.red.0" = "#ffebe9"
+"scale.red.1" = "#ffcecb"
+"scale.red.2" = "#ffaba8"
+"scale.red.3" = "#ff8182"
+"scale.red.4" = "#fa4549"
+"scale.red.5" = "#cf222e"
+"scale.red.6" = "#a40e26"
+"scale.red.7" = "#82071e"
+"scale.red.8" = "#660018"
+"scale.red.9" = "#4c0014"
+"scale.white" = "#ffffff"
+"scale.yellow.0" = "#fff8c5"
+"scale.yellow.1" = "#fae17d"
+"scale.yellow.2" = "#eac54f"
+"scale.yellow.3" = "#d4a72c"
+"scale.yellow.4" = "#bf8700"
+"scale.yellow.5" = "#9a6700"
+"scale.yellow.6" = "#7d4e00"
+"scale.yellow.7" = "#633c01"
+"scale.yellow.8" = "#4d2d00"
+"scale.yellow.9" = "#3b2300"
+"severe.emphasis" = "#cf222e"
+"severe.fg" = "#cf222e"
+"severe.muted" = "#ff818266"
+"severe.subtle" = "#ffebe9"
+"sponsors.emphasis" = "#bf3989"
+"sponsors.fg" = "#bf3989"
+"sponsors.muted" = "#ff80c866"
+"sponsors.subtle" = "#ffeff7"
+"success.emphasis" = "#218bff"
+"success.fg" = "#0969da"
+"success.muted" = "#54aeff66"
+"success.subtle" = "#ddf4ff"

From 873434b9270829139076027b45c36eb21dd4b1cc Mon Sep 17 00:00:00 2001
From: Triton171 <daniel.ebert@protonmail.com>
Date: Sat, 7 Jan 2023 06:39:31 +0100
Subject: [PATCH 714/884] Improve indent queries for python in specific cases
 (#5332)

where the tree-sitter completely fails to parse incomplete code.
---
 runtime/queries/python/indents.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/runtime/queries/python/indents.scm b/runtime/queries/python/indents.scm
index 743971ad..835b40d3 100644
--- a/runtime/queries/python/indents.scm
+++ b/runtime/queries/python/indents.scm
@@ -29,6 +29,19 @@
   (class_definition)
 ] @indent
 
+; Workaround for the tree-sitter grammar creating large errors when a
+; try_statement is missing the except/finally clause
+(ERROR
+  "try"
+  .
+  ":" @indent @extend)
+(ERROR
+  .
+  "def") @indent @extend
+(ERROR
+  (block) @indent @extend
+  (#set! "scope" "all"))
+
 [
   (if_statement)
   (for_statement)

From 6ae092acceaf766f4e84f67b17547f2f9de678be Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Sat, 7 Jan 2023 11:16:45 +0530
Subject: [PATCH 715/884] book: Clarify install commands for msys2 in Windows
 (#5363)

---
 book/src/install.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/book/src/install.md b/book/src/install.md
index 44f13584..92097cfa 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -69,17 +69,21 @@ choco install helix
 
 **MSYS2:**
 
+Choose the proper command for your system from below:
+
+  - For 32 bit Windows 7 or above:
+
 ```
 pacman -S mingw-w64-i686-helix
 ```
 
-or
+  - For 64 bit Windows 7 or above:
 
 ```
 pacman -S mingw-w64-x86_64-helix
 ```
 
-or
+  - For 64 bit Windows 8.1 or above:
 
 ```
 pacman -S mingw-w64-ucrt-x86_64-helix

From 95d4fdc255cc880b5dbcb91851eb53ffe2cfce97 Mon Sep 17 00:00:00 2001
From: Mike Trinkala <trink@acm.org>
Date: Sat, 7 Jan 2023 13:42:45 -0800
Subject: [PATCH 716/884] Update the cargo installation instructions to include
 --locked (#5443)

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e4683d35..60125e11 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ If you would like to build from source:
 ```shell
 git clone https://github.com/helix-editor/helix
 cd helix
-cargo install --path helix-term
+cargo install --locked --path helix-term
 ```
 
 This will install the `hx` binary to `$HOME/.cargo/bin` and build tree-sitter grammars in `./runtime/grammars`.
@@ -84,7 +84,7 @@ mklink /D runtime "<helix-repo>\runtime"
 
 The runtime location can be overridden via the `HELIX_RUNTIME` environment variable.
 
-> NOTE: if `HELIX_RUNTIME` is set prior to calling `cargo install --path helix-term`,
+> NOTE: if `HELIX_RUNTIME` is set prior to calling `cargo install --locked --path helix-term`,
 > tree-sitter grammars will be built in `$HELIX_RUNTIME/grammars`.
 
 If you plan on keeping the repo locally, an alternative to copying/symlinking

From a39a2ce9a8dbf0f0e44073c8a2849a4c1dfc12ef Mon Sep 17 00:00:00 2001
From: Michal Melewski <michal.melewski@gmail.com>
Date: Sun, 8 Jan 2023 04:55:35 +0100
Subject: [PATCH 717/884] book: Recommend '--locked' for cargo installs (#5438)

---
 book/src/install.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/book/src/install.md b/book/src/install.md
index 92097cfa..bf0ff079 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -94,7 +94,7 @@ pacman -S mingw-w64-ucrt-x86_64-helix
 ```
 git clone https://github.com/helix-editor/helix
 cd helix
-cargo install --path helix-term
+cargo install --path helix-term --locked
 ```
 
 This will install the `hx` binary to `$HOME/.cargo/bin` and build tree-sitter grammars in `./runtime/grammars`.
@@ -127,7 +127,7 @@ mklink /D runtime "<helix-repo>\runtime"
 
 The runtime location can be overridden via the `HELIX_RUNTIME` environment variable.
 
-> NOTE: if `HELIX_RUNTIME` is set prior to calling `cargo install --path helix-term`,
+> NOTE: if `HELIX_RUNTIME` is set prior to calling `cargo install --path helix-term --locked`,
 > tree-sitter grammars will be built in `$HELIX_RUNTIME/grammars`.
 
 If you plan on keeping the repo locally, an alternative to copying/symlinking

From 0c51201ef21f567446746ae75950aa97b2bd6681 Mon Sep 17 00:00:00 2001
From: liuxueyang <liuxueyang457@gmail.com>
Date: Sun, 8 Jan 2023 22:30:37 +0800
Subject: [PATCH 718/884] Fix a small typo in tutor document (#5449)

---
 runtime/tutor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/tutor b/runtime/tutor
index 8336a516..0e693dc0 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -1087,7 +1087,7 @@ letters! that is not good grammar. you can fix this.
 
  * Type ~ to alternate case of selected letters.
    * Use ` and Alt-` to set the case of selected letters to
-     upper and lower respectively.
+     lower and upper respectively.
 
  * Type S to split selections on regex.
 

From b7ca0581d81f0ac80418a3e052df2bd5d9f71ad4 Mon Sep 17 00:00:00 2001
From: Lorenzo Albano <loralb@posteo.net>
Date: Sun, 8 Jan 2023 16:30:38 +0100
Subject: [PATCH 719/884] Store new config on application in :config-reload
 (#5431)

After changes in #5239, the loaded configuration wasn't stored,
resulting in a success message even if the instance kept the previous
configuration values.
---
 helix-term/src/application.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 729047e3..c0cbc245 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -436,6 +436,8 @@ impl Application {
                 .map_err(|err| anyhow::anyhow!("Failed to load config: {}", err))?;
             self.refresh_language_config()?;
             self.refresh_theme(&default_config)?;
+            // Store new config
+            self.config.store(Arc::new(default_config));
             Ok(())
         };
 

From ec639387e8476b0aea75bceff7db4b312305dad2 Mon Sep 17 00:00:00 2001
From: mejo13 <36098293+mejo13@users.noreply.github.com>
Date: Sun, 8 Jan 2023 18:09:49 +0100
Subject: [PATCH 720/884] Fix theme solarized_dark infobox (#5445)

Title and border were barely visible.
Changed foreground color and modifier to match the text.
---
 runtime/themes/solarized_dark.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/themes/solarized_dark.toml b/runtime/themes/solarized_dark.toml
index 1083b0c8..15b3cd5e 100644
--- a/runtime/themes/solarized_dark.toml
+++ b/runtime/themes/solarized_dark.toml
@@ -68,7 +68,7 @@
 "ui.help" = { modifiers = ["reversed"] }
 
 # 快捷键窗口 
-"ui.popup.info" = { bg = "base1" }
+"ui.popup.info" = {fg = "base02", bg = "base1", modifiers = ["bold"]}
 # 快捷键字体
 "ui.text.info" = {fg = "base02", modifiers = ["bold"]}
 

From b368df57855c77be5f3ae6601f5a83b586feb7c3 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Sun, 8 Jan 2023 12:12:04 -0500
Subject: [PATCH 721/884] Use tree-sitter-ruby for crystal (#5205)

---
 book/src/generated/lang-support.md      |  2 +-
 languages.toml                          |  5 +-
 runtime/queries/crystal/highlights.scm  | 67 +------------------------
 runtime/queries/crystal/injections.scm  |  1 +
 runtime/queries/crystal/locals.scm      |  1 +
 runtime/queries/crystal/textobjects.scm |  1 +
 6 files changed, 6 insertions(+), 71 deletions(-)
 create mode 100644 runtime/queries/crystal/injections.scm
 create mode 100644 runtime/queries/crystal/locals.scm
 create mode 100644 runtime/queries/crystal/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index babb9941..a21d9da9 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -16,7 +16,7 @@
 | common-lisp | ✓ |  |  | `cl-lsp` |
 | cpon | ✓ |  | ✓ |  |
 | cpp | ✓ | ✓ | ✓ | `clangd` |
-| crystal | ✓ |  |  |  |
+| crystal | ✓ | ✓ |  |  |
 | css | ✓ |  |  | `vscode-css-language-server` |
 | cue | ✓ |  |  | `cuelsp` |
 | d | ✓ | ✓ | ✓ | `serve-d` |
diff --git a/languages.toml b/languages.toml
index 5f16d17b..3ade3ea9 100644
--- a/languages.toml
+++ b/languages.toml
@@ -230,10 +230,7 @@ file-types = ["cr"]
 roots = ["shard.yml", "shard.lock"]
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
-
-[[grammar]]
-name = "crystal"
-source = { git = "https://github.com/will/tree-sitter-crystal", rev = "15597b307b18028b04d288561f9c29794621562b" }
+grammar = "ruby"
 
 [[language]]
 name = "c-sharp"
diff --git a/runtime/queries/crystal/highlights.scm b/runtime/queries/crystal/highlights.scm
index 33a53e7f..57154286 100644
--- a/runtime/queries/crystal/highlights.scm
+++ b/runtime/queries/crystal/highlights.scm
@@ -1,66 +1 @@
-[
-  "class"
-  "struct"
-  "module"
-
-  "def"
-  "alias"
-  "do"
-  "end"
-
-  "require"
-  "include"
-  "extend"
-] @keyword
-
-[
-  "[" "]"
-  "(" ")"
-  "{" "}"
-] @punctuation.bracket
-
-(operator) @operator
-
-(comment) @comment
-
-; literals
-
-(nil) @constant.builtin
-(bool) @constant.builtin.boolean
-
-(integer) @constant.numeric.integer
-(float) @constant.numeric.float
-
-[
-  (string)
-  (char)
-  (commandLiteral)
-] @string
-
-(symbol) @string.special.symbol
-
-(regex) @string.special.regex
-
-; variables
-
-(local_variable) @variable
-
-[
-  (instance_variable)
-  (class_variable)
-] @variable.other.member
-
-(constant) @constant
-
-; type defintitions
-
-(type_identifier) @constructor
-
-; method definition/call
-(identifier) @function.method
-
-; types
-(generic_type) @type
-(union_type) @type
-(type_identifier) @type
-
+; inherits: ruby
diff --git a/runtime/queries/crystal/injections.scm b/runtime/queries/crystal/injections.scm
new file mode 100644
index 00000000..57154286
--- /dev/null
+++ b/runtime/queries/crystal/injections.scm
@@ -0,0 +1 @@
+; inherits: ruby
diff --git a/runtime/queries/crystal/locals.scm b/runtime/queries/crystal/locals.scm
new file mode 100644
index 00000000..57154286
--- /dev/null
+++ b/runtime/queries/crystal/locals.scm
@@ -0,0 +1 @@
+; inherits: ruby
diff --git a/runtime/queries/crystal/textobjects.scm b/runtime/queries/crystal/textobjects.scm
new file mode 100644
index 00000000..57154286
--- /dev/null
+++ b/runtime/queries/crystal/textobjects.scm
@@ -0,0 +1 @@
+; inherits: ruby

From c4b0eb835639d2c18d940cd0c55093a92169b432 Mon Sep 17 00:00:00 2001
From: Dylan Bulfin <31492860+DylanBulfin@users.noreply.github.com>
Date: Sun, 8 Jan 2023 21:25:19 -0500
Subject: [PATCH 722/884] Fix autocompletion for paths with period  (#5175)

* Bug fix

Updated bug fix

* Simplified conditionals

* Switched to use path separator constant
---
 helix-term/src/ui/mod.rs | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index ade1d8cf..eb480758 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -463,20 +463,30 @@ pub mod completers {
         use ignore::WalkBuilder;
         use std::path::Path;
 
-        let is_tilde = input.starts_with('~') && input.len() == 1;
+        let is_tilde = input == "~";
         let path = helix_core::path::expand_tilde(Path::new(input));
 
         let (dir, file_name) = if input.ends_with(std::path::MAIN_SEPARATOR) {
             (path, None)
         } else {
-            let file_name = path
-                .file_name()
-                .and_then(|file| file.to_str().map(|path| path.to_owned()));
-
-            let path = match path.parent() {
-                Some(path) if !path.as_os_str().is_empty() => path.to_path_buf(),
-                // Path::new("h")'s parent is Some("")...
-                _ => std::env::current_dir().expect("couldn't determine current directory"),
+            let is_period = (input.ends_with((format!("{}.", std::path::MAIN_SEPARATOR)).as_str())
+                && input.len() > 2)
+                || input == ".";
+            let file_name = if is_period {
+                Some(String::from("."))
+            } else {
+                path.file_name()
+                    .and_then(|file| file.to_str().map(|path| path.to_owned()))
+            };
+
+            let path = if is_period {
+                path
+            } else {
+                match path.parent() {
+                    Some(path) if !path.as_os_str().is_empty() => path.to_path_buf(),
+                    // Path::new("h")'s parent is Some("")...
+                    _ => std::env::current_dir().expect("couldn't determine current directory"),
+                }
             };
 
             (path, file_name)

From 486c3ab0d542f5d502eba4f97446bdeca71afefd Mon Sep 17 00:00:00 2001
From: Chickenkeeper <artofchrism@gmail.com>
Date: Mon, 9 Jan 2023 02:26:08 +0000
Subject: [PATCH 723/884] Fix Broken Attribute Highlights (#5349)

* Update highlights.scm

* Update highlights.scm

* Update themes.md
---
 book/src/themes.md                  |  4 ++++
 runtime/queries/rust/highlights.scm | 13 ++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/book/src/themes.md b/book/src/themes.md
index 0f94828e..015ec59b 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -140,6 +140,8 @@ We use a similar set of scopes as
 
 - `type` - Types
   - `builtin` - Primitive types provided by the language (`int`, `usize`)
+  - `enum`
+    - `variant`
 - `constructor`
 
 - `constant` (TODO: constant.other.placeholder for %v)
@@ -202,6 +204,8 @@ We use a similar set of scopes as
 
 - `namespace`
 
+- `special`
+
 - `markup`
   - `heading`
     - `marker`
diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm
index 66058034..bf2fde49 100644
--- a/runtime/queries/rust/highlights.scm
+++ b/runtime/queries/rust/highlights.scm
@@ -231,13 +231,6 @@
 ((identifier) @type
   (#match? @type "^[A-Z]"))
 
-(attribute
-  (identifier) @_macro
-  arguments: (token_tree (identifier) @constant.numeric.integer)
-  (#eq? @_macro "derive")
-)
-@special
-
 ; -------
 ; Functions
 ; -------
@@ -269,6 +262,12 @@
 ; Macros
 ; ---
 
+(attribute
+  (identifier) @special
+  arguments: (token_tree (identifier) @type)
+  (#eq? @special "derive")
+)
+
 (attribute
   (identifier) @function.macro)
 (attribute

From 77860bdb0503b3daf6e545cd5191e226456161b6 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@users.noreply.github.com>
Date: Mon, 9 Jan 2023 15:26:32 +1300
Subject: [PATCH 724/884] Specify ui.selection.primary for Gruvbox themes
 (#5333)

---
 runtime/themes/gruvbox.toml           | 1 +
 runtime/themes/gruvbox_dark_hard.toml | 1 +
 runtime/themes/gruvbox_light.toml     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml
index 4f0a7d9f..01def874 100644
--- a/runtime/themes/gruvbox.toml
+++ b/runtime/themes/gruvbox.toml
@@ -53,6 +53,7 @@
 "ui.text" = { fg = "fg1" }
 "ui.text.focus" = { fg = "fg1" }
 "ui.selection" = { bg = "bg2" }
+"ui.selection.primary" = { bg = "bg3" }
 "ui.cursor.primary" = { bg = "fg4", fg = "bg1" }
 "ui.cursor.match" = { bg = "bg3" }
 "ui.menu" = { fg = "fg1", bg = "bg2" }
diff --git a/runtime/themes/gruvbox_dark_hard.toml b/runtime/themes/gruvbox_dark_hard.toml
index 27d9ab9b..9f92d3c7 100644
--- a/runtime/themes/gruvbox_dark_hard.toml
+++ b/runtime/themes/gruvbox_dark_hard.toml
@@ -60,6 +60,7 @@
 "ui.text" = { fg = "fg1" }
 "ui.text.focus" = { fg = "fg1" }
 "ui.selection" = { bg = "bg3", modifiers = ["reversed"] }
+"ui.selection.primary" = { bg = "bg4", modifiers = ["reversed"] }
 "ui.cursor.primary" = { modifiers = ["reversed"] }
 "ui.cursor.match" = { bg = "bg2" }
 "ui.menu" = { fg = "fg1", bg = "bg2" }
diff --git a/runtime/themes/gruvbox_light.toml b/runtime/themes/gruvbox_light.toml
index dc7e3db1..d2245fe9 100644
--- a/runtime/themes/gruvbox_light.toml
+++ b/runtime/themes/gruvbox_light.toml
@@ -54,6 +54,7 @@
 "ui.text" = { fg = "fg1" }
 "ui.text.focus" = { fg = "fg1" }
 "ui.selection" = { bg = "bg3", modifiers = ["reversed"] }
+"ui.selection.primary" = { bg = "bg4", modifiers = ["reversed"] }
 "ui.cursor.primary" = { modifiers = ["reversed"] }
 "ui.cursor.match" = { bg = "bg2" }
 "ui.menu" = { fg = "fg1", bg = "bg2" }

From bbadf3e3de3d76cf81268f7849c6a896f7e56a0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 08:07:27 +0800
Subject: [PATCH 725/884] build(deps): bump tokio from 1.23.1 to 1.24.1 (#5473)

Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.23.1 to 1.24.1.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.23.1...tokio-1.24.1)

---
updated-dependencies:
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock           | 4 ++--
 helix-lsp/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 329a24c8..edf7df2a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2121,9 +2121,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.23.1"
+version = "1.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38a54aca0c15d014013256222ba0ebed095673f89345dd79119d912eb561b7a8"
+checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae"
 dependencies = [
  "autocfg",
  "bytes",
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index d04edcd5..d31731d2 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -23,6 +23,6 @@ lsp-types = { version = "0.93", features = ["proposed"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-tokio = { version = "1.23", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
+tokio = { version = "1.24", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
 tokio-stream = "0.1.11"
 which = "4.2"

From 9fbe0282cfa4d3f3e53099488ab0ba1bd6d448b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 08:08:23 +0800
Subject: [PATCH 726/884] build(deps): bump regex from 1.7.0 to 1.7.1 (#5474)

Bumps [regex](https://github.com/rust-lang/regex) from 1.7.0 to 1.7.1.
- [Release notes](https://github.com/rust-lang/regex/releases)
- [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/regex/compare/1.7.0...1.7.1)

---
updated-dependencies:
- dependency-name: regex
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index edf7df2a..58527d4d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1751,9 +1751,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.7.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
 dependencies = [
  "aho-corasick",
  "memchr",

From 2b1744b8282a447009028a618d00e60cca491e65 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 08:09:17 +0800
Subject: [PATCH 727/884] build(deps): bump clipboard-win from 4.4.2 to 4.5.0
 (#5475)

Bumps [clipboard-win](https://github.com/DoumanAsh/clipboard-win) from 4.4.2 to 4.5.0.
- [Release notes](https://github.com/DoumanAsh/clipboard-win/releases)
- [Commits](https://github.com/DoumanAsh/clipboard-win/commits)

---
updated-dependencies:
- dependency-name: clipboard-win
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 4 ++--
 helix-view/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 58527d4d..51c7469b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -190,9 +190,9 @@ dependencies = [
 
 [[package]]
 name = "clipboard-win"
-version = "4.4.2"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4ab1b92798304eedc095b53942963240037c0516452cb11aeba709d420b2219"
+checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362"
 dependencies = [
  "error-code",
  "str-buf",
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 46fd5810..e7a20496 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -46,7 +46,7 @@ which = "4.2"
 
 
 [target.'cfg(windows)'.dependencies]
-clipboard-win = { version = "4.4", features = ["std"] }
+clipboard-win = { version = "4.5", features = ["std"] }
 
 [dev-dependencies]
 helix-tui = { path = "../helix-tui" }

From 2d601d6a59dd46cccfcbda625387f21981e0a8a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 08:12:04 +0800
Subject: [PATCH 728/884] build(deps): bump git-repository from 0.31.0 to
 0.32.0 (#5476)

Bumps [git-repository](https://github.com/Byron/gitoxide) from 0.31.0 to 0.32.0.
- [Release notes](https://github.com/Byron/gitoxide/releases)
- [Changelog](https://github.com/Byron/gitoxide/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Byron/gitoxide/compare/git-repository-v0.31.0...git-repository-v0.32.0)

---
updated-dependencies:
- dependency-name: git-repository
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock           | 64 ++++++++++++++++++++++----------------------
 helix-vcs/Cargo.toml |  2 +-
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 51c7469b..69ba8444 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -541,9 +541,9 @@ dependencies = [
 
 [[package]]
 name = "git-actor"
-version = "0.16.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "599cb75eb7c3bf03149b7ab70c66bc0b9a432a092b1154b49d21b49fc7e4bd93"
+checksum = "d9e5fd7bc63ad527d64584f8d01f99b89c051f5fbb8144b58ae5f812775065cf"
 dependencies = [
  "bstr 1.0.1",
  "btoi",
@@ -598,9 +598,9 @@ dependencies = [
 
 [[package]]
 name = "git-config"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1b95089db62159d7d24c13ddfb4bf949c508521d0bb25331744ef500295ceb8"
+checksum = "c9da662fd64ac69772158dcf04777da6266f0f36bc9a310b3eb2d805bb696315"
 dependencies = [
  "bstr 1.0.1",
  "git-config-value",
@@ -648,9 +648,9 @@ dependencies = [
 
 [[package]]
 name = "git-date"
-version = "0.3.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a2874ce2f3a77cb144167901ea830969e5c991eac7bfee85e6e3f53ef9fcdf2"
+checksum = "412c9b89026505bd24d5f8acafa578de6eea3b271ece307a73b8e646e671302a"
 dependencies = [
  "bstr 1.0.1",
  "itoa",
@@ -660,9 +660,9 @@ dependencies = [
 
 [[package]]
 name = "git-diff"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8ae775956f509fe115b173d79e539f97539d40c1d5c5c63a61d10eaf79c857a"
+checksum = "ca87474422d26d606d04cec6bedfabcd92a0a74102cd7936785358ced6a4a25a"
 dependencies = [
  "git-hash",
  "git-object",
@@ -672,9 +672,9 @@ dependencies = [
 
 [[package]]
 name = "git-discover"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aab20ca6af631c2bb10d59e63377ca9c9c74908586e6018ab15377967432e68b"
+checksum = "1e9e26e0bc434643228cd418185bd28ca5c7cf831bde1da434807391c27ac40e"
 dependencies = [
  "bstr 1.0.1",
  "git-hash",
@@ -733,9 +733,9 @@ dependencies = [
 
 [[package]]
 name = "git-index"
-version = "0.11.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "430f5d9302a2dd5e50b6b04a3b9d0df6b3423e55908fde18333fe9cd51312027"
+checksum = "485da97dd4f69c7d9a8dc238cd6f4a726387ffc34573489e8e0d2bee266e3454"
 dependencies = [
  "atoi",
  "bitflags",
@@ -766,9 +766,9 @@ dependencies = [
 
 [[package]]
 name = "git-mailmap"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "396cef08d4ec18ea35fed043f5b003e46957603a01349dd429a4773c146fefca"
+checksum = "0316b4346f3e162ade368209efb8a609b587793c74aa3b8de0ec01a4f3580120"
 dependencies = [
  "bstr 1.0.1",
  "git-actor",
@@ -777,9 +777,9 @@ dependencies = [
 
 [[package]]
 name = "git-object"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad6c2ddb376b99172dc8b651e11be4cb49cef423de4fad563ebbda4fee3fcf6"
+checksum = "3f8563e2d6f524d7053f3106714f99ecdc3adbba2cb7108c09d71a02579f2e19"
 dependencies = [
  "bstr 1.0.1",
  "btoi",
@@ -796,9 +796,9 @@ dependencies = [
 
 [[package]]
 name = "git-odb"
-version = "0.39.0"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84ea84e47ae48b95e108664d2991013507694b1b722e4183ed1c9309251b9b10"
+checksum = "616115a0e3daff6e08842758d24547b37a6eb6d0e2eedd95a740c3aaa2750333"
 dependencies = [
  "arc-swap",
  "git-features",
@@ -814,9 +814,9 @@ dependencies = [
 
 [[package]]
 name = "git-pack"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692e9c78c57212aa76c71be9a319f80d42fe8191735b3aff5b97b8f034295774"
+checksum = "7cd16b88f4b66041f41ca510c28bd81c4ee7363c5a544b3d62b4170432965871"
 dependencies = [
  "bytesize",
  "clru",
@@ -872,9 +872,9 @@ dependencies = [
 
 [[package]]
 name = "git-ref"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b351af399166a5506369e36389d6b9aee744cfa672d0e2ea93d2b01223b1cfbe"
+checksum = "5e6767925a6fc4af5c5a81e348d1d851c1b3ab2b512bd7f562ac11be37c14468"
 dependencies = [
  "git-actor",
  "git-features",
@@ -891,9 +891,9 @@ dependencies = [
 
 [[package]]
 name = "git-refspec"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcf699f310ba8530708f599b1ce730eb557ebc0af1a1a57b882ce3d685571092"
+checksum = "ddf310ed5f2829ac0af96e7d4aebd4ae4b89f0718a7ae3666d09b02b2c5a1dfd"
 dependencies = [
  "bstr 1.0.1",
  "git-hash",
@@ -905,9 +905,9 @@ dependencies = [
 
 [[package]]
 name = "git-repository"
-version = "0.31.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9e21852e326233c5f3f034a44b66215c166506e5ccf227de7e28ccdfbcfb47a"
+checksum = "993277960cb7e2d3991a11c1ec6951c1d142de052c26a18d2db64304e52d3741"
 dependencies = [
  "git-actor",
  "git-attributes",
@@ -948,9 +948,9 @@ dependencies = [
 
 [[package]]
 name = "git-revision"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b64c0d2e37eb24c8897d11a2f77371a817c3d40dc744d4a2f048f33236eef6b"
+checksum = "4f9a6bd28c9d1676bb96f428cd09614ae18a0087d7cea1cebfd177e25f99b2af"
 dependencies = [
  "bstr 1.0.1",
  "git-date",
@@ -989,9 +989,9 @@ dependencies = [
 
 [[package]]
 name = "git-traverse"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43b91ed45b561161ba56b85a83865825b7d17a6b1c6f981e831a78b93cf2cc5f"
+checksum = "bd356da21ec00f69b9d4f105df4cb85543c746b18f4b7fc81529ce77713cdb29"
 dependencies = [
  "git-hash",
  "git-hashtable",
@@ -1025,9 +1025,9 @@ dependencies = [
 
 [[package]]
 name = "git-worktree"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc45b5ac445d0f8719def12303f037966f810cf399ebe0daf29217865df9a49"
+checksum = "ca3bc63878f134e08ed52dba5d82422798c01a3f2e48c38ae9a2f7ff9194f362"
 dependencies = [
  "bstr 1.0.1",
  "git-attributes",
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml
index 3fd25655..19b660a6 100644
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
@@ -16,7 +16,7 @@ helix-core = { version = "0.6", path = "../helix-core" }
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
 parking_lot = "0.12"
 
-git-repository = { version = "0.31", default-features = false , optional = true }
+git-repository = { version = "0.32", default-features = false , optional = true }
 imara-diff = "0.1.5"
 
 log = "0.4"

From 22298434f10e203bc1adb8eebfdfbfbff05db977 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 10 Jan 2023 03:31:41 -0600
Subject: [PATCH 729/884] jsonrpc: Skip serializing params if params are None
 (#5471)

The JSONRPC spec says:

> If present, parameters for the rpc call MUST be provided as a
> Structured value

https://www.jsonrpc.org/specification#parameter_structures

(Where a "Structured value" is elsewhere defined as either a map or
array.)

This change skips the serialization of the `params` field for JSONRPC
method calls and notifications if the `params` field is the `None`
variant. This fixes compatibility with LSP servers which adhere closely
to that part of the spec: `ocamllsp` in the wild.
---
 helix-lsp/src/jsonrpc.rs | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/helix-lsp/src/jsonrpc.rs b/helix-lsp/src/jsonrpc.rs
index 75ac9309..69d02707 100644
--- a/helix-lsp/src/jsonrpc.rs
+++ b/helix-lsp/src/jsonrpc.rs
@@ -170,6 +170,10 @@ impl Params {
         serde_json::from_value(value)
             .map_err(|err| Error::invalid_params(format!("Invalid params: {}.", err)))
     }
+
+    pub fn is_none(&self) -> bool {
+        self == &Params::None
+    }
 }
 
 impl From<Params> for Value {
@@ -187,7 +191,7 @@ impl From<Params> for Value {
 pub struct MethodCall {
     pub jsonrpc: Option<Version>,
     pub method: String,
-    #[serde(default = "default_params")]
+    #[serde(default = "default_params", skip_serializing_if = "Params::is_none")]
     pub params: Params,
     pub id: Id,
 }
@@ -197,7 +201,7 @@ pub struct MethodCall {
 pub struct Notification {
     pub jsonrpc: Option<Version>,
     pub method: String,
-    #[serde(default = "default_params")]
+    #[serde(default = "default_params", skip_serializing_if = "Params::is_none")]
     pub params: Params,
 }
 
@@ -334,6 +338,33 @@ fn notification_serialize() {
     );
 }
 
+#[test]
+fn serialize_skip_none_params() {
+    use serde_json;
+
+    let m = MethodCall {
+        jsonrpc: Some(Version::V2),
+        method: "shutdown".to_owned(),
+        params: Params::None,
+        id: Id::Num(1),
+    };
+
+    let serialized = serde_json::to_string(&m).unwrap();
+    assert_eq!(
+        serialized,
+        r#"{"jsonrpc":"2.0","method":"shutdown","id":1}"#
+    );
+
+    let n = Notification {
+        jsonrpc: Some(Version::V2),
+        method: "exit".to_owned(),
+        params: Params::None,
+    };
+
+    let serialized = serde_json::to_string(&n).unwrap();
+    assert_eq!(serialized, r#"{"jsonrpc":"2.0","method":"exit"}"#);
+}
+
 #[test]
 fn success_output_deserialize() {
     use serde_json;

From 0374350225c1d56a5d2c78b23bc393005733618b Mon Sep 17 00:00:00 2001
From: two-six <twopsix@gmail.com>
Date: Tue, 10 Jan 2023 18:10:57 +0100
Subject: [PATCH 730/884] Acme Theme - Change bufferline foreground color
 (#5486)

---
 runtime/themes/acme.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/themes/acme.toml b/runtime/themes/acme.toml
index e1785f4a..7ac410bc 100644
--- a/runtime/themes/acme.toml
+++ b/runtime/themes/acme.toml
@@ -20,7 +20,7 @@
 "diagnostic.error" = {bg="red", fg="white", modifiers=["bold"]}
 "diagnostic.warning" = {bg="orange", fg="black", modifiers=["bold"]}
 "diagnostic.hint" = {fg="gray", modifiers=["bold"]}
-"ui.bufferline" = { fg = "indent", bg = "acme_bar_bg" }
+"ui.bufferline" = { fg = "black", bg = "acme_bar_bg" }
 "ui.bufferline.active" = { fg = "black", bg = "acme_bg" }
 "diff.plus" = {fg = "green"}
 "diff.delta" = {fg = "acme_bar_bg"}

From 927fa112ec049e5f40309ffdd57c314897e18bbc Mon Sep 17 00:00:00 2001
From: two-six <twopsix@gmail.com>
Date: Tue, 10 Jan 2023 22:59:12 +0100
Subject: [PATCH 731/884] Acme Theme - Add `ui.linenr` configuration (#5488)

---
 runtime/themes/acme.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/runtime/themes/acme.toml b/runtime/themes/acme.toml
index 7ac410bc..e1d66ff8 100644
--- a/runtime/themes/acme.toml
+++ b/runtime/themes/acme.toml
@@ -2,6 +2,8 @@
 
 "ui.background" = {bg="acme_bg"}
 "ui.text" = "black"
+"ui.linenr" = {bg="acme_bg", fg="black"}
+"ui.linenr.selected" = {bg="acme_bg", fg="black"}
 "ui.selection" = {bg="selected"}
 "ui.cursorline" = {bg="acme_bar_bg"}
 "ui.statusline" = {fg="black", bg="acme_bar_bg"}

From 3ca42f7787085ca1c435147da2fcc696a87f6e21 Mon Sep 17 00:00:00 2001
From: taupiqueur <93834534+taupiqueur@users.noreply.github.com>
Date: Wed, 11 Jan 2023 02:49:55 +0100
Subject: [PATCH 732/884] Fix name of channel endpoints in DAP client (#5366)

---
 helix-dap/src/client.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/helix-dap/src/client.rs b/helix-dap/src/client.rs
index 371cf303..e72d290e 100644
--- a/helix-dap/src/client.rs
+++ b/helix-dap/src/client.rs
@@ -70,7 +70,7 @@ impl Client {
         process: Option<Child>,
     ) -> Result<(Self, UnboundedReceiver<Payload>)> {
         let (server_rx, server_tx) = Transport::start(rx, tx, err, id);
-        let (client_rx, client_tx) = unbounded_channel();
+        let (client_tx, client_rx) = unbounded_channel();
 
         let client = Self {
             id,
@@ -86,9 +86,9 @@ impl Client {
             quirks: DebuggerQuirks::default(),
         };
 
-        tokio::spawn(Self::recv(server_rx, client_rx));
+        tokio::spawn(Self::recv(server_rx, client_tx));
 
-        Ok((client, client_tx))
+        Ok((client, client_rx))
     }
 
     pub async fn tcp(

From e65f28d41af0b095eb7ff340f20c7d0d4193e287 Mon Sep 17 00:00:00 2001
From: Matthias Wahl <mfelsche@users.noreply.github.com>
Date: Wed, 11 Jan 2023 02:54:19 +0100
Subject: [PATCH 733/884] Add language support for ponylang (#5416)

See https://www.ponylang.io
---
 book/src/generated/lang-support.md       |   1 +
 languages.toml                           |  13 ++
 runtime/queries/ponylang/highlights.scm  | 176 +++++++++++++++++++++++
 runtime/queries/ponylang/indents.scm     |  32 +++++
 runtime/queries/ponylang/locals.scm      |  37 +++++
 runtime/queries/ponylang/textobjects.scm |  64 +++++++++
 6 files changed, 323 insertions(+)
 create mode 100644 runtime/queries/ponylang/highlights.scm
 create mode 100644 runtime/queries/ponylang/indents.scm
 create mode 100644 runtime/queries/ponylang/locals.scm
 create mode 100644 runtime/queries/ponylang/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index a21d9da9..a506e6a5 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -93,6 +93,7 @@
 | pascal | ✓ | ✓ |  | `pasls` |
 | perl | ✓ | ✓ | ✓ |  |
 | php | ✓ | ✓ | ✓ | `intelephense` |
+| ponylang | ✓ | ✓ | ✓ |  |
 | prisma | ✓ |  |  | `prisma-language-server` |
 | prolog |  |  |  | `swipl` |
 | protobuf | ✓ |  | ✓ |  |
diff --git a/languages.toml b/languages.toml
index 3ade3ea9..076e6363 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2079,3 +2079,16 @@ indent = { tab-width = 2, unit = "  " }
 [[grammar]]
 name = "matlab"
 source = { git = "https://github.com/mstanciu552/tree-sitter-matlab", rev = "2d5d3d5193718a86477d4335aba5b34e79147326" }
+
+[[language]]
+name = "ponylang"
+scope = "source.pony"
+file-types = ["pony"]
+injection-regex = "pony"
+roots = ["corral.json", "lock.json"]
+indent = { tab-width = 2, unit = "  " }
+comment-token = "//"
+
+[[grammar]]
+name = "ponylang"
+source = { git = "https://github.com/mfelsche/tree-sitter-ponylang", rev = "ef66b151bc2604f431b5668fcec4747db4290e11" }
diff --git a/runtime/queries/ponylang/highlights.scm b/runtime/queries/ponylang/highlights.scm
new file mode 100644
index 00000000..2d0594a7
--- /dev/null
+++ b/runtime/queries/ponylang/highlights.scm
@@ -0,0 +1,176 @@
+[
+  (line_comment)
+  (block_comment)
+] @comment
+
+(bool) @constant.builtin.boolean
+(integer) @constant.numeric.integer
+(float) @constant.numeric.float
+(character) @constant.character
+
+;; strings and docstring
+(source_file docstring: (string) @string.special)
+(entity docstring: (string) @string.special)
+(method docstring: (string) @string.special) ; docstring for methods without body
+(behavior docstring: (string) @string.special) ; docstring for methods without body
+(constructor docstring: (string) @string.special) ; docstring for methods without body
+(method body: (block . (string) @string.special)) ; docstring for methods with body
+(behavior body: (block . (string) @string.special))
+(constructor body: (block . (string) @string.special))
+(field docstring: (string) @string.special)
+(string) @string
+
+;; Punctuation
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
+[
+  ";"
+  "."
+  ","
+] @punctuation.delimiter
+
+(this) @variable.builtin
+
+(field name: (identifier) @variable.other.member)
+
+"use" @keyword.control.import
+[
+  "for"
+  "in"
+  "while"
+  "do"
+  "repeat"
+  "until"
+] @keyword.control.repeat
+[
+ "if"
+ "ifdef"
+ "iftype"
+ "then"
+ "elseif"
+ "else"
+ "match"
+] @keyword.control.conditional
+[
+  "break"
+  "continue"
+  "return"
+  "error"
+  "compile_error"
+  "compile_intrinsic"
+] @keyword.control.return
+[
+  "recover"
+  "consume"
+  "end"
+  "try"
+  "with"
+] @keyword.control
+
+[
+  "as"
+  "is"
+  "isnt"
+  "not"
+  "and"
+  "or"
+  "xor"
+  "digestof"
+  "addressof"
+  (location)
+] @keyword.operator
+
+(entity_type) @keyword.storage.type
+
+[
+  "var"
+  "let"
+  "embed"
+] @keyword.storage
+
+[
+  "fun"
+  "be"
+  "new"
+] @keyword.function
+
+[
+  (cap)
+  (gencap)
+  "where"
+] @keyword
+
+[
+  (partial)
+  "=>"
+  "~"
+  ".>"
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "%%"
+  "+~"
+  "-~"
+  "/~"
+  "*~"
+  "%~"
+  "%%~"
+
+  ">>"
+  "<<"
+  ">>~"
+  "<<~"
+
+  "=="
+  "!="
+  ">"
+  "<"
+  ">="
+  "<="
+] @operator
+
+;; Types
+(entity name: (identifier) @type)
+(nominal_type name: (identifier) @type)
+(typeparams (typeparam name: (identifier) @type))
+
+;; constructors / methods / behaviors
+(constructor name: (identifier) @constructor)
+(method name: (identifier) @function.method)
+(behavior name: (identifier) @function.method)
+
+;; method calls
+; TODO: be more specific about what is the actual function reference
+(call callee: (field_access field: (identifier) @function.method))
+(call callee: (_) @function.method)
+(ffi_call name: (_) @function)
+(partial_application function: (identifier) @function.method)
+(chain function: (identifier) @function.method)
+
+;; fields and params
+(field name: (identifier) @variable.other.member)
+(param (identifier) @variable.parameter)
+(lambdaparam (identifier) @variable.parameter)
+
+;; this.field is considered a member access
+(field_access base: (this) field: (identifier) @variable.other.member)
+
+;; annotations
+(annotations (identifier) @attribute)
+
+;; variables
+;; references to upper case things are considered constructors
+(
+  (identifier) @constructor
+  (#match @constructor "^[A-Z]")
+)
+(identifier) @variable
+
diff --git a/runtime/queries/ponylang/indents.scm b/runtime/queries/ponylang/indents.scm
new file mode 100644
index 00000000..ef9c8203
--- /dev/null
+++ b/runtime/queries/ponylang/indents.scm
@@ -0,0 +1,32 @@
+; queries for helix to do automatic indentation upon hitting enter
+; TODO: needs more work, cover more cases
+[
+  (entity)
+  (method)
+  (behavior)
+  (constructor)
+  (block)
+  (tuple)
+  (grouped)
+] @indent
+(match_case body: (block) @indent)
+; ffi_call and call
+(_ arguments: (_) @indent)
+(assignment right: (_) @indent
+ (#set! "scope" "all")
+)
+
+[
+  (params)
+  (object)
+  ("if")
+] @extend
+(lambda params: (_) @extend)
+
+[
+  "end"
+  "}"
+  "]"
+  ")"
+  "|"
+] @outdent
diff --git a/runtime/queries/ponylang/locals.scm b/runtime/queries/ponylang/locals.scm
new file mode 100644
index 00000000..e9efd69e
--- /dev/null
+++ b/runtime/queries/ponylang/locals.scm
@@ -0,0 +1,37 @@
+[
+  (entity)
+  (method)
+  (behavior)
+  (constructor)
+  ("if")
+  (elseif)
+  (ifdef)
+  (elseifdef)
+  (iftype)
+  (elseiftype)
+  (match)
+  (match_case)
+  ("while")
+  ("repeat")
+  ("for")
+  (lambda)
+  (try_block)
+  (with)
+] @local.scope
+(match else_block: (block) @local.scope)
+(try_block else_block: (block) @local.scope)
+(try_block then_block: (block) @local.scope)
+(with else_block: (block) @local.scope)
+
+(field name: (identifier) @local.definition)
+(local name: (identifier) @local.definition)
+(param name: (identifier) @local.definition)
+(lambdaparam name: (identifier) @local.definition)
+("for" element: (idseq (identifier) @local.definition))
+(withelem name: (idseq (identifier) @local.definition))
+
+; only lower case identifiers are references
+(
+  (identifier) @local.reference
+  (#match? @local.reference "^[a-z_][a-zA-Z_]*")
+)
diff --git a/runtime/queries/ponylang/textobjects.scm b/runtime/queries/ponylang/textobjects.scm
new file mode 100644
index 00000000..0f24583d
--- /dev/null
+++ b/runtime/queries/ponylang/textobjects.scm
@@ -0,0 +1,64 @@
+;; Queries for helix to select textobjects: https://docs.helix-editor.com/usage.html#textobjects
+;;  function.inside
+;; function.around
+;; class.inside
+;; class.around
+;; test.inside
+;; test.around
+;; parameter.inside
+;; comment.inside
+;; comment.around
+
+;; Queries for navigating using textobjects
+
+[
+  (line_comment)
+  (block_comment)
+] @comment.inside
+
+(line_comment)+ @comment.around
+(block_comment) @comment.around
+
+(entity members: (members)? @class.inside) @class.around
+(object members: (members)? @class.inside) @class.around
+
+(method
+  body: (block)? @function.inside
+) @function.around
+(behavior
+  body: (block)? @function.inside
+) @function.around
+(constructor
+  body: (block)? @function.inside
+) @function.around
+(lambda
+  body: (block)? @function.inside
+) @function.outside
+
+(params
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around
+)
+(lambda
+  params: ((_) @parameter.inside . ","? @parameter.around) @parameter.around
+)
+(typeargs
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around
+)
+(typeparams
+  ((_) @parameter.inside . ","? @parameter.around) @parameter.around
+)
+(arguments
+  positional: (positional_args
+                ((_) @parameter.inside . ","? @parameter.around)? @parameter.around)
+  ; TODO: get named args right
+  named: (named_args ((_) @parameter.inside . ","? @parameter.around)? @parameter.around)
+)
+
+(
+  (entity
+    provides: (type (nominal_type name: (identifier) @_provides))
+    members: (members) @test.inside
+  ) @test.outside
+  (#eq? @_provides "UnitTest")
+)
+

From a8248c50e1017cbba42c602d480d3c4ffa7162a0 Mon Sep 17 00:00:00 2001
From: Sam McCall <sam.mccall@gmail.com>
Date: Wed, 11 Jan 2023 02:57:10 +0100
Subject: [PATCH 734/884] Update tree-sitter-cpp, support injections in tagged
 rawstrings (#5457)

The grammar now exposes the delimiter of raw-strings.
We can now inject the inner grammar in cases like:

    const char* script = R"js(
      alert('hello world!');
    )js";
---
 languages.toml                     | 2 +-
 runtime/queries/cpp/injections.scm | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 076e6363..56e21fb0 100644
--- a/languages.toml
+++ b/languages.toml
@@ -221,7 +221,7 @@ args = { console = "internalConsole", attachCommands = [ "platform select remote
 
 [[grammar]]
 name = "cpp"
-source = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "d5e90fba898f320db48d81ddedd78d52c67c1fed" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "2d2c4aee8672af4c7c8edff68e7dd4c07e88d2b1" }
 
 [[language]]
 name = "crystal"
diff --git a/runtime/queries/cpp/injections.scm b/runtime/queries/cpp/injections.scm
index a5a5208c..fb783bb6 100644
--- a/runtime/queries/cpp/injections.scm
+++ b/runtime/queries/cpp/injections.scm
@@ -1 +1,4 @@
 ; inherits: c
+(raw_string_literal
+  delimiter: (raw_string_delimiter) @injection.language
+  (raw_string_content) @injection.content)

From 75dfaff33891d0505e3018a8357fa0619ef1fcc2 Mon Sep 17 00:00:00 2001
From: Pascal Sommer <Pascal-So@users.noreply.github.com>
Date: Wed, 11 Jan 2023 03:11:43 +0100
Subject: [PATCH 735/884] Add some function documentations (#5360)

---
 helix-term/src/compositor.rs |  6 ++++--
 helix-term/src/ui/popup.rs   | 10 ++++++++++
 helix-view/src/editor.rs     |  2 ++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs
index 9dad3620..2e4a2e20 100644
--- a/helix-term/src/compositor.rs
+++ b/helix-term/src/compositor.rs
@@ -1,4 +1,4 @@
-// Each component declares it's own size constraints and gets fitted based on it's parent.
+// Each component declares its own size constraints and gets fitted based on its parent.
 // Q: how does this work with popups?
 // cursive does compositor.screen_mut().add_layer_at(pos::absolute(x, y), <component>)
 use helix_core::Position;
@@ -97,6 +97,7 @@ impl Compositor {
         self.area = area;
     }
 
+    /// Add a layer to be rendered in front of all existing layers.
     pub fn push(&mut self, mut layer: Box<dyn Component>) {
         let size = self.size();
         // trigger required_size on init
@@ -136,7 +137,8 @@ impl Compositor {
         let mut consumed = false;
 
         // propagate events through the layers until we either find a layer that consumes it or we
-        // run out of layers (event bubbling)
+        // run out of layers (event bubbling), starting at the front layer and then moving to the
+        // background.
         for layer in self.layers.iter_mut().rev() {
             match layer.handle_event(event, cx) {
                 EventResult::Consumed(Some(callback)) => {
diff --git a/helix-term/src/ui/popup.rs b/helix-term/src/ui/popup.rs
index 62a6785a..5a95c1bb 100644
--- a/helix-term/src/ui/popup.rs
+++ b/helix-term/src/ui/popup.rs
@@ -42,6 +42,10 @@ impl<T: Component> Popup<T> {
         }
     }
 
+    /// Set the anchor position next to which the popup should be drawn.
+    ///
+    /// Note that this is not the position of the top-left corner of the rendered popup itself,
+    /// but rather the screen-space position of the information to which the popup refers.
     pub fn position(mut self, pos: Option<Position>) -> Self {
         self.position = pos;
         self
@@ -51,6 +55,10 @@ impl<T: Component> Popup<T> {
         self.position
     }
 
+    /// Set the popup to prefer to render above or below the anchor position.
+    ///
+    /// This preference will be ignored if the viewport doesn't have enough space in the
+    /// chosen direction.
     pub fn position_bias(mut self, bias: Open) -> Self {
         self.position_bias = bias;
         self
@@ -78,6 +86,8 @@ impl<T: Component> Popup<T> {
         self
     }
 
+    /// Calculate the position where the popup should be rendered and return the coordinates of the
+    /// top left corner.
     pub fn get_rel_position(&mut self, viewport: Rect, cx: &Context) -> (u16, u16) {
         let position = self
             .position
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 3521077e..547a4ffb 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1341,6 +1341,8 @@ impl Editor {
             .find(|doc| doc.path().map(|p| p == path.as_ref()).unwrap_or(false))
     }
 
+    /// Gets the primary cursor position in screen coordinates,
+    /// or `None` if the primary cursor is not visible on screen.
     pub fn cursor(&self) -> (Option<Position>, CursorKind) {
         let config = self.config();
         let (view, doc) = current_ref!(self);

From 2412f7c8374d2f6a8bfd66ecf424153a37c814bf Mon Sep 17 00:00:00 2001
From: Valentin Bersier <vbersier@gmail.com>
Date: Wed, 11 Jan 2023 03:14:40 +0100
Subject: [PATCH 736/884] Update catppuccin themes (#5404)

---
 runtime/themes/catppuccin_frappe.toml    | 106 +---------------------
 runtime/themes/catppuccin_latte.toml     | 107 +----------------------
 runtime/themes/catppuccin_macchiato.toml | 106 +---------------------
 runtime/themes/catppuccin_mocha.toml     |  42 +++++----
 4 files changed, 28 insertions(+), 333 deletions(-)

diff --git a/runtime/themes/catppuccin_frappe.toml b/runtime/themes/catppuccin_frappe.toml
index 89ae77c8..eb1d4719 100644
--- a/runtime/themes/catppuccin_frappe.toml
+++ b/runtime/themes/catppuccin_frappe.toml
@@ -1,108 +1,4 @@
-# Syntax highlighting
-# -------------------
-"type" = "yellow"
-"type.enum.variant" = "peach"
-
-"constructor" = "sapphire"
-
-"constant" = "peach"
-"constant.character" = "teal"
-"constant.character.escape" = "pink"
-
-"string" = "green"
-"string.regexp" = "peach"
-"string.special" = "pink"
-
-"comment" = { fg = "overlay1", modifiers = ["italic"] }
-
-"variable" = "text"
-"variable.parameter" = { fg = "maroon", modifiers = ["italic"] }
-"variable.builtin" = "red"
-"variable.other.member" = "teal"
-
-"label" = "sapphire" # used for lifetimes
-
-"punctuation" = "overlay2"
-
-"keyword" = "mauve"
-"keyword.control.conditional" = { fg = "mauve", modifiers = ["italic"] }
-
-"operator" = "sky"
-
-"function" = "blue"
-"function.builtin" = "peach"
-"function.macro" = "teal"
-
-"tag" = "mauve"
-
-"namespace" = { fg = "blue", modifiers = ["italic"] }
-
-"special" = "blue" # fuzzy highlight
-
-"markup.heading.marker" = { fg = "peach", modifiers = ["bold"] }
-"markup.heading.1" = "lavender"
-"markup.heading.2" = "mauve"
-"markup.heading.3" = "green"
-"markup.heading.4" = "yellow"
-"markup.heading.5" = "pink"
-"markup.heading.6" = "teal"
-"markup.list" = "mauve"
-"markup.bold" = { modifiers = ["bold"] }
-"markup.italic" = { modifiers = ["italic"] }
-"markup.link.url" = { fg = "peach", modifiers = ["underlined"] }
-"markup.link.text" = "blue"
-"markup.raw" = "flamingo"
-
-"diff.plus" = "green"
-"diff.minus" = "red"
-"diff.delta" = "yellow"
-
-# User Interface
-# --------------
-"ui.background" = { fg = "text", bg = "base" }
-
-"ui.linenr" = { fg = "surface1" }
-"ui.linenr.selected" = { fg = "lavender" }
-
-"ui.statusline" = { fg = "overlay1", bg = "surface0" }
-"ui.statusline.inactive" = { fg = "overlay1", bg = "mantle" }
-"ui.statusline.normal" = { fg = "surface0", bg = "lavender", modifiers = ["bold"] }
-"ui.statusline.insert" = { fg = "surface0", bg = "green", modifiers = ["bold"]  }
-"ui.statusline.select" = { fg = "surface0", bg = "flamingo", modifiers = ["bold"]  }
-
-"ui.bufferline" = { fg = "subtext1", bg = "mantle" }
-"ui.bufferline.active" = { fg = "text", bg = "surface0", modifiers = ["bold"] }
-
-"ui.popup" = { fg = "text", bg = "surface0" }
-"ui.window" = { fg = "crust" }
-"ui.help" = { fg = "overlay2", bg = "surface0" }
-
-"ui.text" = "text" 
-"ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] }
-
-"ui.virtual" = "overlay0"
-"ui.virtual.ruler" = { bg = "surface0" }
-"ui.virtual.indent-guide" = "surface0"
-
-"ui.selection" = { bg = "surface1" }
-
-"ui.cursor" = { fg = "base", bg = "secondary_cursor" }
-"ui.cursor.primary" = { fg = "base", bg = "rosewater" }
-"ui.cursor.match" = { fg = "peach", modifiers = ["bold"] }
-
-"ui.cursorline.primary" = { bg = "cursorline" }
-
-"ui.highlight" = { bg = "surface1" }
-
-"ui.menu" = { fg = "overlay2", bg = "surface0" }
-"ui.menu.selected" = { fg = "text", bg = "surface1", modifiers = ["bold"] }
-
-diagnostic = { modifiers = ["underlined"] }
-
-error = "red"
-warning = "yellow"
-info = "sky"
-hint = "teal"
+inherits = "catppuccin_mocha"
 
 [palette]
 # catppuccin palette colors
diff --git a/runtime/themes/catppuccin_latte.toml b/runtime/themes/catppuccin_latte.toml
index 8e8780f9..e1580c9d 100644
--- a/runtime/themes/catppuccin_latte.toml
+++ b/runtime/themes/catppuccin_latte.toml
@@ -1,109 +1,4 @@
-# Syntax highlighting
-# -------------------
-"type" = "yellow"
-"type.enum.variant" = "peach"
-
-"constructor" = "sapphire"
-
-"constant" = "peach"
-"constant.character" = "teal"
-"constant.character.escape" = "pink"
-
-"string" = "green"
-"string.regexp" = "peach"
-"string.special" = "pink"
-
-"comment" = { fg = "overlay1", modifiers = ["italic"] }
-
-"variable" = "text"
-"variable.parameter" = { fg = "maroon", modifiers = ["italic"] }
-"variable.builtin" = "red"
-"variable.other.member" = "teal"
-
-"label" = "sapphire" # used for lifetimes
-
-"punctuation" = "overlay2"
-
-"keyword" = "mauve"
-"keyword.control.conditional" = { fg = "mauve", modifiers = ["italic"] }
-
-"operator" = "sky"
-
-"function" = "blue"
-"function.builtin" = "peach"
-"function.macro" = "teal"
-
-"tag" = "mauve"
-
-"namespace" = { fg = "blue", modifiers = ["italic"] }
-
-"special" = "blue" # fuzzy highlight
-
-"markup.heading.marker" = { fg = "peach", modifiers = ["bold"] }
-"markup.heading.1" = "lavender"
-"markup.heading.2" = "mauve"
-"markup.heading.3" = "green"
-"markup.heading.4" = "yellow"
-"markup.heading.5" = "pink"
-"markup.heading.6" = "teal"
-"markup.list" = "mauve"
-"markup.bold" = { modifiers = ["bold"] }
-"markup.italic" = { modifiers = ["italic"] }
-"markup.link.url" = { fg = "peach", modifiers = ["underlined"] }
-"markup.link.text" = "blue"
-"markup.raw" = "flamingo"
-
-"diff.plus" = "green"
-"diff.minus" = "red"
-"diff.delta" = "yellow"
-
-# User Interface
-# --------------
-"ui.background" = { fg = "text", bg = "base" }
-
-"ui.linenr" = { fg = "surface1" }
-"ui.linenr.selected" = { fg = "lavender" }
-
-"ui.statusline" = { fg = "overlay1", bg = "surface0" }
-"ui.statusline.inactive" = { fg = "overlay1", bg = "mantle" }
-"ui.statusline.normal" = { fg = "surface0", bg = "lavender", modifiers = ["bold"] }
-"ui.statusline.insert" = { fg = "surface0", bg = "green", modifiers = ["bold"]  }
-"ui.statusline.select" = { fg = "surface0", bg = "flamingo", modifiers = ["bold"]  }
-
-"ui.bufferline" = { fg = "overlay2", bg = "surface1", modifiers = ["italic"] }
-"ui.bufferline.active" = { fg = "text", bg = "surface0", modifiers = ["bold"] }
-"ui.bufferline.background" = { bg = "surface1" }
-
-"ui.popup" = { fg = "text", bg = "surface0" }
-"ui.window" = { fg = "crust" }
-"ui.help" = { fg = "overlay2", bg = "surface0" }
-
-"ui.text" = "text" 
-"ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] }
-
-"ui.virtual" = "overlay0"
-"ui.virtual.ruler" = { bg = "surface0" }
-"ui.virtual.indent-guide" = "surface0"
-
-"ui.selection" = { bg = "surface1" }
-
-"ui.cursor" = { fg = "base", bg = "secondary_cursor" }
-"ui.cursor.primary" = { fg = "base", bg = "rosewater" }
-"ui.cursor.match" = { fg = "peach", modifiers = ["bold"] }
-
-"ui.cursorline.primary" = { bg = "cursorline" }
-
-"ui.highlight" = { bg = "surface1" }
-
-"ui.menu" = { fg = "overlay2", bg = "surface0" }
-"ui.menu.selected" = { fg = "text", bg = "surface1", modifiers = ["bold"] }
-
-diagnostic = { modifiers = ["underlined"] }
-
-error = "red"
-warning = "yellow"
-info = "sky"
-hint = "teal"
+inherits = "catppuccin_mocha"
 
 [palette]
 # catppuccin palette colors
diff --git a/runtime/themes/catppuccin_macchiato.toml b/runtime/themes/catppuccin_macchiato.toml
index c2fe3184..e09a82f9 100644
--- a/runtime/themes/catppuccin_macchiato.toml
+++ b/runtime/themes/catppuccin_macchiato.toml
@@ -1,108 +1,4 @@
-# Syntax highlighting
-# -------------------
-"type" = "yellow"
-"type.enum.variant" = "peach"
-
-"constructor" = "sapphire"
-
-"constant" = "peach"
-"constant.character" = "teal"
-"constant.character.escape" = "pink"
-
-"string" = "green"
-"string.regexp" = "peach"
-"string.special" = "pink"
-
-"comment" = { fg = "overlay1", modifiers = ["italic"] }
-
-"variable" = "text"
-"variable.parameter" = { fg = "maroon", modifiers = ["italic"] }
-"variable.builtin" = "red"
-"variable.other.member" = "teal"
-
-"label" = "sapphire" # used for lifetimes
-
-"punctuation" = "overlay2"
-
-"keyword" = "mauve"
-"keyword.control.conditional" = { fg = "mauve", modifiers = ["italic"] }
-
-"operator" = "sky"
-
-"function" = "blue"
-"function.builtin" = "peach"
-"function.macro" = "teal"
-
-"tag" = "mauve"
-
-"namespace" = { fg = "blue", modifiers = ["italic"] }
-
-"special" = "blue" # fuzzy highlight
-
-"markup.heading.marker" = { fg = "peach", modifiers = ["bold"] }
-"markup.heading.1" = "lavender"
-"markup.heading.2" = "mauve"
-"markup.heading.3" = "green"
-"markup.heading.4" = "yellow"
-"markup.heading.5" = "pink"
-"markup.heading.6" = "teal"
-"markup.list" = "mauve"
-"markup.bold" = { modifiers = ["bold"] }
-"markup.italic" = { modifiers = ["italic"] }
-"markup.link.url" = { fg = "peach", modifiers = ["underlined"] }
-"markup.link.text" = "blue"
-"markup.raw" = "flamingo"
-
-"diff.plus" = "green"
-"diff.minus" = "red"
-"diff.delta" = "yellow"
-
-# User Interface
-# --------------
-"ui.background" = { fg = "text", bg = "base" }
-
-"ui.linenr" = { fg = "surface1" }
-"ui.linenr.selected" = { fg = "lavender" }
-
-"ui.statusline" = { fg = "overlay1", bg = "surface0" }
-"ui.statusline.inactive" = { fg = "overlay1", bg = "mantle" }
-"ui.statusline.normal" = { fg = "surface0", bg = "lavender", modifiers = ["bold"] }
-"ui.statusline.insert" = { fg = "surface0", bg = "green", modifiers = ["bold"]  }
-"ui.statusline.select" = { fg = "surface0", bg = "flamingo", modifiers = ["bold"]  }
-
-"ui.bufferline.active" = { fg = "text", bg = "base", modifiers = ["bold"] }
-"ui.bufferline" = { fg = "overlay1", bg = "mantle" }
-
-"ui.popup" = { fg = "text", bg = "surface0" }
-"ui.window" = { fg = "crust" }
-"ui.help" = { fg = "overlay2", bg = "surface0" }
-
-"ui.text" = "text" 
-"ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] }
-
-"ui.virtual" = "overlay0"
-"ui.virtual.ruler" = { bg = "surface0" }
-"ui.virtual.indent-guide" = "surface0"
-
-"ui.selection" = { bg = "surface1" }
-
-"ui.cursor" = { fg = "base", bg = "secondary_cursor" }
-"ui.cursor.primary" = { fg = "base", bg = "rosewater" }
-"ui.cursor.match" = { fg = "peach", modifiers = ["bold"] }
-
-"ui.cursorline.primary" = { bg = "cursorline" }
-
-"ui.highlight" = { bg = "surface1" }
-
-"ui.menu" = { fg = "overlay2", bg = "surface0" }
-"ui.menu.selected" = { fg = "text", bg = "surface1", modifiers = ["bold"] }
-
-diagnostic = { modifiers = ["underlined"] }
-
-error = "red"
-warning = "yellow"
-info = "sky"
-hint = "teal"
+inherits = "catppuccin_mocha"
 
 [palette]
 # catppuccin palette colors
diff --git a/runtime/themes/catppuccin_mocha.toml b/runtime/themes/catppuccin_mocha.toml
index c4750b28..575ef303 100644
--- a/runtime/themes/catppuccin_mocha.toml
+++ b/runtime/themes/catppuccin_mocha.toml
@@ -1,19 +1,19 @@
 # Syntax highlighting
 # -------------------
 "type" = "yellow"
-"type.enum.variant" = "peach"
 
 "constructor" = "sapphire"
 
 "constant" = "peach"
+"constant.builtin" = "peach"
 "constant.character" = "teal"
 "constant.character.escape" = "pink"
 
 "string" = "green"
 "string.regexp" = "peach"
-"string.special" = "pink"
+"string.special" = "blue"
 
-"comment" = { fg = "overlay1", modifiers = ["italic"] }
+"comment" = { fg = "surface2", modifiers = ["italic"] }
 
 "variable" = "text"
 "variable.parameter" = { fg = "maroon", modifiers = ["italic"] }
@@ -23,6 +23,7 @@
 "label" = "sapphire" # used for lifetimes
 
 "punctuation" = "overlay2"
+"punctuation.special" = "sky"
 
 "keyword" = "mauve"
 "keyword.control.conditional" = { fg = "mauve", modifiers = ["italic"] }
@@ -31,7 +32,7 @@
 
 "function" = "blue"
 "function.builtin" = "peach"
-"function.macro" = "teal"
+"function.macro" = "mauve"
 
 "tag" = "mauve"
 
@@ -49,13 +50,13 @@
 "markup.list" = "mauve"
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
-"markup.link.url" = { fg = "peach", modifiers = ["underlined"] }
+"markup.link.url" = { fg = "rosewater", modifiers = ["italic", "underlined"] }
 "markup.link.text" = "blue"
 "markup.raw" = "flamingo"
 
 "diff.plus" = "green"
 "diff.minus" = "red"
-"diff.delta" = "yellow"
+"diff.delta" = "blue"
 
 # User Interface
 # --------------
@@ -64,20 +65,24 @@
 "ui.linenr" = { fg = "surface1" }
 "ui.linenr.selected" = { fg = "lavender" }
 
-"ui.statusline" = { fg = "overlay1", bg = "surface0" }
-"ui.statusline.inactive" = { fg = "overlay1", bg = "mantle" }
-"ui.statusline.normal" = { fg = "surface0", bg = "lavender", modifiers = ["bold"] }
-"ui.statusline.insert" = { fg = "surface0", bg = "green", modifiers = ["bold"]  }
-"ui.statusline.select" = { fg = "surface0", bg = "flamingo", modifiers = ["bold"]  }
-
-"ui.bufferline.active" = { fg = "text", bg = "base", modifiers = ["bold"] }
-"ui.bufferline" = { fg = "overlay1", bg = "mantle" }
+"ui.statusline" = { fg = "text", bg = "mantle" }
+"ui.statusline.inactive" = { fg = "surface2", bg = "mantle" }
+"ui.statusline.normal" = { fg = "base", bg = "lavender", modifiers = ["bold"] }
+"ui.statusline.insert" = { fg = "base", bg = "green", modifiers = ["bold"] }
+"ui.statusline.select" = { fg = "base", bg = "flamingo", modifiers = ["bold"] }
 
 "ui.popup" = { fg = "text", bg = "surface0" }
 "ui.window" = { fg = "crust" }
 "ui.help" = { fg = "overlay2", bg = "surface0" }
 
-"ui.text" = "text" 
+"ui.bufferline" = { fg = "surface1", bg = "mantle" }
+"ui.bufferline.active" = { fg = "text", bg = "base", modifiers = [
+    "bold",
+    "italic",
+] }
+"ui.bufferline.background" = { bg = "surface0" }
+
+"ui.text" = "text"
 "ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] }
 
 "ui.virtual" = "overlay0"
@@ -92,12 +97,15 @@
 
 "ui.cursorline.primary" = { bg = "cursorline" }
 
-"ui.highlight" = { bg = "surface1" }
+"ui.highlight" = { bg = "surface1", modifiers = ["bold"] }
 
 "ui.menu" = { fg = "overlay2", bg = "surface0" }
 "ui.menu.selected" = { fg = "text", bg = "surface1", modifiers = ["bold"] }
 
-diagnostic = { modifiers = ["underlined"] }
+"diagnostic.error" = { fg = "red", underline = { color = "red", style = "curl" } }
+"diagnostic.warning" = { fg = "yellow", underline = { color = "yellow", style = "curl" } }
+"diagnostic.info" = { fg = "sky", underline = { color = "sky", style = "curl" } }
+"diagnostic.hint" = { fg = "teal", underline = { color = "teal", style = "curl" } }
 
 error = "red"
 warning = "yellow"

From 4e9a0700db6df3c2be123c3c130ab7689135576a Mon Sep 17 00:00:00 2001
From: Yura Shymon <97038258+woojiq@users.noreply.github.com>
Date: Thu, 12 Jan 2023 06:21:11 +0200
Subject: [PATCH 737/884] Update tree-sitter-json, add jsonc as file-type for
 json (#5509)

New git revision of tree-sitter-json that supports comments.
Jsonc is alias for json.
Both formats doesn't mark comments as errors now.
---
 languages.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/languages.toml b/languages.toml
index 56e21fb0..9029c94e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -138,7 +138,7 @@ indent = { tab-width = 2, unit = "  " }
 name = "json"
 scope = "source.json"
 injection-regex = "json"
-file-types = ["json"]
+file-types = ["json", "jsonc"]
 roots = []
 language-server = { command = "vscode-json-language-server", args = ["--stdio"] }
 auto-format = true
@@ -147,7 +147,7 @@ indent = { tab-width = 2, unit = "  " }
 
 [[grammar]]
 name = "json"
-source = { git = "https://github.com/tree-sitter/tree-sitter-json", rev = "65bceef69c3b0f24c0b19ce67d79f57c96e90fcb" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-json", rev = "73076754005a460947cafe8e03a8cf5fa4fa2938" }
 
 [[language]]
 name = "c"

From c988bd9629145b5a337498937a70af555bfa6159 Mon Sep 17 00:00:00 2001
From: blt__ <63462729+blt-r@users.noreply.github.com>
Date: Thu, 12 Jan 2023 08:22:16 +0400
Subject: [PATCH 738/884] Change built-in themes to use curly underlines
 (#5419)

* Change built-in themes to use curly underlines

* Change fleet_dark to use curly underlines
---
 runtime/themes/ayu_dark.toml              |  8 ++++----
 runtime/themes/ayu_light.toml             |  8 ++++----
 runtime/themes/ayu_mirage.toml            |  8 ++++----
 runtime/themes/bogster.toml               |  5 ++++-
 runtime/themes/bogster_light.toml         |  5 ++++-
 runtime/themes/boo_berry.toml             |  6 +++++-
 runtime/themes/darcula.toml               |  6 +++++-
 runtime/themes/doom_acario_dark.toml      |  8 ++++----
 runtime/themes/emacs.toml                 | 10 +++++++---
 runtime/themes/everforest_dark.toml       |  7 ++++++-
 runtime/themes/everforest_light.toml      |  6 +++++-
 runtime/themes/flatwhite.toml             |  5 +++++
 runtime/themes/fleet_dark.toml            |  8 ++++----
 runtime/themes/gruvbox.toml               |  5 ++++-
 runtime/themes/gruvbox_dark_hard.toml     |  7 +++----
 runtime/themes/gruvbox_light.toml         |  7 +++++--
 runtime/themes/heisenberg.toml            |  8 ++++----
 runtime/themes/hex_lavender.toml          |  2 +-
 runtime/themes/hex_steel.toml             |  6 +++++-
 runtime/themes/ingrid.toml                |  5 +++++
 runtime/themes/kanagawa.toml              |  5 ++++-
 runtime/themes/meliora.toml               |  6 +++++-
 runtime/themes/mellow.toml                |  5 ++++-
 runtime/themes/monokai.toml               |  5 ++++-
 runtime/themes/monokai_pro.toml           |  5 ++++-
 runtime/themes/monokai_pro_machine.toml   |  5 ++++-
 runtime/themes/monokai_pro_octagon.toml   |  5 ++++-
 runtime/themes/monokai_pro_ristretto.toml |  5 ++++-
 runtime/themes/monokai_pro_spectrum.toml  |  5 ++++-
 runtime/themes/night_owl.toml             |  6 +++++-
 runtime/themes/nightfox.toml              | 12 ++++++------
 runtime/themes/noctis.toml                |  7 ++++++-
 runtime/themes/noctis_bordo.toml          |  6 +++++-
 runtime/themes/nord.toml                  |  6 ++++++
 runtime/themes/nord_light.toml            |  7 ++++---
 runtime/themes/onedarker.toml             |  6 +++++-
 runtime/themes/onelight.toml              |  6 +++++-
 runtime/themes/papercolor-dark.toml       |  6 +++++-
 runtime/themes/papercolor-light.toml      |  6 +++++-
 runtime/themes/penumbra+.toml             |  5 ++++-
 runtime/themes/pop-dark.toml              |  5 ++++-
 runtime/themes/rasmus.toml                |  5 ++++-
 runtime/themes/rose_pine.toml             |  1 -
 runtime/themes/rose_pine_dawn.toml        |  6 +++++-
 runtime/themes/rose_pine_moon.toml        |  6 +++++-
 runtime/themes/serika-dark.toml           |  6 +++++-
 runtime/themes/serika-light.toml          |  6 +++++-
 runtime/themes/solarized_dark.toml        |  6 +++++-
 runtime/themes/solarized_light.toml       |  7 ++++++-
 runtime/themes/sonokai.toml               |  6 +++++-
 runtime/themes/spacebones_light.toml      |  5 ++++-
 runtime/themes/tokyonight.toml            |  5 ++++-
 runtime/themes/varua.toml                 |  5 ++++-
 53 files changed, 237 insertions(+), 81 deletions(-)

diff --git a/runtime/themes/ayu_dark.toml b/runtime/themes/ayu_dark.toml
index b297a3ab..15ac0986 100644
--- a/runtime/themes/ayu_dark.toml
+++ b/runtime/themes/ayu_dark.toml
@@ -54,10 +54,10 @@
 "error" = { fg = "red", modifiers = ["bold"] }
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "blue", modifiers = ["bold"] }
-"diagnostic"= { fg = "red", modifiers = ["underlined"] }
-"diagnostic.info"= { fg = "blue", modifiers = ["underlined"] }
-"diagnostic.warning"= { fg = "yellow", modifiers = ["underlined"] }
-"diagnostic.error"= { fg = "red", modifiers = ["underlined"] }
+"diagnostic.hint" = { underline = { color = "blue", style="curl"} }
+"diagnostic.info"= { underline = { color = "blue", style="curl"} }
+"diagnostic.warning"= { underline = { color = "yellow", style="curl"} }
+"diagnostic.error"= { underline = { color = "red", style="curl"} }
 "ui.bufferline" = { fg = "gray", bg = "background" }
 "ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
 
diff --git a/runtime/themes/ayu_light.toml b/runtime/themes/ayu_light.toml
index ab0283fb..0b4dab12 100644
--- a/runtime/themes/ayu_light.toml
+++ b/runtime/themes/ayu_light.toml
@@ -54,10 +54,10 @@
 "error" = { fg = "red", modifiers = ["bold"] }
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "blue", modifiers = ["bold"] }
-"diagnostic"= { fg = "red", modifiers = ["underlined"] }
-"diagnostic.info"= { fg = "blue", modifiers = ["underlined"] }
-"diagnostic.warning"= { fg = "yellow", modifiers = ["underlined"] }
-"diagnostic.error"= { fg = "red", modifiers = ["underlined"] }
+"diagnostic.hint"= { underline = { color = "blue", style = "curl" } }
+"diagnostic.info"= { underline = { color = "blue", style = "curl" } }
+"diagnostic.warning"= { underline = { color = "yellow", style = "curl" } }
+"diagnostic.error"= { underline = { color = "red", style = "curl" } }
 "ui.bufferline" = { fg = "gray", bg = "background" }
 "ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
 
diff --git a/runtime/themes/ayu_mirage.toml b/runtime/themes/ayu_mirage.toml
index d6af12fa..fd142a77 100644
--- a/runtime/themes/ayu_mirage.toml
+++ b/runtime/themes/ayu_mirage.toml
@@ -54,10 +54,10 @@
 "error" = { fg = "red", modifiers = ["bold"] }
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "blue", modifiers = ["bold"] }
-"diagnostic"= { fg = "red", modifiers = ["underlined"] }
-"diagnostic.info"= { fg = "blue", modifiers = ["underlined"] }
-"diagnostic.warning"= { fg = "yellow", modifiers = ["underlined"] }
-"diagnostic.error"= { fg = "red", modifiers = ["underlined"] }
+"diagnostic.hint"= { underline = { color = "blue", style = "curl" } }
+"diagnostic.info"= { underline = { color = "blue", style = "curl" } }
+"diagnostic.warning"= { underline = { color = "yellow", style = "curl" } }
+"diagnostic.error"= { underline = { color = "red", style = "curl" } }
 "ui.bufferline" = { fg = "gray", bg = "background" }
 "ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
 
diff --git a/runtime/themes/bogster.toml b/runtime/themes/bogster.toml
index eb6c4c50..f6d9fdbf 100644
--- a/runtime/themes/bogster.toml
+++ b/runtime/themes/bogster.toml
@@ -72,7 +72,10 @@
 "hint" = "bogster-blue"
 
 # make diagnostic underlined, to distinguish with selection text.
-diagnostic = { modifiers = ["underlined"] }
+"diagnostic.warning" = { underline = { color = "bogster-orange", style = "curl"} }
+"diagnostic.error" = { underline = { color = "bogster-lred", style = "curl"} }
+"diagnostic.info" = { underline = { color = "bogster-teal", style = "curl"} }
+"diagnostic.hint" = { underline = { color = "bogster-blue", style = "curl"} }
 
 [palette]
 bogster-yellow = "#dcb659"
diff --git a/runtime/themes/bogster_light.toml b/runtime/themes/bogster_light.toml
index 25aa4c80..2270f6ee 100644
--- a/runtime/themes/bogster_light.toml
+++ b/runtime/themes/bogster_light.toml
@@ -72,7 +72,10 @@
 "hint" = "bogster-blue"
 
 # make diagnostic underlined, to distinguish with selection text.
-diagnostic = { modifiers = ["underlined"] }
+"diagnostic.warning" = { underline = { color = "bogster-orange", style = "curl"} }
+"diagnostic.error" = { underline = { color = "bogster-lred", style = "curl"} }
+"diagnostic.info" = { underline = { color = "bogster-teal", style = "curl"} }
+"diagnostic.hint" = { underline = { color = "bogster-blue", style = "curl"} }
 
 [palette]
 bogster-orange = "#dc7759"
diff --git a/runtime/themes/boo_berry.toml b/runtime/themes/boo_berry.toml
index da78db90..33d7627d 100644
--- a/runtime/themes/boo_berry.toml
+++ b/runtime/themes/boo_berry.toml
@@ -60,7 +60,11 @@
 "warning" = { fg = "gold" }
 "info" = { fg = "lilac" }
 "hint" = { fg = "lilac" }
-"diagnostic" = { modifiers = ["underlined"] }
+
+"diagnostic.warning" = { underline = { color = "bubblegum", style = "curl"} }
+"diagnostic.error" = { underline = { color = "gold", style = "curl"} }
+"diagnostic.info" = { underline = { color = "lilac", style = "curl"} }
+"diagnostic.hint" = { underline = { color = "lilac", style = "curl"} }
 
 [palette]
 berry = "#3A2A4D"
diff --git a/runtime/themes/darcula.toml b/runtime/themes/darcula.toml
index 5e88438e..ed2b081a 100644
--- a/runtime/themes/darcula.toml
+++ b/runtime/themes/darcula.toml
@@ -65,7 +65,11 @@
 "diff.delta" = "grey"
 "diff.minus" = "red"
 
-"diagnostic" = { modifiers = ["underlined"] }
+"diagnostic.warning" = { underline = { color = "orange", style = "curl"} }
+"diagnostic.error" = { underline = { color = "red", style = "curl"} }
+"diagnostic.info" = { underline = { color = "grey05", style = "curl"} }
+"diagnostic.hint" = { underline = { color = "grey05", style = "curl"} }
+
 "info" = "grey05"
 "hint" = "grey05"
 "debug" = "grey05"
diff --git a/runtime/themes/doom_acario_dark.toml b/runtime/themes/doom_acario_dark.toml
index 95dc78e0..c103dbfb 100644
--- a/runtime/themes/doom_acario_dark.toml
+++ b/runtime/themes/doom_acario_dark.toml
@@ -73,10 +73,10 @@
 'info' = { fg = 'blue', modifiers = ['bold'] }
 'hint' = { fg = 'blue', modifiers = ['bold'] }
 
-'diagnostic'= { fg = 'red', modifiers = ['underlined'] }
-'diagnostic.error'= { fg = 'red', modifiers = ['underlined'] }
-'diagnostic.info'= { fg = 'blue', modifiers = ['underlined'] }
-'diagnostic.warning'= { fg = 'yellow', modifiers = ['underlined'] }
+'diagnostic.hint'= { underline = { color = 'red', style = "curl"} }
+'diagnostic.error'= { underline = { color = 'red', style = "curl"} }
+'diagnostic.info'= { underline = { color = 'blue', style = "curl"} }
+'diagnostic.warning'= { underline = { color = 'yellow', style = "curl"} }
 
 'special' = { fg = 'orange' }
 
diff --git a/runtime/themes/emacs.toml b/runtime/themes/emacs.toml
index b3a46b92..ea8e711c 100644
--- a/runtime/themes/emacs.toml
+++ b/runtime/themes/emacs.toml
@@ -45,7 +45,7 @@
 
 "ui.background" = { fg = "black", bg = "white" }
 "ui.background.separator" = { fg = "black", bg = "white" }
-"ui.cursor" =  { fg = "white", bg = "gray70" }
+"ui.cursor" = { fg = "white", bg = "gray70" }
 "ui.cursor.primary" = { fg = "white", bg = "black" }
 "ui.cursor.match" = { fg = "black", bg = "turquoise" }
 "ui.cursor.select" = { fg = "white", bg = "black" }
@@ -68,7 +68,7 @@
 "ui.selection" = { bg = "lightgoldenrod1" }
 "ui.selection.primary" = { bg = "lightgoldenrod2" }
 "ui.virtual.whitespace" = "highlight"
-"ui.virtual.ruler" = { bg ="gray95" }
+"ui.virtual.ruler" = { bg = "gray95" }
 "ui.cursorline.primary" = { bg = "darkseagreen2" }
 "ui.cursorline.secondary" = { bg = "darkseagreen2" }
 
@@ -80,7 +80,11 @@
 "warning" = { fg = "dark_orange" }
 "info" = { fg = "forest_green" }
 "hint" = { fg = "dark_cyan" }
-"diagnostic" = { modifiers = ["underlined"] }
+
+"diagnostic.error" = { underline = { color = "red1", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "dark_orange", style = "curl" } }
+"diagnostic.info" = { underline = { color = "forest_green", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "dark_cyan", style = "curl" } }
 
 [palette]
 black = "#000000"
diff --git a/runtime/themes/everforest_dark.toml b/runtime/themes/everforest_dark.toml
index 63997c9c..67aafbf2 100644
--- a/runtime/themes/everforest_dark.toml
+++ b/runtime/themes/everforest_dark.toml
@@ -88,7 +88,12 @@
 "info" = "aqua"
 "warning" = "yellow"
 "error" = "red"
-"diagnostic" = { modifiers = ["underlined"] }
+
+"diagnostic.hint" = { underline = { color = "blue", style = "curl" } }
+"diagnostic.info" = { underline = { color = "aqua", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
+
 
 [palette]
 
diff --git a/runtime/themes/everforest_light.toml b/runtime/themes/everforest_light.toml
index 08876c0c..6daf7963 100644
--- a/runtime/themes/everforest_light.toml
+++ b/runtime/themes/everforest_light.toml
@@ -88,7 +88,11 @@
 "info" = "aqua"
 "warning" = "yellow"
 "error" = "red"
-"diagnostic" = { modifiers = ["underlined"] }
+
+"diagnostic.hint" = { underline = { color = "blue", style = "curl" } }
+"diagnostic.info" = { underline = { color = "aqua", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
 
 [palette]
 
diff --git a/runtime/themes/flatwhite.toml b/runtime/themes/flatwhite.toml
index 2fdc66d0..1743012b 100644
--- a/runtime/themes/flatwhite.toml
+++ b/runtime/themes/flatwhite.toml
@@ -21,6 +21,11 @@
 "variable.parameter" = { fg = "blue_text", bg = "blue_bg" }
 
 "diagnostic" = { modifiers = ["underlined"] }
+
+"diagnostic.info" = { underline = { color = "orange_text", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "orange_text", style = "curl" } }
+"diagnostic.error" = { underline = { color = "diff_delete", style = "curl" } }
+
 "info" = { fg = "orange_text", bg = "orange_bg" }
 "hint" = { modifiers = ["bold"] }
 "warning" = { fg = "orange_text", bg = "orange_bg" }
diff --git a/runtime/themes/fleet_dark.toml b/runtime/themes/fleet_dark.toml
index f885e4eb..f3285a76 100644
--- a/runtime/themes/fleet_dark.toml
+++ b/runtime/themes/fleet_dark.toml
@@ -91,10 +91,10 @@
 "warning" = "orange_accent"
 "error" = "red_error"
 "diagnostic" = { modifiers = [] }
-"diagnostic.hint" = { underline = { color = "light", style = "line" } }
-"diagnostic.info" = { underline = { color = "blue_accent", style = "line" } }
-"diagnostic.warning" = { underline = { color = "yellow_accent", style = "line" } }
-"diagnostic.error" = { underline = { color = "red_error", style = "line" } }
+"diagnostic.hint" = { underline = { color = "light", style = "curl" } }
+"diagnostic.info" = { underline = { color = "blue_accent", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "yellow_accent", style = "curl" } }
+"diagnostic.error" = { underline = { color = "red_error", style = "curl" } }
 
 [palette]
 background = "#181818"
diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml
index 01def874..5d897201 100644
--- a/runtime/themes/gruvbox.toml
+++ b/runtime/themes/gruvbox.toml
@@ -61,7 +61,10 @@
 "ui.virtual.whitespace" = "bg2"
 "ui.virtual.ruler" = { bg = "bg1" }
 
-"diagnostic" = { modifiers = ["underlined"] }
+"diagnostic.warning" = { underline = { color = "orange1", style = "curl" } }
+"diagnostic.error" = { underline = { color = "red1", style = "curl" } }
+"diagnostic.info" = { underline = { color = "aqua1", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "blue1", style = "curl" } }
 
 "markup.heading" = "aqua1"
 "markup.bold" = { modifiers = ["bold"] }
diff --git a/runtime/themes/gruvbox_dark_hard.toml b/runtime/themes/gruvbox_dark_hard.toml
index 9f92d3c7..a1a83e65 100644
--- a/runtime/themes/gruvbox_dark_hard.toml
+++ b/runtime/themes/gruvbox_dark_hard.toml
@@ -21,7 +21,7 @@
 "function.macro" = "aqua1"
 "function.builtin" = "yellow1"
 "tag" = "red1"
-"comment" = { fg = "gray1", modifiers = ["italic"]  }
+"comment" = { fg = "gray1", modifiers = ["italic"] }
 "constant" = { fg = "purple1" }
 "constant.builtin" = { fg = "purple1", modifiers = ["bold"] }
 "string" = "green1"
@@ -39,7 +39,6 @@
 "info" = { fg = "aqua1", bg = "bg1" }
 "hint" = { fg = "blue1", bg = "bg1" }
 
-"diagnostic" = { modifiers = ["underlined"] }
 "diagnostic.error" = { underline = { style = "curl", color = "red0" } }
 "diagnostic.warning" = { underline = { style = "curl", color = "orange1" } }
 "diagnostic.info" = { underline = { style = "curl", color = "aqua1" } }
@@ -91,8 +90,8 @@ fg4 = "#a89984" # gray0
 gray0 = "#a89984"
 gray1 = "#928374"
 
-red0 = "#cc241d" # neutral
-red1 = "#fb4934" # bright
+red0 = "#cc241d"    # neutral
+red1 = "#fb4934"    # bright
 green0 = "#98971a"
 green1 = "#b8bb26"
 yellow0 = "#d79921"
diff --git a/runtime/themes/gruvbox_light.toml b/runtime/themes/gruvbox_light.toml
index d2245fe9..7c1c765d 100644
--- a/runtime/themes/gruvbox_light.toml
+++ b/runtime/themes/gruvbox_light.toml
@@ -21,7 +21,7 @@
 "function.macro" = "aqua1"
 "function.builtin" = "yellow1"
 "tag" = "red1"
-"comment" = { fg = "gray1", modifiers = ["italic"]  }
+"comment" = { fg = "gray1", modifiers = ["italic"] }
 "constant" = { fg = "purple1" }
 "constant.builtin" = { fg = "purple1", modifiers = ["bold"] }
 "string" = "green1"
@@ -62,7 +62,10 @@
 "ui.virtual.whitespace" = "bg2"
 "ui.virtual.ruler" = { bg = "bg1" }
 
-"diagnostic" = { modifiers = ["underlined"] }
+"diagnostic.warning" = { underline = { color = "orange1", style = "curl" } }
+"diagnostic.error" = { underline = { color = "red1", style = "curl" } }
+"diagnostic.info" = { underline = { color = "aqua1", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "blue1", style = "curl" } }
 
 "markup.heading" = "aqua1"
 "markup.bold" = { modifiers = ["bold"] }
diff --git a/runtime/themes/heisenberg.toml b/runtime/themes/heisenberg.toml
index b20d3e9c..3c127a3e 100644
--- a/runtime/themes/heisenberg.toml
+++ b/runtime/themes/heisenberg.toml
@@ -59,10 +59,10 @@
 "error" = { fg = "chili_powder_red", modifiers = ["bold"] }
 "info" = { fg = "crystal_blue", modifiers = ["bold"] }
 "hint" = { fg = "crystal_blue", modifiers = ["bold"] }
-"diagnostic"= { fg = "chili_powder_red", modifiers = ["underlined"] }
-"diagnostic.info"= { fg = "crystal_blue", modifiers = ["underlined"] }
-"diagnostic.warning"= { fg = "vapor_yellow", modifiers = ["underlined"] }
-"diagnostic.error"= { fg = "chili_powder_red", modifiers = ["underlined"] }
+"diagnostic.hint" = { underline = {color = "chili_powder_red", style = "curl" } }
+"diagnostic.info" = { underline = {color = "crystal_blue", style = "curl" } }
+"diagnostic.warning" = { underline = {color = "vapor_yellow", style = "curl" } }
+"diagnostic.error" = { underline = {color = "chili_powder_red", style = "curl" } }
 "ui.bufferline" = { fg = "gray", bg = "background" }
 "ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
 
diff --git a/runtime/themes/hex_lavender.toml b/runtime/themes/hex_lavender.toml
index 974c486c..d7c54be6 100644
--- a/runtime/themes/hex_lavender.toml
+++ b/runtime/themes/hex_lavender.toml
@@ -3,7 +3,7 @@ inherits = "hex_steel"
 [palette]
 t1 = "#0e0e0d"
 t2 = "#121311"
-t3 = "#2b3444"  #
+t3 = "#2b3444"
 t4 = "#61586f"
 t5 = "#686e73"
 t6 = "#878480"
diff --git a/runtime/themes/hex_steel.toml b/runtime/themes/hex_steel.toml
index 7a2183f8..c9b62559 100644
--- a/runtime/themes/hex_steel.toml
+++ b/runtime/themes/hex_steel.toml
@@ -60,7 +60,11 @@
 "ui.virtual.indent-guide" = { fg = "t3" }
 "ui.virtual.whitespace" = { fg = "t3" }
 
-"diagnostic" = { modifiers = ["underlined"] }
+"diagnostic.error" = { underline = { color = "error", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "warning", style = "curl" } }
+"diagnostic.info" = { underline = { color = "info", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "display", style = "curl" } }
+
 "error" = { fg = "error", modifiers = ["bold"] }
 "warning" = { fg = "warning", modifiers = ["bold"] }
 "info" = { fg = "info", modifiers = ["bold"] }
diff --git a/runtime/themes/ingrid.toml b/runtime/themes/ingrid.toml
index 8e70587e..fa1a4fdb 100644
--- a/runtime/themes/ingrid.toml
+++ b/runtime/themes/ingrid.toml
@@ -67,3 +67,8 @@
 "error" = "#D74E50"
 "info" = "#839A53"
 "hint" = "#A6B6CE"
+
+"diagnostic.warning" = { underline = { color = "#D4A520", style = "curl" } }
+"diagnostic.error" = { underline = { color = "#D74E50", style = "curl" } }
+"diagnostic.info" = { underline = { color = "#839A53", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "#A6B6CE", style = "curl" } }
diff --git a/runtime/themes/kanagawa.toml b/runtime/themes/kanagawa.toml
index faeeeb83..f3811111 100644
--- a/runtime/themes/kanagawa.toml
+++ b/runtime/themes/kanagawa.toml
@@ -41,7 +41,10 @@
 
 "ui.cursorline.primary" = { bg = "sumiInk3"}
 
-diagnostic = { modifiers = ["underlined"] }
+"diagnostic.error" = { underline = { color = "samuraiRed", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "roninYellow", style = "curl" } }
+"diagnostic.info" = { underline = { color = "waveAqua1", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "dragonBlue", style = "curl" } }
 
 error = "samuraiRed"
 warning = "roninYellow"
diff --git a/runtime/themes/meliora.toml b/runtime/themes/meliora.toml
index ecc19f46..d4cb9883 100644
--- a/runtime/themes/meliora.toml
+++ b/runtime/themes/meliora.toml
@@ -54,7 +54,11 @@
 "ui.virtual.indent-guide" = { fg = "dark_grey2" }
 "ui.virtual.whitespace" = { fg = "grey" }
  
-"diagnostic" = { modifiers = ["underlined"] }
+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
+"diagnostic.info" = { underline = { color = "blue", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "magenta", style = "curl" } }
+
 "error" = { fg = "red" }
 "warning" = { fg = "orange" }
 "info" = { fg = "blue" }
diff --git a/runtime/themes/mellow.toml b/runtime/themes/mellow.toml
index 675cd916..a878df8a 100644
--- a/runtime/themes/mellow.toml
+++ b/runtime/themes/mellow.toml
@@ -93,7 +93,10 @@
 "ui.menu.selected" = { fg = "bright_white", bg = "gray03" }
 "ui.menu.scroll" = { fg = "gray04", bg = "gray01" }
 
-diagnostic = { modifiers = ["underlined"] }
+"diagnostic.warning" = { underline = { color = "bright_yellow", style = "curl" } }
+"diagnostic.error" = { underline = { color = "bright_red", style = "curl" } }
+"diagnostic.info" = { underline = { color = "bright_blue", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "bright_cyan", style = "curl" } }
 
 warning = "bright_yellow"
 error = "bright_red"
diff --git a/runtime/themes/monokai.toml b/runtime/themes/monokai.toml
index 0935ceff..92b81a8e 100644
--- a/runtime/themes/monokai.toml
+++ b/runtime/themes/monokai.toml
@@ -85,7 +85,10 @@
 "info" = { fg = "#75beff" }
 "hint" = { fg = "#eeeeeb3" }
 
-diagnostic = { modifiers = ["underlined"] }
+"diagnostic.warning" = { underline = { color = "#cca700", style = "curl" } }
+"diagnostic.error" = { underline = { color = "#f48771", style = "curl" } }
+"diagnostic.info" = { underline = { color = "#75beff", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "#eeeeeb3", style = "curl" } }
 
 [palette]
 type = "#A6E22E"
diff --git a/runtime/themes/monokai_pro.toml b/runtime/themes/monokai_pro.toml
index a5cbfdcf..276f1f94 100644
--- a/runtime/themes/monokai_pro.toml
+++ b/runtime/themes/monokai_pro.toml
@@ -90,7 +90,10 @@
 "diff.minus" = "red"
 
 # make diagnostic underlined, to distinguish with selection text.
-diagnostic = { modifiers = ["underlined"] }
+"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
+"diagnostic.info" = { underline = { color = "base8", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "base8", style = "curl" } }
 
 # markup highlight, no need for `markup.raw` and `markup.list`, make them to be default
 "markup.heading" = "green"
diff --git a/runtime/themes/monokai_pro_machine.toml b/runtime/themes/monokai_pro_machine.toml
index 4360d622..ae391f3d 100644
--- a/runtime/themes/monokai_pro_machine.toml
+++ b/runtime/themes/monokai_pro_machine.toml
@@ -87,7 +87,10 @@
 "diff.minus" = "red"
 
 # make diagnostic underlined, to distinguish with selection text.
-diagnostic = { modifiers = ["underlined"] }
+"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
+"diagnostic.info" = { underline = { color = "base8", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "base8", style = "curl" } }
 
 # markup highlight, no need for `markup.raw` and `markup.list`, make them to be default
 "markup.heading" = "green"
diff --git a/runtime/themes/monokai_pro_octagon.toml b/runtime/themes/monokai_pro_octagon.toml
index 8bcaeebc..70e8f05b 100644
--- a/runtime/themes/monokai_pro_octagon.toml
+++ b/runtime/themes/monokai_pro_octagon.toml
@@ -90,7 +90,10 @@
 "diff.minus" = "red"
 
 # make diagnostic underlined, to distinguish with selection text.
-diagnostic = { modifiers = ["underlined"] }
+"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
+"diagnostic.info" = { underline = { color = "base8", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "base8", style = "curl" } }
 
 # markup highlight, no need for `markup.raw` and `markup.list`, make them to be default
 "markup.heading" = "green"
diff --git a/runtime/themes/monokai_pro_ristretto.toml b/runtime/themes/monokai_pro_ristretto.toml
index 0dad50d4..ab740446 100644
--- a/runtime/themes/monokai_pro_ristretto.toml
+++ b/runtime/themes/monokai_pro_ristretto.toml
@@ -87,7 +87,10 @@
 "diff.minus" = "red"
 
 # make diagnostic underlined, to distinguish with selection text.
-diagnostic = { modifiers = ["underlined"] }
+"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
+"diagnostic.info" = { underline = { color = "base8", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "base8", style = "curl" } }
 
 # markup highlight, no need for `markup.raw` and `markup.list`, make them to be default
 "markup.heading" = "green"
diff --git a/runtime/themes/monokai_pro_spectrum.toml b/runtime/themes/monokai_pro_spectrum.toml
index f5787ca8..451f7986 100644
--- a/runtime/themes/monokai_pro_spectrum.toml
+++ b/runtime/themes/monokai_pro_spectrum.toml
@@ -87,7 +87,10 @@
 "diff.minus" = "red"
 
 # make diagnostic underlined, to distinguish with selection text.
-diagnostic = { modifiers = ["underlined"] }
+"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
+"diagnostic.error" = { underline = { color = "magenta", style = "curl" } } # maybe should be red?
+"diagnostic.info" = { underline = { color = "base8", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "base8", style = "curl" } }
 
 # markup highlight, no need for `markup.raw` and `markup.list`, make them to be default
 "markup.heading" = "green"
diff --git a/runtime/themes/night_owl.toml b/runtime/themes/night_owl.toml
index 55b09fbc..7ef6e214 100644
--- a/runtime/themes/night_owl.toml
+++ b/runtime/themes/night_owl.toml
@@ -5,7 +5,11 @@
 'error' = { fg = 'red', modifiers = ['dim'] }
 'info' = { fg = 'blue', modifiers = ['dim'] }
 'hint' = { fg = 'paleblue', modifiers = ['dim'] }
-'diagnostic' = { modifiers = ['underlined'] }
+
+"diagnostic.warning" = { underline = { color = "peach", style = "curl" } }
+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
+"diagnostic.info" = { underline = { color = "blue", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "paleblue", style = "curl" } }
 
 # UI
 'ui.background' = { fg = 'foreground', bg = 'background' }
diff --git a/runtime/themes/nightfox.toml b/runtime/themes/nightfox.toml
index c4cbbce0..1f248d5c 100644
--- a/runtime/themes/nightfox.toml
+++ b/runtime/themes/nightfox.toml
@@ -60,15 +60,15 @@
 
 
 # DIAGNOSTICS
-"warning" = { fg ="yellow", bg = "bg1" } # Diagnostics warning (gutter)
+"warning" = { fg = "yellow", bg = "bg1" } # Diagnostics warning (gutter)
 "error" = { fg = "red", bg = "bg1" } # Diagnostics error (gutter)
 "info" = { fg = "blue", bg = "bg1" } # Diagnostics info (gutter)
 "hint" = { fg = "green", bg = "bg1" } # Diagnostics hint (gutter)
-"diagnostic" = { modifiers = ["underlined"] } # Diagnostics fallback style (editing area)
-"diagnostic.error" = { fg = "red" } #	Diagnostics error (editing area)
-"diagnostic.warning" = { fg = "yellow" } #	Diagnostics warning (editing area)
-"diagnostic.info" = { fg = "blue" } #	Diagnostics info (editing area)
-"diagnostic.hint" = { fg = "green" } #	Diagnostics hint (editing area)
+
+"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } } #	Diagnostics warning (editing area)
+"diagnostic.error" = { underline = { color = "red", style = "curl" } } #	Diagnostics error (editing area)
+"diagnostic.info" = { underline = { color = "blue", style = "curl" } } #	Diagnostics info (editing area)
+"diagnostic.hint" = { underline = { color = "green", style = "curl" } } #	Diagnostics hint (editing area)
 
 
 # SYNTAX HIGHLIGHTING
diff --git a/runtime/themes/noctis.toml b/runtime/themes/noctis.toml
index 1740a924..e5abbec0 100644
--- a/runtime/themes/noctis.toml
+++ b/runtime/themes/noctis.toml
@@ -10,7 +10,12 @@
 "info" = { fg = "mid-blue", bg = "mid-green" } # Code diagnostic info in gutter (LSP).
 # ? Difference between info and hint ?
 "hint" = { fg = "light-green", modifiers = ["bold"] } # Code diagnostics hint in gutter (LSP).
-"diagnostic" = { modifiers = ["underlined"] } # Code diagnostics in editing area (LSP).
+
+# Code diagnostics in editing area (LSP).
+"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
+"diagnostic.info" = { underline = { color = "mid-blue", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "light-green", style = "curl" } }
 
 # UI ==============================
 # For styling helix itself.
diff --git a/runtime/themes/noctis_bordo.toml b/runtime/themes/noctis_bordo.toml
index b15a3f8e..d446543d 100644
--- a/runtime/themes/noctis_bordo.toml
+++ b/runtime/themes/noctis_bordo.toml
@@ -54,7 +54,11 @@
 "diff.plus" = "base0B"
 "diff.minus" = "base08"
 
-"diagnostic" = { modifiers = ["underlined"] }
+"diagnostic.info" = { underline = { color = "base0D", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "base03", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "base09", style = "curl" } }
+"diagnostic.error" = { underline = { color = "base08", style = "curl" } }
+
 "ui.gutter" = { bg = "base01" }
 "info" = "base0D"
 "hint" = "base03"
diff --git a/runtime/themes/nord.toml b/runtime/themes/nord.toml
index 6260ddbe..7eba10ac 100644
--- a/runtime/themes/nord.toml
+++ b/runtime/themes/nord.toml
@@ -98,6 +98,12 @@
 "markup.link.text" = "nord8"
 "markup.raw" = "nord7"
 
+# lsp diagnostics
+"diagnostic.error" = { underline = { color = "nord11", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "nord13", style = "curl" } }
+"diagnostic.info" = { underline = { color = "nord8", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "nord8", style = "curl" } }
+
 # vcs
 "diff.plus" = "nord14"
 "diff.delta" = "nord12"
diff --git a/runtime/themes/nord_light.toml b/runtime/themes/nord_light.toml
index eb947d03..b37d3596 100644
--- a/runtime/themes/nord_light.toml
+++ b/runtime/themes/nord_light.toml
@@ -26,9 +26,10 @@
 "ui.statusline.select" = { fg = "nord0", bg = "nord15" }
 
 
-"diagnostic.error" = {fg="nord11", modifiers=["bold"]}
-"diagnostic.warning" = {bg="nord13", modifiers=["bold"]}
-"diagnostic.hint" = {fg="nord13", modifiers=["bold"]}
+"diagnostic.error" = { underline = { color = "nord11", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "nord13", style = "curl" } }
+"diagnostic.info" = { underline = { color = "nord13", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "nord13", style = "curl" } }
 
 "constant.numeric" = {fg="nord15"}
 "constant.builtin" = {fg="nord15"}
diff --git a/runtime/themes/onedarker.toml b/runtime/themes/onedarker.toml
index 665f10ed..7a6e4a62 100644
--- a/runtime/themes/onedarker.toml
+++ b/runtime/themes/onedarker.toml
@@ -41,7 +41,11 @@
 "diff.delta" = "gold"
 "diff.minus" = "red"
 
-diagnostic = { modifiers = ["underlined"] }
+"diagnostic.info".underline = { color = "blue", style = "curl" } 
+"diagnostic.hint".underline = { color = "green", style = "curl" } 
+"diagnostic.warning".underline = { color = "yellow", style = "curl" } 
+"diagnostic.error".underline = { color = "red", style = "curl" } 
+
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "green", modifiers = ["bold"] }
 "warning" = { fg = "yellow", modifiers = ["bold"] }
diff --git a/runtime/themes/onelight.toml b/runtime/themes/onelight.toml
index a21c8ba2..ad900a78 100644
--- a/runtime/themes/onelight.toml
+++ b/runtime/themes/onelight.toml
@@ -63,7 +63,11 @@
 "diff.delta" = "gold"
 "diff.minus" = "red"
 
-"diagnostic" = { modifiers = ["underlined"] }
+"diagnostic.info".underline = { color = "blue", style = "curl" } 
+"diagnostic.hint".underline = { color = "green", style = "curl" } 
+"diagnostic.warning".underline = { color = "yellow", style = "curl" } 
+"diagnostic.error".underline = { color = "red", style = "curl" } 
+
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "green", modifiers = ["bold"] }
 "warning" = { fg = "yellow", modifiers = ["bold"] }
diff --git a/runtime/themes/papercolor-dark.toml b/runtime/themes/papercolor-dark.toml
index 940aacfe..d4b62660 100644
--- a/runtime/themes/papercolor-dark.toml
+++ b/runtime/themes/papercolor-dark.toml
@@ -73,7 +73,11 @@
 "warning" = "bright4"
 "error" = "regular1"
 "info" = "bright4"
-diagnostic = { modifiers = ["bold", "underlined"]}
+
+"diagnostic.warning".underline = { color = "bright4", style = "curl" } 
+"diagnostic.error".underline = { color = "regular1", style = "curl" } 
+"diagnostic.info".underline = { color = "bright4", style = "curl" } 
+"diagnostic.hint".underline = { color = "bright4", style = "curl" } 
 
 
 [palette]
diff --git a/runtime/themes/papercolor-light.toml b/runtime/themes/papercolor-light.toml
index 70b973d3..0d3fc77c 100644
--- a/runtime/themes/papercolor-light.toml
+++ b/runtime/themes/papercolor-light.toml
@@ -72,7 +72,11 @@
 "warning" = "bright4"
 "error" = "regular1"
 "info" = "#FFAF00"
-diagnostic = { modifiers = ["bold", "underlined"]}
+
+"diagnostic.warning".underline = { color = "bright4", style = "curl" } 
+"diagnostic.error".underline = { color = "regular1", style = "curl" } 
+"diagnostic.info".underline = { color = "#FFAF00", style = "curl" } 
+"diagnostic.hint".underline = { color = "#FFAF00", style = "curl" } 
 
 
 [palette]
diff --git a/runtime/themes/penumbra+.toml b/runtime/themes/penumbra+.toml
index 79059832..62db2f8a 100644
--- a/runtime/themes/penumbra+.toml
+++ b/runtime/themes/penumbra+.toml
@@ -43,7 +43,10 @@ info = "sky"
 warning = "yellow"
 error = "red"
 
-diagnostic = { modifiers = ["underlined"] }
+"diagnostic.hint".underline = { color = "sky-", style = "curl" } 
+"diagnostic.info".underline = { color = "sky", style = "curl" } 
+"diagnostic.warning".underline = { color = "yellow", style = "curl" } 
+"diagnostic.error".underline = { color = "red", style = "curl" } 
 
 "ui.background" = { bg = "shade" }
 "ui.background.separator" = "sky"
diff --git a/runtime/themes/pop-dark.toml b/runtime/themes/pop-dark.toml
index 6ad0111b..bd16f34b 100644
--- a/runtime/themes/pop-dark.toml
+++ b/runtime/themes/pop-dark.toml
@@ -8,7 +8,10 @@ info = { fg = 'yellowH', bg = 'brownD' }
 hint = { fg = 'brownD', bg = 'yellowH', modifiers = ['bold'] }
 warning = { fg = 'brownD', bg = 'orangeW', modifiers = ['bold'] }
 error = { fg = 'brownD', bg = 'redE', modifiers = ['bold'] }
-diagnostic = { fg = 'greyT', bg = 'redD' }
+"diagnostic.info".underline = { color = "yellowH", style = "curl" } 
+"diagnostic.hint".underline = { color = "yellowH", style = "curl" } 
+"diagnostic.warning".underline = { color = "orangeW", style = "curl" } 
+"diagnostic.error".underline = { color = "redE", style = "curl" } 
 'ui.background' = { bg = 'brownN' }
 'ui.window' = { bg = 'brownH', fg = "brownD" } 
 'ui.gutter' = { bg = 'brownH' }
diff --git a/runtime/themes/rasmus.toml b/runtime/themes/rasmus.toml
index a7baa83c..996271d3 100644
--- a/runtime/themes/rasmus.toml
+++ b/runtime/themes/rasmus.toml
@@ -100,7 +100,10 @@
 "ui.menu.selected" = { fg = "fg", bg = "gray03" }
 "ui.menu.scroll" = { fg = "white", bg = "gray01" }
 
-diagnostic = { modifiers = ["underlined"] }
+"diagnostic.warning".underline = { color = "bright_yellow", style = "curl" } 
+"diagnostic.error".underline = { color = "bright_red", style = "curl" } 
+"diagnostic.info".underline = { color = "bright_blue", style = "curl" } 
+"diagnostic.hint".underline = { color = "bright_cyan", style = "curl" } 
 
 warning = "bright_yellow"
 error = "bright_red"
diff --git a/runtime/themes/rose_pine.toml b/runtime/themes/rose_pine.toml
index 8558db3a..ee1d6e39 100644
--- a/runtime/themes/rose_pine.toml
+++ b/runtime/themes/rose_pine.toml
@@ -52,7 +52,6 @@
 "warning" = "gold"
 "error" = "love"
 
-"diagnostic" = { modifiers = ["underlined"] }
 "diagnostic.error" = { underline = { style = "curl", color = "love" } }
 "diagnostic.warning" = { underline = { style = "curl", color = "gold" } }
 "diagnostic.info" = { underline = { style = "curl", color = "foam" } }
diff --git a/runtime/themes/rose_pine_dawn.toml b/runtime/themes/rose_pine_dawn.toml
index c6609c21..d9377966 100644
--- a/runtime/themes/rose_pine_dawn.toml
+++ b/runtime/themes/rose_pine_dawn.toml
@@ -45,9 +45,13 @@
 "info" = "gold"
 "hint" = "gold"
 "debug" = "rose"
-"diagnostic" = "rose"
 "error" = "love"
 
+"diagnostic.error" = { underline = { style = "curl", color = "love" } }
+"diagnostic.warning" = { underline = { style = "curl", color = "gold" } }
+"diagnostic.info" = { underline = { style = "curl", color = "foam" } }
+"diagnostic.hint" = { underline = { style = "curl", color = "iris" } }
+
 "markup.heading.marker" = "subtle"
 "markup.heading.1" = { fg = "love", modifiers = ["bold"] }
 "markup.heading.2" = { fg = "gold", modifiers = ["bold"] }
diff --git a/runtime/themes/rose_pine_moon.toml b/runtime/themes/rose_pine_moon.toml
index fc27d2c0..178d623b 100644
--- a/runtime/themes/rose_pine_moon.toml
+++ b/runtime/themes/rose_pine_moon.toml
@@ -51,9 +51,13 @@
 "info" = "gold"
 "hint" = "gold"
 "debug" = "rose"
-"diagnostic" = "rose"
 "error" = "love"
 
+"diagnostic.error" = { underline = { style = "curl", color = "love" } }
+"diagnostic.warning" = { underline = { style = "curl", color = "gold" } }
+"diagnostic.info" = { underline = { style = "curl", color = "foam" } }
+"diagnostic.hint" = { underline = { style = "curl", color = "iris" } }
+
 "markup.heading.marker" = "subtle"
 "markup.heading.1" = { fg = "love", modifiers = ["bold"] }
 "markup.heading.2" = { fg = "gold", modifiers = ["bold"] }
diff --git a/runtime/themes/serika-dark.toml b/runtime/themes/serika-dark.toml
index 2b4000ac..480dc2cc 100644
--- a/runtime/themes/serika-dark.toml
+++ b/runtime/themes/serika-dark.toml
@@ -57,7 +57,11 @@
 "info" = "aqua"
 "warning" = "yellow"
 "error" = "nasty-red"
-"diagnostic" = { fg = "nasty-red", modifiers = ["underlined"] }
+
+"diagnostic.hint" = { underline = { style = "curl", color = "blue" } }
+"diagnostic.info" = { underline = { style = "curl", color = "aqua" } }
+"diagnostic.warning" = { underline = { style = "curl", color = "yellow" } }
+"diagnostic.error" = { underline = { style = "curl", color = "nasty-red" } }
 
 "diff.plus" = { fg = "green" }
 "diff.delta" = { fg = "orange" }
diff --git a/runtime/themes/serika-light.toml b/runtime/themes/serika-light.toml
index 99d4b7f1..8a62e23d 100644
--- a/runtime/themes/serika-light.toml
+++ b/runtime/themes/serika-light.toml
@@ -57,7 +57,11 @@
 "info" = "aqua"
 "warning" = "yellow"
 "error" = "nasty-red"
-"diagnostic" = { fg = "nasty-red", modifiers = ["underlined"] }
+
+"diagnostic.hint" = { underline = { style = "curl", color = "blue" } }
+"diagnostic.info" = { underline = { style = "curl", color = "aqua" } }
+"diagnostic.warning" = { underline = { style = "curl", color = "yellow" } }
+"diagnostic.error" = { underline = { style = "curl", color = "nasty-red" } }
 
 "diff.plus" = { fg = "bg_green" }
 "diff.delta" = { fg = "bg_blue" }
diff --git a/runtime/themes/solarized_dark.toml b/runtime/themes/solarized_dark.toml
index 15b3cd5e..a81c9299 100644
--- a/runtime/themes/solarized_dark.toml
+++ b/runtime/themes/solarized_dark.toml
@@ -101,7 +101,11 @@
 "error" = { fg = "red", modifiers= ["bold", "underlined"] }
 "info" = { fg = "blue", modifiers= ["bold", "underlined"] }
 "hint" = { fg = "base01", modifiers= ["bold", "underlined"] }
-"diagnostic" = { modifiers = ["underlined"] }
+
+"diagnostic.warning" = { underline = { style = "curl", color = "orange" } }
+"diagnostic.error" = { underline = { style = "curl", color = "red" } }
+"diagnostic.info" = { underline = { style = "curl", color = "blue" } }
+"diagnostic.hint" = { underline = { style = "curl", color = "base01" } }
 
 [palette]
 # 深色 越来越深
diff --git a/runtime/themes/solarized_light.toml b/runtime/themes/solarized_light.toml
index 737829a6..849751e8 100644
--- a/runtime/themes/solarized_light.toml
+++ b/runtime/themes/solarized_light.toml
@@ -118,7 +118,12 @@
 "error" = { fg = "red", modifiers= ["bold", "underlined"] }
 "info" = { fg = "blue", modifiers= ["bold", "underlined"] }
 "hint" = { fg = "base01", modifiers= ["bold", "underlined"] }
-"diagnostic" = { modifiers = ["underlined"] }
+
+"diagnostic.warning" = { underline = { style = "curl", color = "orange" } }
+"diagnostic.error" = { underline = { style = "curl", color = "red" } }
+"diagnostic.info" = { underline = { style = "curl", color = "blue" } }
+"diagnostic.hint" = { underline = { style = "curl", color = "base01" } }
+
 
 [palette]
 red      = '#dc322f'
diff --git a/runtime/themes/sonokai.toml b/runtime/themes/sonokai.toml
index 18417f00..19f187d5 100644
--- a/runtime/themes/sonokai.toml
+++ b/runtime/themes/sonokai.toml
@@ -75,7 +75,11 @@ info = { fg = 'green', bg = 'bg2' }
 hint = { fg = 'blue', bg = 'bg2', modifiers = ['bold'] }
 warning = { fg = 'yellow', bg = 'bg2', modifiers = ['bold'] }
 error = { fg = 'red', bg = 'bg2', modifiers = ['bold'] }
-diagnostic = { modifiers = ['underlined'] }
+
+"diagnostic.info" = { underline = { style = "curl", color = "green" } }
+"diagnostic.hint" = { underline = { style = "curl", color = "blue" } }
+"diagnostic.warning" = { underline = { style = "curl", color = "yellow" } }
+"diagnostic.error" = { underline = { style = "curl", color = "red" } }
 
 
 
diff --git a/runtime/themes/spacebones_light.toml b/runtime/themes/spacebones_light.toml
index 0956afd2..f01b19dc 100644
--- a/runtime/themes/spacebones_light.toml
+++ b/runtime/themes/spacebones_light.toml
@@ -72,7 +72,10 @@
 "ui.virtual" = "base-dim"
 "ui.virtual.ruler" = { bg = "bg1" }
 
-"diagnostic" = { modifiers = ["underlined"] }
+"diagnostic.warning" = { underline = { style = "curl", color = "meta" } }
+"diagnostic.error" = { underline = { style = "curl", color = "#e0211d" } }
+"diagnostic.info" = { underline = { style = "curl", color = "theme_yellow" } }
+"diagnostic.hint" = { underline = { style = "curl", color = "bg2" } }
 
 [palette]
 base = "#655370"
diff --git a/runtime/themes/tokyonight.toml b/runtime/themes/tokyonight.toml
index 4847d92c..35ceaeba 100644
--- a/runtime/themes/tokyonight.toml
+++ b/runtime/themes/tokyonight.toml
@@ -54,7 +54,10 @@
 "warning" = { fg = "yellow" }
 "info" = { fg = "blue" }
 "hint" = { fg = "teal" }
-"diagnostic" = { modifiers = ["underlined"] }
+"diagnostic.error" = { underline = { style = "curl", color = "red" } }
+"diagnostic.warning" = { underline = { style = "curl", color = "yellow" } }
+"diagnostic.info" = { underline = { style = "curl", color = "blue" } }
+"diagnostic.hint" = { underline = { style = "curl", color = "teal" } }
 "special" = { fg = "orange" }
 
 "markup.heading" = { fg = "cyan", modifiers = ["bold"] }
diff --git a/runtime/themes/varua.toml b/runtime/themes/varua.toml
index 7ef502a6..c1afaca0 100644
--- a/runtime/themes/varua.toml
+++ b/runtime/themes/varua.toml
@@ -70,7 +70,10 @@
 "info" = "aqua"
 "warning" = "yellow"
 "error" = "red"
-"diagnostic" = { modifiers = ["underlined"] }
+"diagnostic.hint" = { underline = { style = "curl", color = "blue" } }
+"diagnostic.info" = { underline = { style = "curl", color = "aqua" } }
+"diagnostic.warning" = { underline = { style = "curl", color = "yellow" } }
+"diagnostic.error" = { underline = { style = "curl", color = "red" } }
 
 [palette]
 bg0 = "#282828"

From 051cd786a43a84912413b526782adffa9698fcd9 Mon Sep 17 00:00:00 2001
From: not <mvllow@icloud.com>
Date: Thu, 12 Jan 2023 18:29:05 -0500
Subject: [PATCH 739/884] =?UTF-8?q?Ros=C3=A9=20Pine=20theme:=20use=20offic?=
 =?UTF-8?q?ial=20variants=20(#5489)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 runtime/themes/rose_pine.toml      | 251 ++++++++++++++++++++---------
 runtime/themes/rose_pine_dawn.toml | 109 ++++---------
 runtime/themes/rose_pine_moon.toml | 116 ++++---------
 3 files changed, 228 insertions(+), 248 deletions(-)

diff --git a/runtime/themes/rose_pine.toml b/runtime/themes/rose_pine.toml
index ee1d6e39..3386fffb 100644
--- a/runtime/themes/rose_pine.toml
+++ b/runtime/themes/rose_pine.toml
@@ -1,90 +1,187 @@
-# Author: RayGervais<raygervais@hotmail.ca>
-# Author: ChrisHa<chunghha@users.noreply.github.com>
-# Diagnostics patch author: cor<cor@pruijs.dev>
+# Author: Rosé Pine <hi@rosepinetheme.com>
+# Upstream: https://github.com/rose-pine/helix
+# Contributing:
+#   Please submit changes to https://github.com/rose-pine/helix.
+#   The Rosé Pine team will update Helix, including you as a co-author.
 
 "ui.background" = { bg = "base" }
-"ui.menu" = { fg = "text", bg = "overlay" }
-"ui.menu.selected" = { fg = "iris", bg = "surface" }
-"ui.linenr" = {fg = "subtle" }
-"ui.liner.selected" = "highlightOverlay"
-"ui.selection" = { bg = "highlight" }
-"comment" = "subtle"
-"ui.cursorline" = { bg = "surface" }
-"ui.statusline" = {fg = "foam", bg = "surface" }
-"ui.statusline.insert" = {fg = "base", bg = "foam", modifiers = ["bold"]}
-"ui.statusline.normal" = {fg = "base", bg = "rose", modifiers = ["bold"]}
-"ui.statusline.select" = {fg = "base", bg = "iris", modifiers = ["bold"]}
-"ui.statusline.inactive" = { fg = "iris", bg = "surface" }
-"ui.cursor" = { fg = "rose", modifiers = ["reversed"] }
-"ui.text" = { fg = "text" }
-"ui.text.focus" = { fg = "foam", modifiers = ["bold"]}
-"ui.text.info" = {fg = "pine", modifiers = ["bold"]}
-"ui.virtual.whitespace" = "highlight"
-"ui.virtual.ruler" = { bg = "surface" }
-"operator" = "rose"
-"variable" = "text"
-"constant.numeric" = "iris"
-"constant" = "gold"
-"attribute" = "gold" 
-"type" = "foam"
-"ui.cursor.match" = { fg = "gold", modifiers = ["underlined"] }
-"string"  = "gold"
-"constant.character.escape" = "subtle"
-"function" = "rose"
-"function.builtin" = "rose"
-"function.method"  = "foam"
-"constructor" = "gold"
-"special" = "gold"
-"keyword" = "pine"
-"label" = "iris"
-"namespace" = "pine"
+"ui.background.separator" = { bg = "base" }
+
+"ui.cursor" = { fg = "text", bg = "highlight_high" }
+# "ui.cursor.select" = {}
+"ui.cursor.match" = { fg = "text", bg = "highlight_med" }
+"ui.cursor.primary" = { fg = "text", bg = "muted"}
+
+# "ui.gutter" = {}
+# "ui.gutter.selected" = {}
+
+"ui.linenr" = { fg = "muted" }
+"ui.linenr.selected" = { fg = "text" }
+
+"ui.statusline" = { fg = "subtle", bg = "surface" }
+"ui.statusline.inactive" = { fg = "muted", bg = "surface" }
+"ui.statusline.normal" = { fg = "rose", bg = "rose_10" }
+"ui.statusline.insert" = { fg = "foam", bg = "foam_10" }
+"ui.statusline.select" = { fg = "iris", bg = "iris_10" }
+# "ui.statusline.separator" = {}
+
 "ui.popup" = { bg = "surface" }
 "ui.popup.info" = { bg = "surface" }
-"ui.window" = { bg = "base" }
-"ui.help" = { bg = "overlay", fg = "foam" }
-"diff.plus" = "foam"
-"diff.delta" = "rose"
-"diff.minus" = "love"
 
+"ui.window" = { fg = "overlay", bg = "base" }
+"ui.help" = { fg = "subtle", bg = "overlay" }
+
+"ui.text" = { fg = "text" }
+# "ui.text.focus" = {}
+"ui.text.info" = { fg = "subtle" }
+
+"ui.virtual.ruler" = { bg = "overlay" }
+"ui.virtual.whitespace" = { fg = "highlight_low" }
+"ui.virtual.indent-guide" = { fg = "muted" }
+
+"ui.menu" = { fg = "subtle", bg = "surface" }
+"ui.menu.selected" = { fg = "text" }
+"ui.menu.scroll" = { fg = "muted", bg = "highlight_med" }
+
+"ui.selection" = { bg = "overlay" }
+"ui.selection.primary" = { bg = "highlight_med" }
+
+"ui.cursorline.primary" = { bg = "highlight_low" }
+"ui.cursorline.secondary" = { bg = "surface" }
+
+"warning" = "gold"
+"error" = "love"
 "info" = "foam"
 "hint" = "iris"
 "debug" = "rose"
-"warning" = "gold"
-"error" = "love"
 
-"diagnostic.error" = { underline = { style = "curl", color = "love" } }
-"diagnostic.warning" = { underline = { style = "curl", color = "gold" } }
-"diagnostic.info" = { underline = { style = "curl", color = "foam" } }
-"diagnostic.hint" = { underline = { style = "curl", color = "iris" } }
+"diagnostic" = { underline = { color = "subtle", style = "curl" } }
+"diagnostic.hint" = { underline = { color = "iris", style = "curl" } }
+"diagnostic.info" = { underline = { color = "foam", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "gold", style = "curl" } }
+"diagnostic.error" = { underline = { color = "love", style = "curl" } }
+
+"attribute" = "iris"
+
+"type" = "foam"
+# "type.builtin" = ""
+
+"constructor" = "foam"
+
+"constant" = "foam"
+"constant.builtin" = "rose"
+# "constant.builtin.boolean" = ""
+"constant.character" = "gold"
+"constant.character.escape" = "pine"
+"constant.numeric" = "gold"
+# "constant.numeric.integer" = ""
+# "constant.numeric.float" = ""
+
+"string" = "gold"
+# "string.regexp" = ""
+# "string.special" = ""
+# "string.special.path" = ""
+# "string.special.url" = ""
+# "string.special.symbol" = ""
+
+"comment" = { fg = "muted", modifiers = ["italic"]}
+# "comment.line" = ""
+# "comment.block" = ""
+# "comment.block.documenation" = ""
+
+"variable" = "text"
+"variable.builtin" = "love"
+"variable.parameter" = "iris"
+# "variable.other" = ""
+# "variable.other.member" = ""
+
+"label" = "foam"
 
-"markup.heading.marker" = "subtle"
-"markup.heading.1" = { fg = "love", modifiers = ["bold"] }
-"markup.heading.2" = { fg = "gold", modifiers = ["bold"] }
+"punctuation" = "subtle"
+# "punctuation.delimiter" = ""
+# "punctuation.bracket" = ""
+# "punctuation.special" = ""
+
+"keyword" = "pine"
+# "keyword.control" = ""
+# "keyword.control.conditional" = ""
+# "keyword.control.repeat" = ""
+# "keyword.control.import" = ""
+# "keyword.control.return" = ""
+# "keyword.control.exception" = ""
+"keyword.operator" = "subtle"
+# "keyword.directive" = ""
+# "keyword.function" = ""
+# "keyword.storage" = ""
+# "keyword.storage.type" = ""
+# "keyword.storage.modifier" = ""
+
+"operator" = "subtle"
+
+"function" = "rose" # maybe pine
+"function.builtin" = "love"
+# "function.method" = ""
+# "function.macro" = ""
+# "function.special" = ""
+
+"tag" = "foam"
+
+"namespace" = "iris"
+
+"markup.heading.marker" = "muted"
+"markup.heading" = { fg = "iris", modifiers = ["bold"] }
+"markup.heading.1" = { fg = "iris", modifiers = ["bold"] }
+"markup.heading.2" = { fg = "foam", modifiers = ["bold"] }
 "markup.heading.3" = { fg = "rose", modifiers = ["bold"] }
-"markup.heading.4" = { fg = "pine", modifiers = ["bold"] }
-"markup.heading.5" = { fg = "foam", modifiers = ["bold"] }
-"markup.heading.6" = { fg = "iris", modifiers = ["bold"] }
-"markup.list" = { fg = "love" }
-"markup.bold" = { fg = "gold", modifiers = ["bold"] }
-"markup.italic" = { fg = "iris", modifiers = ["italic"] }
-"markup.link.url" = { fg = "pine", modifiers = ["underlined"]}
-"markup.link.text" = { fg = "foam" }
-"markup.quote" = { fg = "rose" }
-"markup.raw" = { fg = "foam" }
+"markup.heading.4" = { fg = "gold", modifiers = ["bold"] }
+"markup.heading.5" = { fg = "pine", modifiers = ["bold"] }
+"markup.heading.6" = { fg = "foam", modifiers = ["bold"] }
+# "markup.heading.completion" = ""
+# "markup.heading.hover" = ""
+"markup.list" = "muted"
+# "markup.list.unnumbered" = ""
+# "markup.list.numbered" = ""
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.link" = "iris"
+"markup.link.url" = { fg = "iris",  underline = { color = "iris", style = "line" } } 
+"markup.link.label" = "subtle"
+"markup.link.text" = "text"
+"markup.quote" = "subtle"
+"markup.raw" = "subtle"
+# "markup.raw.inline" = {}
+# "markup.raw.inline.completion" = {}
+# "markup.raw.inline.hover" = {}
+# "markup.raw.block" = {}
+# "markup.normal" = ""
+# "markup.normal.completion" = ""
+# "markup.normal.hover" = ""
+
+"diff" = "overlay"
+"diff.plus" = "foam"
+"diff.minus" = "love"
+"diff.delta" = "highlight_high"
+# "diff.delta.moved" = ""
 
 [palette]
-base     = "#191724" 
-surface  = "#1f1d2e" 
-overlay  = "#26233a"
-inactive = "#555169"
-subtle   = "#6e6a86"
-text     = "#e0def4"
-love     = "#eb6f92"
-gold     = "#f6c177"
-rose     = "#ebbcba"
-pine     = "#31748f"
-foam     = "#9ccfd8"
-iris     = "#c4a7e7"
-highlight = "#403d52"
-highlightInactive = "#21202e"
-highlightOverlay = "#524f67"
+base           = "#191724" 
+surface        = "#1f1d2e" 
+overlay        = "#26233a"
+muted          = "#6e6a86"
+subtle         = "#908caa"
+text           = "#e0def4"
+love           = "#eb6f92"
+love_10        = "#311f30"
+gold           = "#f6c177"
+gold_10        = "#30282c"
+rose           = "#ebbcba"
+rose_10        = "#2f2834"
+pine           = "#31748f"
+pine_10        = "#1a2030"
+foam           = "#9ccfd8"
+foam_10        = "#252937"
+iris           = "#c4a7e7"
+iris_10        = "#2b2539"
+highlight_low  = "#21202e"
+highlight_med  = "#403d52"
+highlight_high = "#524f67"
\ No newline at end of file
diff --git a/runtime/themes/rose_pine_dawn.toml b/runtime/themes/rose_pine_dawn.toml
index d9377966..030ddccf 100644
--- a/runtime/themes/rose_pine_dawn.toml
+++ b/runtime/themes/rose_pine_dawn.toml
@@ -1,85 +1,30 @@
-# Author: RayGervais<raygervais@hotmail.ca>
-# Author: ChrisHa<chunghha@users.noreply.github.com>
+# Author: Rosé Pine <hi@rosepinetheme.com>
+# Upstream: https://github.com/rose-pine/helix
+# Contributing:
+#   Please submit changes to https://github.com/rose-pine/helix.
+#   The Rosé Pine team will update Helix, including you as a co-author.
 
-"ui.background" = { bg = "surface" }
-"ui.menu" = { fg = "text", bg = "overlay" }
-"ui.menu.selected" = { fg = "iris", bg = "surface" }
-"ui.linenr" = {fg = "subtle" }
-"ui.liner.selected" = "highlightOverlay"
-"ui.selection" = { bg = "highlight" }
-"comment" = "subtle"
-"ui.cursorline" = {bg = "base" }
-"ui.statusline" = {fg = "foam", bg = "surface" }
-"ui.statusline.inactive" = { fg = "iris", bg = "surface" }
-"ui.cursor" = { fg = "rose", modifiers = ["reversed"] }
-"ui.text" = { fg = "text" }
-"ui.text.focus" = { fg = "foam", modifiers = ["bold"]}
-"ui.text.info" = {fg = "pine", modifiers = ["bold"]}
-"ui.virtual.whitespace" = "highlight"
-"ui.virtual.ruler" = { bg = "base" }
-"operator" = "rose"
-"variable" = "text"
-"number" = "iris"
-"constant" = "gold"
-"attribute" = "gold" 
-"type" = "foam"
-"ui.cursor.match" = { fg = "gold", modifiers = ["underlined"] }
-"string"  = "gold"
-"escape" = "subtle"
-"function" = "rose"
-"function.builtin" = "rose"
-"function.method"  = "foam"
-"constructor" = "gold"
-"special" = "gold"
-"keyword" = "pine"
-"label" = "iris"
-"namespace" = "pine"
-"ui.popup" = { bg = "surface" }
-"ui.popup.info" = { bg = "surface" }
-"ui.window" = { bg = "base" }
-"ui.help" = { bg = "overlay", fg = "foam" }
-"diff.plus" = "foam"
-"diff.delta" = "rose"
-"diff.minus" = "love"
-
-"info" = "gold"
-"hint" = "gold"
-"debug" = "rose"
-"error" = "love"
-
-"diagnostic.error" = { underline = { style = "curl", color = "love" } }
-"diagnostic.warning" = { underline = { style = "curl", color = "gold" } }
-"diagnostic.info" = { underline = { style = "curl", color = "foam" } }
-"diagnostic.hint" = { underline = { style = "curl", color = "iris" } }
-
-"markup.heading.marker" = "subtle"
-"markup.heading.1" = { fg = "love", modifiers = ["bold"] }
-"markup.heading.2" = { fg = "gold", modifiers = ["bold"] }
-"markup.heading.3" = { fg = "rose", modifiers = ["bold"] }
-"markup.heading.4" = { fg = "pine", modifiers = ["bold"] }
-"markup.heading.5" = { fg = "foam", modifiers = ["bold"] }
-"markup.heading.6" = { fg = "iris", modifiers = ["bold"] }
-"markup.list" = { fg = "love" }
-"markup.bold" = { fg = "gold", modifiers = ["bold"] }
-"markup.italic" = { fg = "iris", modifiers = ["italic"] }
-"markup.link.url" = { fg = "pine", modifiers = ["underlined"]}
-"markup.link.text" = { fg = "foam" }
-"markup.quote" = { fg = "rose" }
-"markup.raw" = { fg = "foam" }
+inherits = "rose_pine"
 
 [palette]
-base     = "#faf4ed" 
-surface  = "#fffaf3" 
-overlay  = "#f2e9de"
-inactive = "#9893a5"
-subtle   = "#6e6a86"
-text     = "#575279"
-love     = "#b4637a"
-gold     = "#ea9d34"
-rose     = "#d7827e"
-pine     = "#286983"
-foam     = "#56949f"
-iris     = "#907aa9"
-highlight = "#dfdad9"
-highlightInactive = "#f4ede8"
-highlightOverlay = "#cecacd"
+base           = "#faf4ed" 
+surface        = "#fffaf3" 
+overlay        = "#f2e9e1"
+muted          = "#9893a5"
+subtle         = "#797593"
+text           = "#575279"
+love           = "#b4637a"
+love_10        = "#f6e4e0"
+gold           = "#ea9d34"
+gold_10        = "#fbead8"
+rose           = "#d7827e"
+rose_10        = "#fae8e1"
+pine           = "#286983"
+pine_10        = "#e5e6e2"
+foam           = "#56949f"
+foam_10        = "#eaeae5"
+iris           = "#907aa9"
+iris_10        = "#f1e8e6"
+highlight_low  = "#f4ede8"
+highlight_med  = "#dfdad9"
+highlight_high = "#cecacd"
\ No newline at end of file
diff --git a/runtime/themes/rose_pine_moon.toml b/runtime/themes/rose_pine_moon.toml
index 178d623b..fddf4911 100644
--- a/runtime/themes/rose_pine_moon.toml
+++ b/runtime/themes/rose_pine_moon.toml
@@ -1,92 +1,30 @@
-# Author: RayGervais<raygervais@hotmail.ca>
-# Author: ChrisHa<chunghha@users.noreply.github.com>
-# Author: ATahaBaki<atahabaki@pm.me>
-# This theme is based on rose_pine theme. I just converted their
-# rose_pine theme.
+# Author: Rosé Pine <hi@rosepinetheme.com>
+# Upstream: https://github.com/rose-pine/helix
+# Contributing:
+#   Please submit changes to https://github.com/rose-pine/helix.
+#   The Rosé Pine team will update Helix, including you as a co-author.
 
-"ui.background" = { bg = "base" }
-"ui.menu" = { fg = "text", bg = "overlay" }
-"ui.menu.selected" = { fg = "iris", bg = "surface" }
-"ui.linenr" = {fg = "subtle" }
-"ui.liner.selected" = "highlightOverlay"
-"ui.selection" = { bg = "highlight" }
-"comment" = "subtle"
-"ui.cursorline" = {bg = "dimBase" }
-"ui.statusline" = {fg = "foam", bg = "surface" }
-"ui.statusline.insert" = {fg = "base", bg = "foam", modifiers = ["bold"]}
-"ui.statusline.normal" = {fg = "base", bg = "rose", modifiers = ["bold"]}
-"ui.statusline.select" = {fg = "base", bg = "iris", modifiers = ["bold"]}
-"ui.statusline.inactive" = { fg = "iris", bg = "surface" }
-"ui.cursor" = { fg = "rose", modifiers = ["reversed"] }
-"ui.text" = { fg = "text" }
-"ui.text.focus" = { fg = "foam", modifiers = ["bold"]}
-"ui.text.info" = {fg = "pine", modifiers = ["bold"]}
-"ui.virtual.whitespace" = "highlight"
-"ui.virtual.ruler" = {bg = "dimBase" }
-"operator" = "rose"
-"variable" = "text"
-"constant.numeric" = "iris"
-"constant" = "gold"
-"attribute" = "gold" 
-"type" = "foam"
-"ui.cursor.match" = { fg = "gold", modifiers = ["underlined"] }
-"string"  = "gold"
-"constant.character.escape" = "subtle"
-"function" = "rose"
-"function.builtin" = "rose"
-"function.method"  = "foam"
-"constructor" = "gold"
-"special" = "gold"
-"keyword" = "pine"
-"label" = "iris"
-"namespace" = "pine"
-"ui.popup" = { bg = "surface" }
-"ui.popup.info" = { bg = "surface" }
-"ui.window" = { bg = "base" }
-"ui.help" = { bg = "overlay", fg = "foam" }
-"diff.plus" = "foam"
-"diff.delta" = "rose"
-"diff.minus" = "love"
-
-"info" = "gold"
-"hint" = "gold"
-"debug" = "rose"
-"error" = "love"
-
-"diagnostic.error" = { underline = { style = "curl", color = "love" } }
-"diagnostic.warning" = { underline = { style = "curl", color = "gold" } }
-"diagnostic.info" = { underline = { style = "curl", color = "foam" } }
-"diagnostic.hint" = { underline = { style = "curl", color = "iris" } }
-
-"markup.heading.marker" = "subtle"
-"markup.heading.1" = { fg = "love", modifiers = ["bold"] }
-"markup.heading.2" = { fg = "gold", modifiers = ["bold"] }
-"markup.heading.3" = { fg = "rose", modifiers = ["bold"] }
-"markup.heading.4" = { fg = "pine", modifiers = ["bold"] }
-"markup.heading.5" = { fg = "foam", modifiers = ["bold"] }
-"markup.heading.6" = { fg = "iris", modifiers = ["bold"] }
-"markup.list" = { fg = "love" }
-"markup.bold" = { fg = "gold", modifiers = ["bold"] }
-"markup.italic" = { fg = "iris", modifiers = ["italic"] }
-"markup.link.url" = { fg = "pine", modifiers = ["underlined"]}
-"markup.link.text" = { fg = "foam" }
-"markup.quote" = { fg = "rose" }
-"markup.raw" = { fg = "foam" }
+inherits = "rose_pine"
 
 [palette]
-dimBase  = "#201e30" 
-base     = "#232136" 
-surface  = "#2a273f" 
-overlay  = "#393552"
-inactive = "#6e6a86"
-subtle   = "#908caa"
-text     = "#e0def4"
-love     = "#eb6f92"
-gold     = "#f6c177"
-rose     = "#ea9a97"
-pine     = "#3e8fb0"
-foam     = "#9ccfd8"
-iris     = "#c4a7e7"
-highlight = "#44415a"
-highlightInactive = "#2a283e"
-highlightOverlay = "#56526e"
+base           = "#232136" 
+surface        = "#2a273f" 
+overlay        = "#393552"
+muted          = "#6e6a86"
+subtle         = "#908caa"
+text           = "#e0def4"
+love           = "#eb6f92"
+love_10        = "#3a2841"
+gold           = "#f6c177"
+gold_10        = "#39313e"
+rose           = "#ea9a97"
+rose_10        = "#392d41"
+pine           = "#3e8fb0"
+pine_10        = "#252c44"
+foam           = "#9ccfd8"
+foam_10        = "#2e3248"
+iris           = "#c4a7e7"
+iris_10        = "#342e4a"
+highlight_low  = "#2a283e"
+highlight_med  = "#44415a"
+highlight_high = "#56526e"
\ No newline at end of file

From 1f6809c9ce8f4b864b3754111b8673ca282f67f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Delafargue?= <clement@delafargue.name>
Date: Fri, 13 Jan 2023 11:29:40 +0100
Subject: [PATCH 740/884] Language support for dhall

https://dhall-lang.org/
---
 book/src/generated/lang-support.md    |  1 +
 languages.toml                        | 15 ++++++++
 runtime/queries/dhall/highlights.scm  | 52 +++++++++++++++++++++++++++
 runtime/queries/dhall/textobjects.scm | 23 ++++++++++++
 4 files changed, 91 insertions(+)
 create mode 100644 runtime/queries/dhall/highlights.scm
 create mode 100644 runtime/queries/dhall/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index a506e6a5..00e6a91e 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -22,6 +22,7 @@
 | d | ✓ | ✓ | ✓ | `serve-d` |
 | dart | ✓ |  | ✓ | `dart` |
 | devicetree | ✓ |  |  |  |
+| dhall | ✓ | ✓ |  | `dhall-lsp-server` |
 | diff | ✓ |  |  |  |
 | dockerfile | ✓ |  |  | `docker-langserver` |
 | dot | ✓ |  |  | `dot-language-server` |
diff --git a/languages.toml b/languages.toml
index 9029c94e..51b4efb2 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2092,3 +2092,18 @@ comment-token = "//"
 [[grammar]]
 name = "ponylang"
 source = { git = "https://github.com/mfelsche/tree-sitter-ponylang", rev = "ef66b151bc2604f431b5668fcec4747db4290e11" }
+
+[[language]]
+name = "dhall"
+scope = "source.dhall"
+injection-regex = "dhall"
+file-types = ["dhall"]
+roots = []
+comment-token = "--"
+indent = { tab-width = 2, unit = "  " }
+language-server = { command = "dhall-lsp-server" }
+formatter = { command = "dhall" , args = ["format"] }
+
+[[grammar]]
+name = "dhall"
+source = { git = "https://github.com/jbellerb/tree-sitter-dhall", rev = "affb6ee38d629c9296749767ab832d69bb0d9ea8" }
\ No newline at end of file
diff --git a/runtime/queries/dhall/highlights.scm b/runtime/queries/dhall/highlights.scm
new file mode 100644
index 00000000..52ede310
--- /dev/null
+++ b/runtime/queries/dhall/highlights.scm
@@ -0,0 +1,52 @@
+;; Literals
+
+(integer_literal) @constant.numeric.integer
+(natural_literal) @constant.numeric.integer
+(double_literal) @constant.numeric.float
+(boolean_literal) @constant.builtin.boolean
+(text_literal) @string
+(local_import) @string.special.path
+(http_import) @string.special.url
+(import_hash) @string
+
+;; Comments
+[
+  (line_comment)
+  (block_comment)
+] @comment
+
+;; Keywords
+[
+  ("let")
+  ("in")
+  (assign_operator)
+  (type_operator)
+  (lambda_operator)
+  (arrow_operator)
+  (infix_operator)
+  (completion_operator)
+  ("using")
+  ("assert")
+  (assert_operator)
+  ("as")
+  (forall_operator)
+  ("with")
+] @keyword
+
+;; Builtins
+[
+  (builtin_function)
+  (missing_import)
+] @function.builtin
+
+[ 
+  (builtin)
+  (import_as_text)
+] @type.builtin
+
+;; Conditionals
+[
+  ("if")
+  ("then")
+  ("else")
+] @keyword.control.conditional
diff --git a/runtime/queries/dhall/textobjects.scm b/runtime/queries/dhall/textobjects.scm
new file mode 100644
index 00000000..c840c758
--- /dev/null
+++ b/runtime/queries/dhall/textobjects.scm
@@ -0,0 +1,23 @@
+(lambda_expression
+  (label) @parameter.inside
+  (expression) @function.inside
+) @function.around
+
+(forall_expression
+  (label) @parameter.inside
+  (expression) @function.inside
+) @function.around
+
+(assert_expression
+  (expression) @test.inside
+) @test.around
+
+[
+  (block_comment_content)
+  (line_comment_content)
+] @comment.inside
+
+[
+  (block_comment)
+  (line_comment)
+] @comment.around

From b6331394a3f341ad21f8fad3e6e0b93becda9ce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Delafargue?= <clement@delafargue.name>
Date: Fri, 13 Jan 2023 16:15:39 +0100
Subject: [PATCH 741/884] book: fix the injection-regex example

The regex uses anchors, while all of the language
configs packaged with helix don't use them.
---
 book/src/languages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/src/languages.md b/book/src/languages.md
index e45ef910..ff06dc00 100644
--- a/book/src/languages.md
+++ b/book/src/languages.md
@@ -35,7 +35,7 @@ Each language is configured by adding a `[[language]]` section to a
 [[language]]
 name = "mylang"
 scope = "source.mylang"
-injection-regex = "^mylang$"
+injection-regex = "mylang"
 file-types = ["mylang", "myl"]
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }

From cce19713fb970df1a96be7e76e3217e4e50efc42 Mon Sep 17 00:00:00 2001
From: gavynriebau <gavyn.riebau@gmail.com>
Date: Mon, 16 Jan 2023 15:13:48 +0800
Subject: [PATCH 742/884] Fix for lost clipboard contents (#5424) (#5426)

* Fix for lost clipboard contents (#5424)

* PR feedback: Call "setsid" for all unix systems

* PR Feedback: Only install libc for unix targets
---
 Cargo.lock                  |  1 +
 helix-view/Cargo.toml       |  3 +++
 helix-view/src/clipboard.rs | 21 ++++++++++++++++++---
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 69ba8444..ede4ae0d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1274,6 +1274,7 @@ dependencies = [
  "helix-lsp",
  "helix-tui",
  "helix-vcs",
+ "libc",
  "log",
  "once_cell",
  "serde",
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index e7a20496..7d130317 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -48,5 +48,8 @@ which = "4.2"
 [target.'cfg(windows)'.dependencies]
 clipboard-win = { version = "4.5", features = ["std"] }
 
+[target.'cfg(unix)'.dependencies]
+libc = "0.2"
+
 [dev-dependencies]
 helix-tui = { path = "../helix-tui" }
diff --git a/helix-view/src/clipboard.rs b/helix-view/src/clipboard.rs
index 4f83fb4d..3c620c14 100644
--- a/helix-view/src/clipboard.rs
+++ b/helix-view/src/clipboard.rs
@@ -276,12 +276,27 @@ pub mod provider {
                 let stdin = input.map(|_| Stdio::piped()).unwrap_or_else(Stdio::null);
                 let stdout = pipe_output.then(Stdio::piped).unwrap_or_else(Stdio::null);
 
-                let mut child = Command::new(self.prg)
+                let mut command: Command = Command::new(self.prg);
+
+                let mut command_mut: &mut Command = command
                     .args(self.args)
                     .stdin(stdin)
                     .stdout(stdout)
-                    .stderr(Stdio::null())
-                    .spawn()?;
+                    .stderr(Stdio::null());
+
+                // Fix for https://github.com/helix-editor/helix/issues/5424
+                if cfg!(unix) {
+                    use std::os::unix::process::CommandExt;
+
+                    unsafe {
+                        command_mut = command_mut.pre_exec(|| match libc::setsid() {
+                            -1 => Err(std::io::Error::last_os_error()),
+                            _ => Ok(()),
+                        });
+                    }
+                }
+
+                let mut child = command_mut.spawn()?;
 
                 if let Some(input) = input {
                     let mut stdin = child.stdin.take().context("stdin is missing")?;

From d3e0f18c89c94c887d50d2487a4ee76eb96dda2b Mon Sep 17 00:00:00 2001
From: Itay123 <40892795+Itay123TheKing@users.noreply.github.com>
Date: Mon, 16 Jan 2023 09:18:13 +0200
Subject: [PATCH 743/884] Added opening files in the background with A-ret
 shortcut (#4435)

---
 helix-term/src/ui/picker.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index aad3f81c..eb935e56 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -1,4 +1,5 @@
 use crate::{
+    alt,
     compositor::{Component, Compositor, Context, Event, EventResult},
     ctrl, key, shift,
     ui::{self, fuzzy_match::FuzzyQuery, EditorView},
@@ -619,6 +620,11 @@ impl<T: Item + 'static> Component for Picker<T> {
             key!(Esc) | ctrl!('c') => {
                 return close_fn;
             }
+            alt!(Enter) => {
+                if let Some(option) = self.selection() {
+                    (self.callback_fn)(cx, option, Action::Load);
+                }
+            }
             key!(Enter) => {
                 if let Some(option) = self.selection() {
                     (self.callback_fn)(cx, option, Action::Replace);

From 6f6334f3c65f66f72867e6500b3c4a76ed017dfe Mon Sep 17 00:00:00 2001
From: eugene yokota <eed3si9n@gmail.com>
Date: Mon, 16 Jan 2023 10:48:17 -0500
Subject: [PATCH 744/884] highlight(scala): update the Scala highlight queries
 (#5546)

There have been a lot of changes in tree-sitter/tree-sitter-scala,
including partial support for Scala 3 syntax and breaking changes in
some of the nodes.

This bumps up the grammar to the latest, and adjusts the queries.

Co-authored-by: Anton Sviridov <keynmol@gmail.com>
Co-authored-by: Chris Kipp <ckipp@pm.me>
---
 languages.toml                       |   2 +-
 runtime/queries/scala/highlights.scm | 129 ++++++++++++++++++++-------
 2 files changed, 100 insertions(+), 31 deletions(-)

diff --git a/languages.toml b/languages.toml
index 51b4efb2..6d016902 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1064,7 +1064,7 @@ language-server = { command = "metals" }
 
 [[grammar]]
 name = "scala"
-source = { git = "https://github.com/tree-sitter/tree-sitter-scala", rev = "140c96cf398693189d4e50f76d19ddfcd8a018f8" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-scala", rev = "db1c8c23d7996476a791db85a0d292084c19c232" }
 
 [[language]]
 name = "dockerfile"
diff --git a/runtime/queries/scala/highlights.scm b/runtime/queries/scala/highlights.scm
index 50a6e18a..07307875 100644
--- a/runtime/queries/scala/highlights.scm
+++ b/runtime/queries/scala/highlights.scm
@@ -33,6 +33,26 @@
 (type_definition
   name: (type_identifier) @type)
 
+(full_enum_case
+  name: (identifier) @type)
+
+(simple_enum_case
+  name: (identifier) @type)
+
+;; val/var definitions/declarations
+
+(val_definition
+  pattern: (identifier) @variable)
+
+(var_definition
+  pattern: (identifier) @variable)
+
+(val_declaration
+  name: (identifier) @variable)
+
+(var_declaration
+  name: (identifier) @variable)
+
 ; method definition
 
 (class_definition
@@ -48,7 +68,7 @@
     (function_definition
       name: (identifier) @function.method)))
 
-; imports
+; imports/exports
 
 (import_declaration
   path: (identifier) @namespace)
@@ -58,7 +78,15 @@
   path: (identifier) @type) (#match? @type "^[A-Z]"))
 ((stable_identifier (identifier) @type) (#match? @type "^[A-Z]"))
 
-((import_selectors (identifier) @type) (#match? @type "^[A-Z]"))
+(export_declaration
+  path: (identifier) @namespace)
+((stable_identifier (identifier) @namespace))
+
+((export_declaration
+  path: (identifier) @type) (#match? @type "^[A-Z]"))
+((stable_identifier (identifier) @type) (#match? @type "^[A-Z]"))
+
+((namespace_selectors (identifier) @type) (#match? @type "^[A-Z]"))
 
 ; method invocation
 
@@ -66,10 +94,17 @@
 (call_expression
   function: (identifier) @function)
 
+(call_expression
+  function: (operator_identifier) @function)
+
 (call_expression
   function: (field_expression
     field: (identifier) @function.method))
 
+(call_expression
+  function: (field_expression
+    field: (operator_identifier) @function.method))
+
 ((call_expression
    function: (identifier) @variable.other.member)
  (#match? @variable.other.member "^[A-Z]"))
@@ -87,9 +122,15 @@
 (function_definition
   name: (identifier) @function)
 
+(function_definition
+  name: (operator_identifier) @function)
+
 (parameter
   name: (identifier) @variable.parameter)
 
+(binding
+  name: (identifier) @variable.parameter)
+
 ; expressions
 
 
@@ -109,7 +150,7 @@
 
 
 (symbol_literal) @string.special.symbol
- 
+
 [
 (string)
 (character_literal)
@@ -118,29 +159,50 @@
 
 (interpolation "$" @punctuation.special)
 
+; annotations
+
+(annotation) @attribute
+
 ;; keywords
 
+;; storage in TextMate scope lingo means field or type
 [
+  (opaque_modifier)
+  (infix_modifier)
+  (transparent_modifier)
+  (open_modifier)
   "abstract"
-  "case"
-  "class"
-  "extends"
   "final"
-  "finally"
-;; `forSome` existential types not implemented yet
   "implicit"
   "lazy"
-;; `macro` not implemented yet
-  "object"
   "override"
-  "package"
   "private"
   "protected"
   "sealed"
+] @keyword.storage.modifier
+
+[
+  "class"
+  "enum"
+  "extension"
+  "given"
+  "object"
+  "package"
   "trait"
   "type"
   "val"
   "var"
+] @keyword.storage.type
+
+[
+  "as"
+  "derives"
+  "end"
+  "extends"
+;; `forSome` existential types not implemented yet
+;; `macro` not implemented yet
+;; `throws`
+  "using"
   "with"
 ] @keyword
 
@@ -152,33 +214,36 @@
 "new" @keyword.operator
 
 [
- "else"
- "if"
- "match"
- "try"
- "catch"
- "throw"
+  "case"
+  "catch"
+  "else"
+  "finally"
+  "if"
+  "match"
+  "then"
+  "throw"
+  "try"
 ] @keyword.control.conditional
 
 [
- "("
- ")"
- "["
- "]"
- "{"
- "}"
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
 ] @punctuation.bracket
 
 [
- "."
- ","
+  "."
+  ","
 ] @punctuation.delimiter
 
 [
- "do"
- "for"
- "while"
- "yield"
+  "do"
+  "for"
+  "while"
+  "yield"
 ] @keyword.control.repeat
 
 "def" @keyword.function
@@ -191,6 +256,8 @@
 
 "import" @keyword.control.import
 
+"export" @keyword.control.import
+
 "return" @keyword.control.return
 
 (comment) @comment
@@ -200,4 +267,6 @@
 (case_block
   (case_clause ("case") @keyword.control.conditional))
 
-(identifier) @variable
\ No newline at end of file
+(identifier) @variable
+
+(operator_identifier) @operator

From 425d7e5f1b67d2c1748b4b30091d88d1446aecc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Delafargue?= <clement@delafargue.name>
Date: Mon, 16 Jan 2023 11:13:03 +0100
Subject: [PATCH 745/884] doc: add a note about nested bindings in key
 remapping

It was not clear (to me) that minor modes were configurable in the
keymap configuration.
---
 book/src/remapping.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/book/src/remapping.md b/book/src/remapping.md
index e89c6611..2eac8846 100644
--- a/book/src/remapping.md
+++ b/book/src/remapping.md
@@ -25,6 +25,9 @@ j = { k = "normal_mode" } # Maps `jk` to exit insert mode
 ```
 > NOTE: Typable commands can also be remapped, remember to keep the `:` prefix to indicate it's a typable command.
 
+> NOTE: Bindings can be nested, to create (or edit) minor modes: `g = { a = "code_action"}` adds a new entry to
+> the `goto` mode.
+
 Ctrl, Shift and Alt modifiers are encoded respectively with the prefixes
 `C-`, `S-` and `A-`. Special keys are encoded as follows:
 

From 7bdba4a6bff99a89c0256889222f7bba5bfb1130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Delafargue?= <clement@delafargue.name>
Date: Mon, 16 Jan 2023 16:30:35 +0100
Subject: [PATCH 746/884] doc: add missing `whitespace.render` sub-key

---
 book/src/configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index a35482e6..f89ef5ae 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -216,7 +216,7 @@ Options for rendering whitespace with visible characters. Use `:set whitespace.r
 
 | Key | Description | Default |
 |-----|-------------|---------|
-| `render` | Whether to render whitespace. May either be `"all"` or `"none"`, or a table with sub-keys `space`, `tab`, and `newline`. | `"none"` |
+| `render` | Whether to render whitespace. May either be `"all"` or `"none"`, or a table with sub-keys `space`, `nbsp`, `tab`, and `newline`. | `"none"` |
 | `characters` | Literal characters to use when rendering whitespace. Sub-keys may be any of `tab`, `space`, `nbsp`, `newline` or `tabpad` | See example below |
 
 Example

From 97083f88364e1455f42023dadadfb410fd476505 Mon Sep 17 00:00:00 2001
From: Ayoub Benali <ayoub-benali@users.noreply.github.com>
Date: Mon, 16 Jan 2023 17:03:03 +0100
Subject: [PATCH 747/884] Enable http server by default in Metals config
 (#5551)

This is required to make commands like [doctor-run](https://scalameta.org/metals/docs/integrations/new-editor#run-doctor) work.
It simply opens a browser to get general information about the build.

Co-authored-by: Ayoub Benali <ayoub.benali@xing.com>
---
 languages.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 6d016902..a66605b2 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1061,6 +1061,7 @@ file-types = ["scala", "sbt", "sc"]
 comment-token = "//"
 indent = { tab-width = 2, unit = "  " }
 language-server = { command = "metals" }
+config = { "isHttpEnabled" = true }
 
 [[grammar]]
 name = "scala"
@@ -2106,4 +2107,4 @@ formatter = { command = "dhall" , args = ["format"] }
 
 [[grammar]]
 name = "dhall"
-source = { git = "https://github.com/jbellerb/tree-sitter-dhall", rev = "affb6ee38d629c9296749767ab832d69bb0d9ea8" }
\ No newline at end of file
+source = { git = "https://github.com/jbellerb/tree-sitter-dhall", rev = "affb6ee38d629c9296749767ab832d69bb0d9ea8" }

From 60f84be40c1c488dacf823f791ca33f43b5d28d8 Mon Sep 17 00:00:00 2001
From: greg-enbala <66078183+greg-enbala@users.noreply.github.com>
Date: Mon, 16 Jan 2023 11:15:23 -0500
Subject: [PATCH 748/884] Separate jump behavior from increment/decrement
 (#4123)

increment/decrement (C-a/C-x) had some buggy behavior where selections
could be offset incorrectly or the editor could panic with some edits
that changed the number of characters in a number or date. These stemmed
from the automatic jumping behavior which attempted to find the next
date or integer to increment. The jumping behavior also complicated the
code quite a bit and made the behavior somewhat difficult to predict
when using many cursors.

This change removes the automatic jumping behavior and only increments
or decrements when the full text in a range of a selection is a number
or date. This simplifies the code and fixes the panics and buggy
behaviors from changing the number of characters.
---
 helix-core/src/increment/date_time.rs | 321 ++++------------
 helix-core/src/increment/integer.rs   | 235 ++++++++++++
 helix-core/src/increment/mod.rs       |  12 +-
 helix-core/src/increment/number.rs    | 507 --------------------------
 helix-term/src/commands.rs            | 113 ++----
 5 files changed, 349 insertions(+), 839 deletions(-)
 create mode 100644 helix-core/src/increment/integer.rs
 delete mode 100644 helix-core/src/increment/number.rs

diff --git a/helix-core/src/increment/date_time.rs b/helix-core/src/increment/date_time.rs
index 265242ce..2980bb58 100644
--- a/helix-core/src/increment/date_time.rs
+++ b/helix-core/src/increment/date_time.rs
@@ -1,114 +1,53 @@
-use chrono::{Datelike, Duration, NaiveDate, NaiveDateTime, NaiveTime, Timelike};
+use chrono::{Duration, NaiveDate, NaiveDateTime, NaiveTime};
 use once_cell::sync::Lazy;
 use regex::Regex;
-use ropey::RopeSlice;
-
-use std::borrow::Cow;
-use std::cmp;
 use std::fmt::Write;
 
-use super::Increment;
-use crate::{Range, Tendril};
+/// Increment a Date or DateTime
+///
+/// If just a Date is selected the day will be incremented.
+/// If a DateTime is selected the second will be incremented.
+pub fn increment(selected_text: &str, amount: i64) -> Option<String> {
+    if selected_text.is_empty() {
+        return None;
+    }
 
-#[derive(Debug, PartialEq, Eq)]
-pub struct DateTimeIncrementor {
-    date_time: NaiveDateTime,
-    range: Range,
-    fmt: &'static str,
-    field: DateField,
-}
+    FORMATS.iter().find_map(|format| {
+        let captures = format.regex.captures(selected_text)?;
+        if captures.len() - 1 != format.fields.len() {
+            return None;
+        }
 
-impl DateTimeIncrementor {
-    pub fn from_range(text: RopeSlice, range: Range) -> Option<DateTimeIncrementor> {
-        let range = if range.is_empty() {
-            if range.anchor < text.len_chars() {
-                // Treat empty range as a cursor range.
-                range.put_cursor(text, range.anchor + 1, true)
-            } else {
-                // The range is empty and at the end of the text.
-                return None;
+        let date_time = captures.get(0)?;
+        let has_date = format.fields.iter().any(|f| f.unit.is_date());
+        let has_time = format.fields.iter().any(|f| f.unit.is_time());
+        let date_time = &selected_text[date_time.start()..date_time.end()];
+        match (has_date, has_time) {
+            (true, true) => {
+                let date_time = NaiveDateTime::parse_from_str(date_time, format.fmt).ok()?;
+                Some(
+                    date_time
+                        .checked_add_signed(Duration::minutes(amount))?
+                        .format(format.fmt)
+                        .to_string(),
+                )
             }
-        } else {
-            range
-        };
-
-        FORMATS.iter().find_map(|format| {
-            let from = range.from().saturating_sub(format.max_len);
-            let to = (range.from() + format.max_len).min(text.len_chars());
-
-            let (from_in_text, to_in_text) = (range.from() - from, range.to() - from);
-            let text: Cow<str> = text.slice(from..to).into();
-
-            let captures = format.regex.captures(&text)?;
-            if captures.len() - 1 != format.fields.len() {
-                return None;
+            (true, false) => {
+                let date = NaiveDate::parse_from_str(date_time, format.fmt).ok()?;
+                Some(
+                    date.checked_add_signed(Duration::days(amount))?
+                        .format(format.fmt)
+                        .to_string(),
+                )
             }
-
-            let date_time = captures.get(0)?;
-            let offset = range.from() - from_in_text;
-            let range = Range::new(date_time.start() + offset, date_time.end() + offset);
-
-            let field = captures
-                .iter()
-                .skip(1)
-                .enumerate()
-                .find_map(|(i, capture)| {
-                    let capture = capture?;
-                    let capture_range = capture.range();
-
-                    if capture_range.contains(&from_in_text)
-                        && capture_range.contains(&(to_in_text - 1))
-                    {
-                        Some(format.fields[i])
-                    } else {
-                        None
-                    }
-                })?;
-
-            let has_date = format.fields.iter().any(|f| f.unit.is_date());
-            let has_time = format.fields.iter().any(|f| f.unit.is_time());
-
-            let date_time = &text[date_time.start()..date_time.end()];
-            let date_time = match (has_date, has_time) {
-                (true, true) => NaiveDateTime::parse_from_str(date_time, format.fmt).ok()?,
-                (true, false) => {
-                    let date = NaiveDate::parse_from_str(date_time, format.fmt).ok()?;
-
-                    date.and_hms_opt(0, 0, 0).unwrap()
-                }
-                (false, true) => {
-                    let time = NaiveTime::parse_from_str(date_time, format.fmt).ok()?;
-
-                    NaiveDate::from_ymd_opt(0, 1, 1).unwrap().and_time(time)
-                }
-                (false, false) => return None,
-            };
-
-            Some(DateTimeIncrementor {
-                date_time,
-                range,
-                fmt: format.fmt,
-                field,
-            })
-        })
-    }
-}
-
-impl Increment for DateTimeIncrementor {
-    fn increment(&self, amount: i64) -> (Range, Tendril) {
-        let date_time = match self.field.unit {
-            DateUnit::Years => add_years(self.date_time, amount),
-            DateUnit::Months => add_months(self.date_time, amount),
-            DateUnit::Days => add_duration(self.date_time, Duration::days(amount)),
-            DateUnit::Hours => add_duration(self.date_time, Duration::hours(amount)),
-            DateUnit::Minutes => add_duration(self.date_time, Duration::minutes(amount)),
-            DateUnit::Seconds => add_duration(self.date_time, Duration::seconds(amount)),
-            DateUnit::AmPm => toggle_am_pm(self.date_time),
+            (false, true) => {
+                let time = NaiveTime::parse_from_str(date_time, format.fmt).ok()?;
+                let (adjusted_time, _) = time.overflowing_add_signed(Duration::minutes(amount));
+                Some(adjusted_time.format(format.fmt).to_string())
+            }
+            (false, false) => None,
         }
-        .unwrap_or(self.date_time);
-
-        (self.range, date_time.format(self.fmt).to_string().into())
-    }
+    })
 }
 
 static FORMATS: Lazy<Vec<Format>> = Lazy::new(|| {
@@ -144,7 +83,7 @@ impl Format {
     fn new(fmt: &'static str) -> Self {
         let mut remaining = fmt;
         let mut fields = Vec::new();
-        let mut regex = String::new();
+        let mut regex = "^".to_string();
         let mut max_len = 0;
 
         while let Some(i) = remaining.find('%') {
@@ -166,6 +105,7 @@ impl Format {
             write!(regex, "({})", field.regex).unwrap();
             remaining = &after[spec_len..];
         }
+        regex += "$";
 
         let regex = Regex::new(&regex).unwrap();
 
@@ -305,155 +245,47 @@ impl DateUnit {
     }
 }
 
-fn ndays_in_month(year: i32, month: u32) -> u32 {
-    // The first day of the next month...
-    let (y, m) = if month == 12 {
-        (year + 1, 1)
-    } else {
-        (year, month + 1)
-    };
-    let d = NaiveDate::from_ymd_opt(y, m, 1).unwrap();
-
-    // ...is preceded by the last day of the original month.
-    d.pred_opt().unwrap().day()
-}
-
-fn add_months(date_time: NaiveDateTime, amount: i64) -> Option<NaiveDateTime> {
-    let month = (date_time.month0() as i64).checked_add(amount)?;
-    let year = date_time.year() + i32::try_from(month / 12).ok()?;
-    let year = if month.is_negative() { year - 1 } else { year };
-
-    // Normalize month
-    let month = month % 12;
-    let month = if month.is_negative() {
-        month + 12
-    } else {
-        month
-    } as u32
-        + 1;
-
-    let day = cmp::min(date_time.day(), ndays_in_month(year, month));
-
-    NaiveDate::from_ymd_opt(year, month, day).map(|date| date.and_time(date_time.time()))
-}
-
-fn add_years(date_time: NaiveDateTime, amount: i64) -> Option<NaiveDateTime> {
-    let year = i32::try_from((date_time.year() as i64).checked_add(amount)?).ok()?;
-    let ndays = ndays_in_month(year, date_time.month());
-
-    if date_time.day() > ndays {
-        NaiveDate::from_ymd_opt(year, date_time.month(), ndays)
-            .and_then(|date| date.succ_opt().map(|date| date.and_time(date_time.time())))
-    } else {
-        date_time.with_year(year)
-    }
-}
-
-fn add_duration(date_time: NaiveDateTime, duration: Duration) -> Option<NaiveDateTime> {
-    date_time.checked_add_signed(duration)
-}
-
-fn toggle_am_pm(date_time: NaiveDateTime) -> Option<NaiveDateTime> {
-    if date_time.hour() < 12 {
-        add_duration(date_time, Duration::hours(12))
-    } else {
-        add_duration(date_time, Duration::hours(-12))
-    }
-}
-
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::Rope;
 
     #[test]
     fn test_increment_date_times() {
         let tests = [
             // (original, cursor, amount, expected)
-            ("2020-02-28", 0, 1, "2021-02-28"),
-            ("2020-02-29", 0, 1, "2021-03-01"),
-            ("2020-01-31", 5, 1, "2020-02-29"),
-            ("2020-01-20", 5, 1, "2020-02-20"),
-            ("2021-01-01", 5, -1, "2020-12-01"),
-            ("2021-01-31", 5, -2, "2020-11-30"),
-            ("2020-02-28", 8, 1, "2020-02-29"),
-            ("2021-02-28", 8, 1, "2021-03-01"),
-            ("2021-02-28", 0, -1, "2020-02-28"),
-            ("2021-03-01", 0, -1, "2020-03-01"),
-            ("2020-02-29", 5, -1, "2020-01-29"),
-            ("2020-02-20", 5, -1, "2020-01-20"),
-            ("2020-02-29", 8, -1, "2020-02-28"),
-            ("2021-03-01", 8, -1, "2021-02-28"),
-            ("1980/12/21", 8, 100, "1981/03/31"),
-            ("1980/12/21", 8, -100, "1980/09/12"),
-            ("1980/12/21", 8, 1000, "1983/09/17"),
-            ("1980/12/21", 8, -1000, "1978/03/27"),
-            ("2021-11-24 07:12:23", 0, 1, "2022-11-24 07:12:23"),
-            ("2021-11-24 07:12:23", 5, 1, "2021-12-24 07:12:23"),
-            ("2021-11-24 07:12:23", 8, 1, "2021-11-25 07:12:23"),
-            ("2021-11-24 07:12:23", 11, 1, "2021-11-24 08:12:23"),
-            ("2021-11-24 07:12:23", 14, 1, "2021-11-24 07:13:23"),
-            ("2021-11-24 07:12:23", 17, 1, "2021-11-24 07:12:24"),
-            ("2021/11/24 07:12:23", 0, 1, "2022/11/24 07:12:23"),
-            ("2021/11/24 07:12:23", 5, 1, "2021/12/24 07:12:23"),
-            ("2021/11/24 07:12:23", 8, 1, "2021/11/25 07:12:23"),
-            ("2021/11/24 07:12:23", 11, 1, "2021/11/24 08:12:23"),
-            ("2021/11/24 07:12:23", 14, 1, "2021/11/24 07:13:23"),
-            ("2021/11/24 07:12:23", 17, 1, "2021/11/24 07:12:24"),
-            ("2021-11-24 07:12", 0, 1, "2022-11-24 07:12"),
-            ("2021-11-24 07:12", 5, 1, "2021-12-24 07:12"),
-            ("2021-11-24 07:12", 8, 1, "2021-11-25 07:12"),
-            ("2021-11-24 07:12", 11, 1, "2021-11-24 08:12"),
-            ("2021-11-24 07:12", 14, 1, "2021-11-24 07:13"),
-            ("2021/11/24 07:12", 0, 1, "2022/11/24 07:12"),
-            ("2021/11/24 07:12", 5, 1, "2021/12/24 07:12"),
-            ("2021/11/24 07:12", 8, 1, "2021/11/25 07:12"),
-            ("2021/11/24 07:12", 11, 1, "2021/11/24 08:12"),
-            ("2021/11/24 07:12", 14, 1, "2021/11/24 07:13"),
-            ("Wed Nov 24 2021", 0, 1, "Thu Nov 25 2021"),
-            ("Wed Nov 24 2021", 4, 1, "Fri Dec 24 2021"),
-            ("Wed Nov 24 2021", 8, 1, "Thu Nov 25 2021"),
-            ("Wed Nov 24 2021", 11, 1, "Thu Nov 24 2022"),
-            ("24-Nov-2021", 0, 1, "25-Nov-2021"),
-            ("24-Nov-2021", 3, 1, "24-Dec-2021"),
-            ("24-Nov-2021", 7, 1, "24-Nov-2022"),
-            ("2021 Nov 24", 0, 1, "2022 Nov 24"),
-            ("2021 Nov 24", 5, 1, "2021 Dec 24"),
-            ("2021 Nov 24", 9, 1, "2021 Nov 25"),
-            ("Nov 24, 2021", 0, 1, "Dec 24, 2021"),
-            ("Nov 24, 2021", 4, 1, "Nov 25, 2021"),
-            ("Nov 24, 2021", 8, 1, "Nov 24, 2022"),
-            ("7:21:53 am", 0, 1, "8:21:53 am"),
-            ("7:21:53 am", 3, 1, "7:22:53 am"),
-            ("7:21:53 am", 5, 1, "7:21:54 am"),
-            ("7:21:53 am", 8, 1, "7:21:53 pm"),
-            ("7:21:53 AM", 0, 1, "8:21:53 AM"),
-            ("7:21:53 AM", 3, 1, "7:22:53 AM"),
-            ("7:21:53 AM", 5, 1, "7:21:54 AM"),
-            ("7:21:53 AM", 8, 1, "7:21:53 PM"),
-            ("7:21 am", 0, 1, "8:21 am"),
-            ("7:21 am", 3, 1, "7:22 am"),
-            ("7:21 am", 5, 1, "7:21 pm"),
-            ("7:21 AM", 0, 1, "8:21 AM"),
-            ("7:21 AM", 3, 1, "7:22 AM"),
-            ("7:21 AM", 5, 1, "7:21 PM"),
-            ("23:24:23", 1, 1, "00:24:23"),
-            ("23:24:23", 3, 1, "23:25:23"),
-            ("23:24:23", 6, 1, "23:24:24"),
-            ("23:24", 1, 1, "00:24"),
-            ("23:24", 3, 1, "23:25"),
+            ("2020-02-28", 1, "2020-02-29"),
+            ("2020-02-29", 1, "2020-03-01"),
+            ("2020-01-31", 1, "2020-02-01"),
+            ("2020-01-20", 1, "2020-01-21"),
+            ("2021-01-01", -1, "2020-12-31"),
+            ("2021-01-31", -2, "2021-01-29"),
+            ("2020-02-28", 1, "2020-02-29"),
+            ("2021-02-28", 1, "2021-03-01"),
+            ("2021-03-01", -1, "2021-02-28"),
+            ("2020-02-29", -1, "2020-02-28"),
+            ("2020-02-20", -1, "2020-02-19"),
+            ("2021-03-01", -1, "2021-02-28"),
+            ("1980/12/21", 100, "1981/03/31"),
+            ("1980/12/21", -100, "1980/09/12"),
+            ("1980/12/21", 1000, "1983/09/17"),
+            ("1980/12/21", -1000, "1978/03/27"),
+            ("2021-11-24 07:12:23", 1, "2021-11-24 07:13:23"),
+            ("2021-11-24 07:12", 1, "2021-11-24 07:13"),
+            ("Wed Nov 24 2021", 1, "Thu Nov 25 2021"),
+            ("24-Nov-2021", 1, "25-Nov-2021"),
+            ("2021 Nov 24", 1, "2021 Nov 25"),
+            ("Nov 24, 2021", 1, "Nov 25, 2021"),
+            ("7:21:53 am", 1, "7:22:53 am"),
+            ("7:21:53 AM", 1, "7:22:53 AM"),
+            ("7:21 am", 1, "7:22 am"),
+            ("23:24:23", 1, "23:25:23"),
+            ("23:24", 1, "23:25"),
+            ("23:59", 1, "00:00"),
+            ("23:59:59", 1, "00:00:59"),
         ];
 
-        for (original, cursor, amount, expected) in tests {
-            let rope = Rope::from_str(original);
-            let range = Range::new(cursor, cursor + 1);
-            assert_eq!(
-                DateTimeIncrementor::from_range(rope.slice(..), range)
-                    .unwrap()
-                    .increment(amount)
-                    .1,
-                Tendril::from(expected)
-            );
+        for (original, amount, expected) in tests {
+            assert_eq!(increment(original, amount).unwrap(), expected);
         }
     }
 
@@ -482,10 +314,7 @@ mod test {
         ];
 
         for invalid in tests {
-            let rope = Rope::from_str(invalid);
-            let range = Range::new(0, 1);
-
-            assert_eq!(DateTimeIncrementor::from_range(rope.slice(..), range), None)
+            assert_eq!(increment(invalid, 1), None)
         }
     }
 }
diff --git a/helix-core/src/increment/integer.rs b/helix-core/src/increment/integer.rs
new file mode 100644
index 00000000..30803e17
--- /dev/null
+++ b/helix-core/src/increment/integer.rs
@@ -0,0 +1,235 @@
+const SEPARATOR: char = '_';
+
+/// Increment an integer.
+///
+/// Supported bases:
+///     2 with prefix 0b
+///     8 with prefix 0o
+///     10 with no prefix
+///     16 with prefix 0x
+///
+/// An integer can contain `_` as a separator but may not start or end with a separator.
+/// Base 10 integers can go negative, but bases 2, 8, and 16 cannot.
+/// All addition and subtraction is saturating.
+pub fn increment(selected_text: &str, amount: i64) -> Option<String> {
+    if selected_text.is_empty()
+        || selected_text.ends_with(SEPARATOR)
+        || selected_text.starts_with(SEPARATOR)
+    {
+        return None;
+    }
+
+    let radix = if selected_text.starts_with("0x") {
+        16
+    } else if selected_text.starts_with("0o") {
+        8
+    } else if selected_text.starts_with("0b") {
+        2
+    } else {
+        10
+    };
+
+    // Get separator indexes from right to left.
+    let separator_rtl_indexes: Vec<usize> = selected_text
+        .chars()
+        .rev()
+        .enumerate()
+        .filter_map(|(i, c)| if c == SEPARATOR { Some(i) } else { None })
+        .collect();
+
+    let word: String = selected_text.chars().filter(|&c| c != SEPARATOR).collect();
+
+    let mut new_text = if radix == 10 {
+        let number = &word;
+        let value = i128::from_str_radix(number, radix).ok()?;
+        let new_value = value.saturating_add(amount as i128);
+
+        let format_length = match (value.is_negative(), new_value.is_negative()) {
+            (true, false) => number.len() - 1,
+            (false, true) => number.len() + 1,
+            _ => number.len(),
+        } - separator_rtl_indexes.len();
+
+        if number.starts_with('0') || number.starts_with("-0") {
+            format!("{:01$}", new_value, format_length)
+        } else {
+            format!("{}", new_value)
+        }
+    } else {
+        let number = &word[2..];
+        let value = u128::from_str_radix(number, radix).ok()?;
+        let new_value = (value as i128).saturating_add(amount as i128);
+        let new_value = if new_value < 0 { 0 } else { new_value };
+        let format_length = selected_text.len() - 2 - separator_rtl_indexes.len();
+
+        match radix {
+            2 => format!("0b{:01$b}", new_value, format_length),
+            8 => format!("0o{:01$o}", new_value, format_length),
+            16 => {
+                let (lower_count, upper_count): (usize, usize) =
+                    number.chars().fold((0, 0), |(lower, upper), c| {
+                        (
+                            lower + c.is_ascii_lowercase().then(|| 1).unwrap_or(0),
+                            upper + c.is_ascii_uppercase().then(|| 1).unwrap_or(0),
+                        )
+                    });
+                if upper_count > lower_count {
+                    format!("0x{:01$X}", new_value, format_length)
+                } else {
+                    format!("0x{:01$x}", new_value, format_length)
+                }
+            }
+            _ => unimplemented!("radix not supported: {}", radix),
+        }
+    };
+
+    // Add separators from original number.
+    for &rtl_index in &separator_rtl_indexes {
+        if rtl_index < new_text.len() {
+            let new_index = new_text.len().saturating_sub(rtl_index);
+            if new_index > 0 {
+                new_text.insert(new_index, SEPARATOR);
+            }
+        }
+    }
+
+    // Add in additional separators if necessary.
+    if new_text.len() > selected_text.len() && !separator_rtl_indexes.is_empty() {
+        let spacing = match separator_rtl_indexes.as_slice() {
+            [.., b, a] => a - b - 1,
+            _ => separator_rtl_indexes[0],
+        };
+
+        let prefix_length = if radix == 10 { 0 } else { 2 };
+        if let Some(mut index) = new_text.find(SEPARATOR) {
+            while index - prefix_length > spacing {
+                index -= spacing;
+                new_text.insert(index, SEPARATOR);
+            }
+        }
+    }
+
+    Some(new_text)
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_increment_basic_decimal_numbers() {
+        let tests = [
+            ("100", 1, "101"),
+            ("100", -1, "99"),
+            ("99", 1, "100"),
+            ("100", 1000, "1100"),
+            ("100", -1000, "-900"),
+            ("-1", 1, "0"),
+            ("-1", 2, "1"),
+            ("1", -1, "0"),
+            ("1", -2, "-1"),
+        ];
+
+        for (original, amount, expected) in tests {
+            assert_eq!(increment(original, amount).unwrap(), expected);
+        }
+    }
+
+    #[test]
+    fn test_increment_basic_hexadecimal_numbers() {
+        let tests = [
+            ("0x0100", 1, "0x0101"),
+            ("0x0100", -1, "0x00ff"),
+            ("0x0001", -1, "0x0000"),
+            ("0x0000", -1, "0x0000"),
+            ("0xffffffffffffffff", 1, "0x10000000000000000"),
+            ("0xffffffffffffffff", 2, "0x10000000000000001"),
+            ("0xffffffffffffffff", -1, "0xfffffffffffffffe"),
+            ("0xABCDEF1234567890", 1, "0xABCDEF1234567891"),
+            ("0xabcdef1234567890", 1, "0xabcdef1234567891"),
+        ];
+
+        for (original, amount, expected) in tests {
+            assert_eq!(increment(original, amount).unwrap(), expected);
+        }
+    }
+
+    #[test]
+    fn test_increment_basic_octal_numbers() {
+        let tests = [
+            ("0o0107", 1, "0o0110"),
+            ("0o0110", -1, "0o0107"),
+            ("0o0001", -1, "0o0000"),
+            ("0o7777", 1, "0o10000"),
+            ("0o1000", -1, "0o0777"),
+            ("0o0107", 10, "0o0121"),
+            ("0o0000", -1, "0o0000"),
+            ("0o1777777777777777777777", 1, "0o2000000000000000000000"),
+            ("0o1777777777777777777777", 2, "0o2000000000000000000001"),
+            ("0o1777777777777777777777", -1, "0o1777777777777777777776"),
+        ];
+
+        for (original, amount, expected) in tests {
+            assert_eq!(increment(original, amount).unwrap(), expected);
+        }
+    }
+
+    #[test]
+    fn test_increment_basic_binary_numbers() {
+        let tests = [
+            ("0b00000100", 1, "0b00000101"),
+            ("0b00000100", -1, "0b00000011"),
+            ("0b00000100", 2, "0b00000110"),
+            ("0b00000100", -2, "0b00000010"),
+            ("0b00000001", -1, "0b00000000"),
+            ("0b00111111", 10, "0b01001001"),
+            ("0b11111111", 1, "0b100000000"),
+            ("0b10000000", -1, "0b01111111"),
+            ("0b0000", -1, "0b0000"),
+            (
+                "0b1111111111111111111111111111111111111111111111111111111111111111",
+                1,
+                "0b10000000000000000000000000000000000000000000000000000000000000000",
+            ),
+            (
+                "0b1111111111111111111111111111111111111111111111111111111111111111",
+                2,
+                "0b10000000000000000000000000000000000000000000000000000000000000001",
+            ),
+            (
+                "0b1111111111111111111111111111111111111111111111111111111111111111",
+                -1,
+                "0b1111111111111111111111111111111111111111111111111111111111111110",
+            ),
+        ];
+
+        for (original, amount, expected) in tests {
+            assert_eq!(increment(original, amount).unwrap(), expected);
+        }
+    }
+
+    #[test]
+    fn test_increment_with_separators() {
+        let tests = [
+            ("999_999", 1, "1_000_000"),
+            ("1_000_000", -1, "999_999"),
+            ("-999_999", -1, "-1_000_000"),
+            ("0x0000_0000_0001", 0x1_ffff_0000, "0x0001_ffff_0001"),
+            ("0x0000_0000", -1, "0x0000_0000"),
+            ("0x0000_0000_0000", -1, "0x0000_0000_0000"),
+            ("0b01111111_11111111", 1, "0b10000000_00000000"),
+            ("0b11111111_11111111", 1, "0b1_00000000_00000000"),
+        ];
+
+        for (original, amount, expected) in tests {
+            assert_eq!(increment(original, amount).unwrap(), expected);
+        }
+    }
+
+    #[test]
+    fn test_leading_and_trailing_separators_arent_a_match() {
+        assert_eq!(increment("9_", 1), None);
+        assert_eq!(increment("_9", 1), None);
+        assert_eq!(increment("_9_", 1), None);
+    }
+}
diff --git a/helix-core/src/increment/mod.rs b/helix-core/src/increment/mod.rs
index f5945774..f1978bde 100644
--- a/helix-core/src/increment/mod.rs
+++ b/helix-core/src/increment/mod.rs
@@ -1,8 +1,10 @@
-pub mod date_time;
-pub mod number;
+mod date_time;
+mod integer;
 
-use crate::{Range, Tendril};
+pub fn integer(selected_text: &str, amount: i64) -> Option<String> {
+    integer::increment(selected_text, amount)
+}
 
-pub trait Increment {
-    fn increment(&self, amount: i64) -> (Range, Tendril);
+pub fn date_time(selected_text: &str, amount: i64) -> Option<String> {
+    date_time::increment(selected_text, amount)
 }
diff --git a/helix-core/src/increment/number.rs b/helix-core/src/increment/number.rs
deleted file mode 100644
index 91268729..00000000
--- a/helix-core/src/increment/number.rs
+++ /dev/null
@@ -1,507 +0,0 @@
-use std::borrow::Cow;
-
-use ropey::RopeSlice;
-
-use super::Increment;
-
-use crate::{
-    textobject::{textobject_word, TextObject},
-    Range, Tendril,
-};
-
-#[derive(Debug, PartialEq, Eq)]
-pub struct NumberIncrementor<'a> {
-    value: i64,
-    radix: u32,
-    range: Range,
-
-    text: RopeSlice<'a>,
-}
-
-impl<'a> NumberIncrementor<'a> {
-    /// Return information about number under rang if there is one.
-    pub fn from_range(text: RopeSlice, range: Range) -> Option<NumberIncrementor> {
-        // If the cursor is on the minus sign of a number we want to get the word textobject to the
-        // right of it.
-        let range = if range.to() < text.len_chars()
-            && range.to() - range.from() <= 1
-            && text.char(range.from()) == '-'
-        {
-            Range::new(range.from() + 1, range.to() + 1)
-        } else {
-            range
-        };
-
-        let range = textobject_word(text, range, TextObject::Inside, 1, false);
-
-        // If there is a minus sign to the left of the word object, we want to include it in the range.
-        let range = if range.from() > 0 && text.char(range.from() - 1) == '-' {
-            range.extend(range.from() - 1, range.from())
-        } else {
-            range
-        };
-
-        let word: String = text
-            .slice(range.from()..range.to())
-            .chars()
-            .filter(|&c| c != '_')
-            .collect();
-        let (radix, prefixed) = if word.starts_with("0x") {
-            (16, true)
-        } else if word.starts_with("0o") {
-            (8, true)
-        } else if word.starts_with("0b") {
-            (2, true)
-        } else {
-            (10, false)
-        };
-
-        let number = if prefixed { &word[2..] } else { &word };
-
-        let value = i128::from_str_radix(number, radix).ok()?;
-        if (value.is_positive() && value.leading_zeros() < 64)
-            || (value.is_negative() && value.leading_ones() < 64)
-        {
-            return None;
-        }
-
-        let value = value as i64;
-        Some(NumberIncrementor {
-            range,
-            value,
-            radix,
-            text,
-        })
-    }
-}
-
-impl<'a> Increment for NumberIncrementor<'a> {
-    fn increment(&self, amount: i64) -> (Range, Tendril) {
-        let old_text: Cow<str> = self.text.slice(self.range.from()..self.range.to()).into();
-        let old_length = old_text.len();
-        let new_value = self.value.wrapping_add(amount);
-
-        // Get separator indexes from right to left.
-        let separator_rtl_indexes: Vec<usize> = old_text
-            .chars()
-            .rev()
-            .enumerate()
-            .filter_map(|(i, c)| if c == '_' { Some(i) } else { None })
-            .collect();
-
-        let format_length = if self.radix == 10 {
-            match (self.value.is_negative(), new_value.is_negative()) {
-                (true, false) => old_length - 1,
-                (false, true) => old_length + 1,
-                _ => old_text.len(),
-            }
-        } else {
-            old_text.len() - 2
-        } - separator_rtl_indexes.len();
-
-        let mut new_text = match self.radix {
-            2 => format!("0b{:01$b}", new_value, format_length),
-            8 => format!("0o{:01$o}", new_value, format_length),
-            10 if old_text.starts_with('0') || old_text.starts_with("-0") => {
-                format!("{:01$}", new_value, format_length)
-            }
-            10 => format!("{}", new_value),
-            16 => {
-                let (lower_count, upper_count): (usize, usize) =
-                    old_text.chars().skip(2).fold((0, 0), |(lower, upper), c| {
-                        (
-                            lower + usize::from(c.is_ascii_lowercase()),
-                            upper + usize::from(c.is_ascii_uppercase()),
-                        )
-                    });
-                if upper_count > lower_count {
-                    format!("0x{:01$X}", new_value, format_length)
-                } else {
-                    format!("0x{:01$x}", new_value, format_length)
-                }
-            }
-            _ => unimplemented!("radix not supported: {}", self.radix),
-        };
-
-        // Add separators from original number.
-        for &rtl_index in &separator_rtl_indexes {
-            if rtl_index < new_text.len() {
-                let new_index = new_text.len() - rtl_index;
-                new_text.insert(new_index, '_');
-            }
-        }
-
-        // Add in additional separators if necessary.
-        if new_text.len() > old_length && !separator_rtl_indexes.is_empty() {
-            let spacing = match separator_rtl_indexes.as_slice() {
-                [.., b, a] => a - b - 1,
-                _ => separator_rtl_indexes[0],
-            };
-
-            let prefix_length = if self.radix == 10 { 0 } else { 2 };
-            if let Some(mut index) = new_text.find('_') {
-                while index - prefix_length > spacing {
-                    index -= spacing;
-                    new_text.insert(index, '_');
-                }
-            }
-        }
-
-        (self.range, new_text.into())
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::Rope;
-
-    #[test]
-    fn test_decimal_at_point() {
-        let rope = Rope::from_str("Test text 12345 more text.");
-        let range = Range::point(12);
-        assert_eq!(
-            NumberIncrementor::from_range(rope.slice(..), range),
-            Some(NumberIncrementor {
-                range: Range::new(10, 15),
-                value: 12345,
-                radix: 10,
-                text: rope.slice(..),
-            })
-        );
-    }
-
-    #[test]
-    fn test_uppercase_hexadecimal_at_point() {
-        let rope = Rope::from_str("Test text 0x123ABCDEF more text.");
-        let range = Range::point(12);
-        assert_eq!(
-            NumberIncrementor::from_range(rope.slice(..), range),
-            Some(NumberIncrementor {
-                range: Range::new(10, 21),
-                value: 0x123ABCDEF,
-                radix: 16,
-                text: rope.slice(..),
-            })
-        );
-    }
-
-    #[test]
-    fn test_lowercase_hexadecimal_at_point() {
-        let rope = Rope::from_str("Test text 0xfa3b4e more text.");
-        let range = Range::point(12);
-        assert_eq!(
-            NumberIncrementor::from_range(rope.slice(..), range),
-            Some(NumberIncrementor {
-                range: Range::new(10, 18),
-                value: 0xfa3b4e,
-                radix: 16,
-                text: rope.slice(..),
-            })
-        );
-    }
-
-    #[test]
-    fn test_octal_at_point() {
-        let rope = Rope::from_str("Test text 0o1074312 more text.");
-        let range = Range::point(12);
-        assert_eq!(
-            NumberIncrementor::from_range(rope.slice(..), range),
-            Some(NumberIncrementor {
-                range: Range::new(10, 19),
-                value: 0o1074312,
-                radix: 8,
-                text: rope.slice(..),
-            })
-        );
-    }
-
-    #[test]
-    fn test_binary_at_point() {
-        let rope = Rope::from_str("Test text 0b10111010010101 more text.");
-        let range = Range::point(12);
-        assert_eq!(
-            NumberIncrementor::from_range(rope.slice(..), range),
-            Some(NumberIncrementor {
-                range: Range::new(10, 26),
-                value: 0b10111010010101,
-                radix: 2,
-                text: rope.slice(..),
-            })
-        );
-    }
-
-    #[test]
-    fn test_negative_decimal_at_point() {
-        let rope = Rope::from_str("Test text -54321 more text.");
-        let range = Range::point(12);
-        assert_eq!(
-            NumberIncrementor::from_range(rope.slice(..), range),
-            Some(NumberIncrementor {
-                range: Range::new(10, 16),
-                value: -54321,
-                radix: 10,
-                text: rope.slice(..),
-            })
-        );
-    }
-
-    #[test]
-    fn test_decimal_with_leading_zeroes_at_point() {
-        let rope = Rope::from_str("Test text 000045326 more text.");
-        let range = Range::point(12);
-        assert_eq!(
-            NumberIncrementor::from_range(rope.slice(..), range),
-            Some(NumberIncrementor {
-                range: Range::new(10, 19),
-                value: 45326,
-                radix: 10,
-                text: rope.slice(..),
-            })
-        );
-    }
-
-    #[test]
-    fn test_negative_decimal_cursor_on_minus_sign() {
-        let rope = Rope::from_str("Test text -54321 more text.");
-        let range = Range::point(10);
-        assert_eq!(
-            NumberIncrementor::from_range(rope.slice(..), range),
-            Some(NumberIncrementor {
-                range: Range::new(10, 16),
-                value: -54321,
-                radix: 10,
-                text: rope.slice(..),
-            })
-        );
-    }
-
-    #[test]
-    fn test_number_under_range_start_of_rope() {
-        let rope = Rope::from_str("100");
-        let range = Range::point(0);
-        assert_eq!(
-            NumberIncrementor::from_range(rope.slice(..), range),
-            Some(NumberIncrementor {
-                range: Range::new(0, 3),
-                value: 100,
-                radix: 10,
-                text: rope.slice(..),
-            })
-        );
-    }
-
-    #[test]
-    fn test_number_under_range_end_of_rope() {
-        let rope = Rope::from_str("100");
-        let range = Range::point(2);
-        assert_eq!(
-            NumberIncrementor::from_range(rope.slice(..), range),
-            Some(NumberIncrementor {
-                range: Range::new(0, 3),
-                value: 100,
-                radix: 10,
-                text: rope.slice(..),
-            })
-        );
-    }
-
-    #[test]
-    fn test_number_surrounded_by_punctuation() {
-        let rope = Rope::from_str(",100;");
-        let range = Range::point(1);
-        assert_eq!(
-            NumberIncrementor::from_range(rope.slice(..), range),
-            Some(NumberIncrementor {
-                range: Range::new(1, 4),
-                value: 100,
-                radix: 10,
-                text: rope.slice(..),
-            })
-        );
-    }
-
-    #[test]
-    fn test_not_a_number_point() {
-        let rope = Rope::from_str("Test text 45326 more text.");
-        let range = Range::point(6);
-        assert_eq!(NumberIncrementor::from_range(rope.slice(..), range), None);
-    }
-
-    #[test]
-    fn test_number_too_large_at_point() {
-        let rope = Rope::from_str("Test text 0xFFFFFFFFFFFFFFFFF more text.");
-        let range = Range::point(12);
-        assert_eq!(NumberIncrementor::from_range(rope.slice(..), range), None);
-    }
-
-    #[test]
-    fn test_number_cursor_one_right_of_number() {
-        let rope = Rope::from_str("100 ");
-        let range = Range::point(3);
-        assert_eq!(NumberIncrementor::from_range(rope.slice(..), range), None);
-    }
-
-    #[test]
-    fn test_number_cursor_one_left_of_number() {
-        let rope = Rope::from_str(" 100");
-        let range = Range::point(0);
-        assert_eq!(NumberIncrementor::from_range(rope.slice(..), range), None);
-    }
-
-    #[test]
-    fn test_increment_basic_decimal_numbers() {
-        let tests = [
-            ("100", 1, "101"),
-            ("100", -1, "99"),
-            ("99", 1, "100"),
-            ("100", 1000, "1100"),
-            ("100", -1000, "-900"),
-            ("-1", 1, "0"),
-            ("-1", 2, "1"),
-            ("1", -1, "0"),
-            ("1", -2, "-1"),
-        ];
-
-        for (original, amount, expected) in tests {
-            let rope = Rope::from_str(original);
-            let range = Range::point(0);
-            assert_eq!(
-                NumberIncrementor::from_range(rope.slice(..), range)
-                    .unwrap()
-                    .increment(amount)
-                    .1,
-                Tendril::from(expected)
-            );
-        }
-    }
-
-    #[test]
-    fn test_increment_basic_hexadecimal_numbers() {
-        let tests = [
-            ("0x0100", 1, "0x0101"),
-            ("0x0100", -1, "0x00ff"),
-            ("0x0001", -1, "0x0000"),
-            ("0x0000", -1, "0xffffffffffffffff"),
-            ("0xffffffffffffffff", 1, "0x0000000000000000"),
-            ("0xffffffffffffffff", 2, "0x0000000000000001"),
-            ("0xffffffffffffffff", -1, "0xfffffffffffffffe"),
-            ("0xABCDEF1234567890", 1, "0xABCDEF1234567891"),
-            ("0xabcdef1234567890", 1, "0xabcdef1234567891"),
-        ];
-
-        for (original, amount, expected) in tests {
-            let rope = Rope::from_str(original);
-            let range = Range::point(0);
-            assert_eq!(
-                NumberIncrementor::from_range(rope.slice(..), range)
-                    .unwrap()
-                    .increment(amount)
-                    .1,
-                Tendril::from(expected)
-            );
-        }
-    }
-
-    #[test]
-    fn test_increment_basic_octal_numbers() {
-        let tests = [
-            ("0o0107", 1, "0o0110"),
-            ("0o0110", -1, "0o0107"),
-            ("0o0001", -1, "0o0000"),
-            ("0o7777", 1, "0o10000"),
-            ("0o1000", -1, "0o0777"),
-            ("0o0107", 10, "0o0121"),
-            ("0o0000", -1, "0o1777777777777777777777"),
-            ("0o1777777777777777777777", 1, "0o0000000000000000000000"),
-            ("0o1777777777777777777777", 2, "0o0000000000000000000001"),
-            ("0o1777777777777777777777", -1, "0o1777777777777777777776"),
-        ];
-
-        for (original, amount, expected) in tests {
-            let rope = Rope::from_str(original);
-            let range = Range::point(0);
-            assert_eq!(
-                NumberIncrementor::from_range(rope.slice(..), range)
-                    .unwrap()
-                    .increment(amount)
-                    .1,
-                Tendril::from(expected)
-            );
-        }
-    }
-
-    #[test]
-    fn test_increment_basic_binary_numbers() {
-        let tests = [
-            ("0b00000100", 1, "0b00000101"),
-            ("0b00000100", -1, "0b00000011"),
-            ("0b00000100", 2, "0b00000110"),
-            ("0b00000100", -2, "0b00000010"),
-            ("0b00000001", -1, "0b00000000"),
-            ("0b00111111", 10, "0b01001001"),
-            ("0b11111111", 1, "0b100000000"),
-            ("0b10000000", -1, "0b01111111"),
-            (
-                "0b0000",
-                -1,
-                "0b1111111111111111111111111111111111111111111111111111111111111111",
-            ),
-            (
-                "0b1111111111111111111111111111111111111111111111111111111111111111",
-                1,
-                "0b0000000000000000000000000000000000000000000000000000000000000000",
-            ),
-            (
-                "0b1111111111111111111111111111111111111111111111111111111111111111",
-                2,
-                "0b0000000000000000000000000000000000000000000000000000000000000001",
-            ),
-            (
-                "0b1111111111111111111111111111111111111111111111111111111111111111",
-                -1,
-                "0b1111111111111111111111111111111111111111111111111111111111111110",
-            ),
-        ];
-
-        for (original, amount, expected) in tests {
-            let rope = Rope::from_str(original);
-            let range = Range::point(0);
-            assert_eq!(
-                NumberIncrementor::from_range(rope.slice(..), range)
-                    .unwrap()
-                    .increment(amount)
-                    .1,
-                Tendril::from(expected)
-            );
-        }
-    }
-
-    #[test]
-    fn test_increment_with_separators() {
-        let tests = [
-            ("999_999", 1, "1_000_000"),
-            ("1_000_000", -1, "999_999"),
-            ("-999_999", -1, "-1_000_000"),
-            ("0x0000_0000_0001", 0x1_ffff_0000, "0x0001_ffff_0001"),
-            ("0x0000_0000_0001", 0x1_ffff_0000, "0x0001_ffff_0001"),
-            ("0x0000_0000_0001", 0x1_ffff_0000, "0x0001_ffff_0001"),
-            ("0x0000_0000", -1, "0xffff_ffff_ffff_ffff"),
-            ("0x0000_0000_0000", -1, "0xffff_ffff_ffff_ffff"),
-            ("0b01111111_11111111", 1, "0b10000000_00000000"),
-            ("0b11111111_11111111", 1, "0b1_00000000_00000000"),
-        ];
-
-        for (original, amount, expected) in tests {
-            let rope = Rope::from_str(original);
-            let range = Range::point(0);
-            assert_eq!(
-                NumberIncrementor::from_range(rope.slice(..), range)
-                    .unwrap()
-                    .increment(amount)
-                    .1,
-                Tendril::from(expected)
-            );
-        }
-    }
-}
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 09c2e5df..e196e71e 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -11,9 +11,7 @@ pub use typed::*;
 use helix_core::{
     comment, coords_at_pos, encoding, find_first_non_whitespace_char, find_root, graphemes,
     history::UndoKind,
-    increment::date_time::DateTimeIncrementor,
-    increment::{number::NumberIncrementor, Increment},
-    indent,
+    increment, indent,
     indent::IndentStyle,
     line_ending::{get_line_ending_of_str, line_end_char_index, str_is_line_ending},
     match_brackets,
@@ -5028,57 +5026,25 @@ enum IncrementDirection {
     Increase,
     Decrease,
 }
-/// Increment object under cursor by count.
+
+/// Increment objects within selections by count.
 fn increment(cx: &mut Context) {
     increment_impl(cx, IncrementDirection::Increase);
 }
 
-/// Decrement object under cursor by count.
+/// Decrement objects within selections by count.
 fn decrement(cx: &mut Context) {
     increment_impl(cx, IncrementDirection::Decrease);
 }
 
-/// This function differs from find_next_char_impl in that it stops searching at the newline, but also
-/// starts searching at the current character, instead of the next.
-/// It does not want to start at the next character because this function is used for incrementing
-/// number and we don't want to move forward if we're already on a digit.
-fn find_next_char_until_newline<M: CharMatcher>(
-    text: RopeSlice,
-    char_matcher: M,
-    pos: usize,
-    _count: usize,
-    _inclusive: bool,
-) -> Option<usize> {
-    // Since we send the current line to find_nth_next instead of the whole text, we need to adjust
-    // the position we send to this function so that it's relative to that line and its returned
-    // position since it's expected this function returns a global position.
-    let line_index = text.char_to_line(pos);
-    let pos_delta = text.line_to_char(line_index);
-    let pos = pos - pos_delta;
-    search::find_nth_next(text.line(line_index), char_matcher, pos, 1).map(|pos| pos + pos_delta)
-}
-
-/// Decrement object under cursor by `amount`.
+/// Increment objects within selections by `amount`.
+/// A negative `amount` will decrement objects within selections.
 fn increment_impl(cx: &mut Context, increment_direction: IncrementDirection) {
-    // TODO: when incrementing or decrementing a number that gets a new digit or lose one, the
-    // selection is updated improperly.
-    find_char_impl(
-        cx.editor,
-        &find_next_char_until_newline,
-        true,
-        true,
-        char::is_ascii_digit,
-        1,
-    );
-
-    // Increase by 1 if `IncrementDirection` is `Increase`
-    // Decrease by 1 if `IncrementDirection` is `Decrease`
     let sign = match increment_direction {
         IncrementDirection::Increase => 1,
         IncrementDirection::Decrease => -1,
     };
     let mut amount = sign * cx.count() as i64;
-
     // If the register is `#` then increase or decrease the `amount` by 1 per element
     let increase_by = if cx.register == Some('#') { sign } else { 0 };
 
@@ -5086,55 +5052,40 @@ fn increment_impl(cx: &mut Context, increment_direction: IncrementDirection) {
     let selection = doc.selection(view.id);
     let text = doc.text().slice(..);
 
-    let changes: Vec<_> = selection
-        .ranges()
-        .iter()
-        .filter_map(|range| {
-            let incrementor: Box<dyn Increment> =
-                if let Some(incrementor) = DateTimeIncrementor::from_range(text, *range) {
-                    Box::new(incrementor)
-                } else if let Some(incrementor) = NumberIncrementor::from_range(text, *range) {
-                    Box::new(incrementor)
-                } else {
-                    return None;
-                };
+    let mut new_selection_ranges = SmallVec::new();
+    let mut cumulative_length_diff: i128 = 0;
+    let mut changes = vec![];
 
-            let (range, new_text) = incrementor.increment(amount);
+    for range in selection {
+        let selected_text: Cow<str> = range.fragment(text);
+        let new_from = ((range.from() as i128) + cumulative_length_diff) as usize;
+        let incremented = [increment::integer, increment::date_time]
+            .iter()
+            .find_map(|incrementor| incrementor(selected_text.as_ref(), amount));
 
-            amount += increase_by;
+        amount += increase_by;
 
-            Some((range.from(), range.to(), Some(new_text)))
-        })
-        .collect();
-
-    // Overlapping changes in a transaction will panic, so we need to find and remove them.
-    // For example, if there are cursors on each of the year, month, and day of `2021-11-29`,
-    // incrementing will give overlapping changes, with each change incrementing a different part of
-    // the date. Since these conflict with each other we remove these changes from the transaction
-    // so nothing happens.
-    let mut overlapping_indexes = HashSet::new();
-    for (i, changes) in changes.windows(2).enumerate() {
-        if changes[0].1 > changes[1].0 {
-            overlapping_indexes.insert(i);
-            overlapping_indexes.insert(i + 1);
+        match incremented {
+            None => {
+                let new_range = Range::new(
+                    new_from,
+                    (range.to() as i128 + cumulative_length_diff) as usize,
+                );
+                new_selection_ranges.push(new_range);
+            }
+            Some(new_text) => {
+                let new_range = Range::new(new_from, new_from + new_text.len());
+                cumulative_length_diff += new_text.len() as i128 - selected_text.len() as i128;
+                new_selection_ranges.push(new_range);
+                changes.push((range.from(), range.to(), Some(new_text.into())));
+            }
         }
     }
-    let changes: Vec<_> = changes
-        .into_iter()
-        .enumerate()
-        .filter_map(|(i, change)| {
-            if overlapping_indexes.contains(&i) {
-                None
-            } else {
-                Some(change)
-            }
-        })
-        .collect();
 
     if !changes.is_empty() {
+        let new_selection = Selection::new(new_selection_ranges, selection.primary_index());
         let transaction = Transaction::change(doc.text(), changes.into_iter());
-        let transaction = transaction.with_selection(selection.clone());
-
+        let transaction = transaction.with_selection(new_selection);
         apply_transaction(&transaction, doc, view);
     }
 }

From 3cf5216dbd1b9c767e6a922f93f1a3b1a2955d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= <nikodem@rabulinski.com>
Date: Mon, 16 Jan 2023 17:41:22 +0100
Subject: [PATCH 749/884] Commit to history after executing a command from the
 palette (#5294)

---
 helix-term/src/commands.rs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index e196e71e..7df53a48 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2504,7 +2504,22 @@ pub fn command_palette(cx: &mut Context) {
                     on_next_key_callback: None,
                     jobs: cx.jobs,
                 };
+                let focus = view!(ctx.editor).id;
+
                 command.execute(&mut ctx);
+
+                if ctx.editor.tree.contains(focus) {
+                    let config = ctx.editor.config();
+                    let mode = ctx.editor.mode();
+                    let view = view_mut!(ctx.editor, focus);
+                    let doc = doc_mut!(ctx.editor, &view.doc);
+
+                    view.ensure_cursor_in_view(doc, config.scrolloff);
+
+                    if mode != Mode::Insert {
+                        doc.append_changes_to_history(view);
+                    }
+                }
             });
             compositor.push(Box::new(overlayed(picker)));
         },

From 6d34faf4fb4b28365d3e2f93e032b4eea04912c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Jan 2023 10:05:34 +0900
Subject: [PATCH 750/884] build(deps): bump libc from 0.2.137 to 0.2.139
 (#5558)

Bumps [libc](https://github.com/rust-lang/libc) from 0.2.137 to 0.2.139.
- [Release notes](https://github.com/rust-lang/libc/releases)
- [Commits](https://github.com/rust-lang/libc/compare/0.2.137...0.2.139)

---
updated-dependencies:
- dependency-name: libc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ede4ae0d..02c63d28 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1427,9 +1427,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.137"
+version = "0.2.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
 
 [[package]]
 name = "libloading"

From 6317e0a7159bf124cb23e04b49dc29964cbe79a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Jan 2023 10:07:09 +0900
Subject: [PATCH 751/884] build(deps): bump hashbrown from 0.13.1 to 0.13.2
 (#5559)

Bumps [hashbrown](https://github.com/rust-lang/hashbrown) from 0.13.1 to 0.13.2.
- [Release notes](https://github.com/rust-lang/hashbrown/releases)
- [Changelog](https://github.com/rust-lang/hashbrown/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/hashbrown/compare/v0.13.1...v0.13.2)

---
updated-dependencies:
- dependency-name: hashbrown
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 8 ++++----
 helix-core/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 02c63d28..665eb4b9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -728,7 +728,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c52b625ad8cc360a0b7f426266f21fb07bd49b8f4ccf1b3ca7bc89424db1dec4"
 dependencies = [
  "git-hash",
- "hashbrown 0.13.1",
+ "hashbrown 0.13.2",
 ]
 
 [[package]]
@@ -1104,9 +1104,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038"
+checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 dependencies = [
  "ahash 0.8.2",
 ]
@@ -1121,7 +1121,7 @@ dependencies = [
  "chrono",
  "encoding_rs",
  "etcetera",
- "hashbrown 0.13.1",
+ "hashbrown 0.13.2",
  "helix-loader",
  "imara-diff",
  "log",
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index ca6cd51e..73e64cfd 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -31,7 +31,7 @@ arc-swap = "1"
 regex = "1"
 bitflags = "1.3"
 ahash = "0.8.2"
-hashbrown = { version = "0.13.1", features = ["raw"] }
+hashbrown = { version = "0.13.2", features = ["raw"] }
 
 log = "0.4"
 serde = { version = "1.0", features = ["derive"] }

From a02dd17e8214125481a89f7aaa414f0c2285b3be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Delafargue?= <clement@delafargue.name>
Date: Tue, 17 Jan 2023 09:17:22 +0100
Subject: [PATCH 752/884] doc: make the order of unimpaired mappings consistent

Most mappings are next `]` then previous `[`, except for a few ones.

Fixes #5145
---
 book/src/keymap.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index b38a1f44..92455911 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -305,10 +305,10 @@ Mappings in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaire
 
 | Key      | Description                                  | Command               |
 | -----    | -----------                                  | -------               |
-| `[d`     | Go to previous diagnostic (**LSP**)          | `goto_prev_diag`      |
 | `]d`     | Go to next diagnostic (**LSP**)              | `goto_next_diag`      |
-| `[D`     | Go to first diagnostic in document (**LSP**) | `goto_first_diag`     |
+| `[d`     | Go to previous diagnostic (**LSP**)          | `goto_prev_diag`      |
 | `]D`     | Go to last diagnostic in document (**LSP**)  | `goto_last_diag`      |
+| `[D`     | Go to first diagnostic in document (**LSP**) | `goto_first_diag`     |
 | `]f`     | Go to next function (**TS**)                 | `goto_next_function`  |
 | `[f`     | Go to previous function (**TS**)             | `goto_prev_function`  |
 | `]t`     | Go to next type definition (**TS**)          | `goto_next_class`     |
@@ -323,10 +323,10 @@ Mappings in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaire
 | `[p`     | Go to previous paragraph                     | `goto_prev_paragraph` |
 | `]g`     | Go to next change                            | `goto_next_change`    |
 | `[g`     | Go to previous change                        | `goto_prev_change`    |
-| `[G`     | Go to first change                           | `goto_first_change`   |
 | `]G`     | Go to last change                            | `goto_last_change`    |
-| `[Space` | Add newline above                            | `add_newline_above`   |
+| `[G`     | Go to first change                           | `goto_first_change`   |
 | `]Space` | Add newline below                            | `add_newline_below`   |
+| `[Space` | Add newline above                            | `add_newline_above`   |
 
 ## Insert mode
 

From 9530fab4b6f320d212f966e46a0353931a010471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Delafargue?= <clement@delafargue.name>
Date: Tue, 17 Jan 2023 09:48:43 +0100
Subject: [PATCH 753/884] doc: expand documentation on configuring minor modes

Fixes #3835, #4811
---
 book/src/keymap.md    |  3 +++
 book/src/remapping.md | 27 +++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 92455911..0550e57f 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -166,6 +166,9 @@ These sub-modes are accessible from normal mode and typically switch back to nor
 | `Ctrl-w` | Enter [window mode](#window-mode)                  | N/A            |
 | `Space`  | Enter [space mode](#space-mode)                    | N/A            |
 
+These modes (except command mode) can be configured by
+[remapping keys](https://docs.helix-editor.com/remapping.html#minor-modes).
+
 #### View mode
 
 Accessed by typing `z` in [normal mode](#normal-mode).
diff --git a/book/src/remapping.md b/book/src/remapping.md
index 2eac8846..8339e05f 100644
--- a/book/src/remapping.md
+++ b/book/src/remapping.md
@@ -25,8 +25,31 @@ j = { k = "normal_mode" } # Maps `jk` to exit insert mode
 ```
 > NOTE: Typable commands can also be remapped, remember to keep the `:` prefix to indicate it's a typable command.
 
-> NOTE: Bindings can be nested, to create (or edit) minor modes: `g = { a = "code_action"}` adds a new entry to
-> the `goto` mode.
+## Minor modes
+
+Minor modes are accessed by pressing a key (usually from normal mode), giving access to dedicated bindings. Bindings
+can be modified or added by nesting definitions.
+
+```toml
+[keys.insert.j]
+k = "normal_mode" # Maps `jk` to exit insert mode
+
+[keys.normal.g]
+a = "code_action" # Maps `ga` to show possible code actions
+
+# invert `j` and `k` in view mode
+[keys.normal.z]
+j = "scroll_up"
+k = "scroll_down"
+
+# create a new minor mode bound to `+`
+[keys.normal."+"]
+m = ":run-shell-command make"
+c = ":run-shell-command cargo build"
+t = ":run-shell-command cargo test"
+```
+
+## Special keys and modifiers
 
 Ctrl, Shift and Alt modifiers are encoded respectively with the prefixes
 `C-`, `S-` and `A-`. Special keys are encoded as follows:

From e7e47fd54263fb46f2dbb6fe8954fa489d143752 Mon Sep 17 00:00:00 2001
From: mejo13 <36098293+mejo13@users.noreply.github.com>
Date: Tue, 17 Jan 2023 23:15:21 +0100
Subject: [PATCH 754/884] Add command to rotate view backward (#5356)

---
 helix-term/src/commands.rs | 5 +++++
 helix-view/src/editor.rs   | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 7df53a48..15e4b47b 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -384,6 +384,7 @@ impl MappableCommand {
         swap_view_down, "Swap with split below",
         transpose_view, "Transpose splits",
         rotate_view, "Goto next window",
+        rotate_view_reverse, "Goto previous window",
         hsplit, "Horizontal bottom split",
         hsplit_new, "Horizontal bottom split scratch buffer",
         vsplit, "Vertical right split",
@@ -4317,6 +4318,10 @@ fn rotate_view(cx: &mut Context) {
     cx.editor.focus_next()
 }
 
+fn rotate_view_reverse(cx: &mut Context) {
+    cx.editor.focus_prev()
+}
+
 fn jump_view_right(cx: &mut Context) {
     cx.editor.focus_direction(tree::Direction::Right)
 }
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 547a4ffb..4a44a00c 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1285,6 +1285,10 @@ impl Editor {
         self.focus(self.tree.next());
     }
 
+    pub fn focus_prev(&mut self) {
+        self.focus(self.tree.prev());
+    }
+
     pub fn focus_direction(&mut self, direction: tree::Direction) {
         let current_view = self.tree.focus;
         if let Some(id) = self.tree.find_split_in_direction(current_view, direction) {

From b65f104a3fe1d8bdd0dbf901f7c52576b2b5f1c0 Mon Sep 17 00:00:00 2001
From: Josh Bainbridge <josh.bainbridge@gmail.com>
Date: Tue, 17 Jan 2023 22:16:05 +0000
Subject: [PATCH 755/884] Fix diagnostic indicator background for gruvbox
 themes (#5540)

The diagnostic indicator background did not match the column or rows background
colour as this was context specific, and the background for the indicator was
being explicitly set.

This commit removes the explicit value for the indicators background allowing
it to adapt to the context. This is aligns it with other themes, and resolves
the issue.
---
 runtime/themes/gruvbox.toml           | 8 ++++----
 runtime/themes/gruvbox_dark_hard.toml | 8 ++++----
 runtime/themes/gruvbox_light.toml     | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml
index 5d897201..c293fc3e 100644
--- a/runtime/themes/gruvbox.toml
+++ b/runtime/themes/gruvbox.toml
@@ -33,10 +33,10 @@
 "diff.delta" = "orange1"
 "diff.minus" = "red1"
 
-"warning" = { fg = "orange1", bg = "bg1" }
-"error" = { fg = "red1", bg = "bg1" }
-"info" = { fg = "aqua1", bg = "bg1" }
-"hint" = { fg = "blue1", bg = "bg1" }
+"warning" = "orange1"
+"error" = "red1"
+"info" = "aqua1"
+"hint" = "blue1"
 
 "ui.background" = { bg = "bg0" }
 "ui.linenr" = { fg = "bg4" }
diff --git a/runtime/themes/gruvbox_dark_hard.toml b/runtime/themes/gruvbox_dark_hard.toml
index a1a83e65..f39cd906 100644
--- a/runtime/themes/gruvbox_dark_hard.toml
+++ b/runtime/themes/gruvbox_dark_hard.toml
@@ -34,10 +34,10 @@
 "diff.delta" = "orange1"
 "diff.minus" = "red1"
 
-"warning" = { fg = "orange1", bg = "bg1" }
-"error" = { fg = "red1", bg = "bg1" }
-"info" = { fg = "aqua1", bg = "bg1" }
-"hint" = { fg = "blue1", bg = "bg1" }
+"warning" = "orange1"
+"error" = "red1"
+"info" = "aqua1"
+"hint" = "blue1"
 
 "diagnostic.error" = { underline = { style = "curl", color = "red0" } }
 "diagnostic.warning" = { underline = { style = "curl", color = "orange1" } }
diff --git a/runtime/themes/gruvbox_light.toml b/runtime/themes/gruvbox_light.toml
index 7c1c765d..8ea9d625 100644
--- a/runtime/themes/gruvbox_light.toml
+++ b/runtime/themes/gruvbox_light.toml
@@ -34,10 +34,10 @@
 "diff.delta" = "orange1"
 "diff.minus" = "red1"
 
-"warning" = { fg = "orange1", bg = "bg1" }
-"error" = { fg = "red1", bg = "bg1" }
-"info" = { fg = "aqua1", bg = "bg1" }
-"hint" = { fg = "blue1", bg = "bg1" }
+"warning" = "orange1"
+"error" = "red1"
+"info" = "aqua1"
+"hint" = "blue1"
 
 "ui.background" = { bg = "bg0" }
 "ui.linenr" = { fg = "bg4" }

From deae13f404fadddf16f7c2005af8b383a1d8e362 Mon Sep 17 00:00:00 2001
From: gibbz00 <gabrielhansson00@gmail.com>
Date: Wed, 18 Jan 2023 06:18:49 +0100
Subject: [PATCH 756/884] Primary cursor colors by mode (#5130)

* (theme) feat: mode based primary cursor colors

* docs/themes: mode based primary cursor colors
---
 book/src/themes.md          |  4 ++++
 helix-term/src/ui/editor.rs | 20 +++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/book/src/themes.md b/book/src/themes.md
index 015ec59b..0d0827fd 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -252,10 +252,14 @@ These scopes are used for theming the editor interface.
 | `ui.background`             |                                                                                                |
 | `ui.background.separator`   | Picker separator below input line                                                              |
 | `ui.cursor`                 |                                                                                                |
+| `ui.cursor.normal`          |                                                                                                |
 | `ui.cursor.insert`          |                                                                                                |
 | `ui.cursor.select`          |                                                                                                |
 | `ui.cursor.match`           | Matching bracket etc.                                                                          |
 | `ui.cursor.primary`         | Cursor with primary selection                                                                  |
+| `ui.cursor.primary.normal`  |                                                                                                |
+| `ui.cursor.primary.insert`  |                                                                                                |
+| `ui.cursor.primary.select`  |                                                                                                |
 | `ui.gutter`                 | Gutter                                                                                         |
 | `ui.gutter.selected`        | Gutter for the line the cursor is on                                                           |
 | `ui.linenr`                 | Line numbers                                                                                   |
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 35cf77ab..a19eb213 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -342,23 +342,29 @@ impl EditorView {
         let selection_scope = theme
             .find_scope_index("ui.selection")
             .expect("could not find `ui.selection` scope in the theme!");
+        let primary_selection_scope = theme
+            .find_scope_index("ui.selection.primary")
+            .unwrap_or(selection_scope);
         let base_cursor_scope = theme
             .find_scope_index("ui.cursor")
             .unwrap_or(selection_scope);
+        let base_primary_cursor_scope = theme
+            .find_scope_index("ui.cursor.primary")
+            .unwrap_or(base_cursor_scope);
 
         let cursor_scope = match mode {
             Mode::Insert => theme.find_scope_index("ui.cursor.insert"),
             Mode::Select => theme.find_scope_index("ui.cursor.select"),
-            Mode::Normal => Some(base_cursor_scope),
+            Mode::Normal => theme.find_scope_index("ui.cursor.normal"),
         }
         .unwrap_or(base_cursor_scope);
 
-        let primary_cursor_scope = theme
-            .find_scope_index("ui.cursor.primary")
-            .unwrap_or(cursor_scope);
-        let primary_selection_scope = theme
-            .find_scope_index("ui.selection.primary")
-            .unwrap_or(selection_scope);
+        let primary_cursor_scope = match mode {
+            Mode::Insert => theme.find_scope_index("ui.cursor.primary.insert"),
+            Mode::Select => theme.find_scope_index("ui.cursor.primary.select"),
+            Mode::Normal => theme.find_scope_index("ui.cursor.primary.normal"),
+        }
+        .unwrap_or(base_primary_cursor_scope);
 
         let mut spans: Vec<(usize, std::ops::Range<usize>)> = Vec::new();
         for (i, range) in selection.iter().enumerate() {

From 9aafcb2b9a743f0f6afa722184e96b8a672064ea Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Sat, 9 Jul 2022 00:16:09 +0530
Subject: [PATCH 757/884] Reuse table in picker

---
 helix-term/src/ui/picker.rs    | 182 ++++++++++++++++++++++++---------
 helix-tui/src/text.rs          |  13 +++
 helix-tui/src/widgets/table.rs |  14 ++-
 3 files changed, 155 insertions(+), 54 deletions(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index eb935e56..e2e72b6e 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -7,7 +7,9 @@ use crate::{
 use futures_util::future::BoxFuture;
 use tui::{
     buffer::Buffer as Surface,
-    widgets::{Block, BorderType, Borders},
+    layout::Constraint,
+    text::{Span, Spans},
+    widgets::{Block, BorderType, Borders, Cell, Table},
 };
 
 use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
@@ -20,10 +22,11 @@ use std::{
 use std::{collections::HashMap, io::Read, path::PathBuf};
 
 use crate::ui::{Prompt, PromptEvent};
-use helix_core::{movement::Direction, Position};
+use helix_core::{movement::Direction, unicode::segmentation::UnicodeSegmentation, Position};
 use helix_view::{
     editor::Action,
     graphics::{CursorKind, Margin, Modifier, Rect},
+    theme::Style,
     Document, DocumentId, Editor,
 };
 
@@ -389,6 +392,8 @@ pub struct Picker<T: Item> {
     pub truncate_start: bool,
     /// Whether to show the preview panel (default true)
     show_preview: bool,
+    /// Constraints for tabular formatting
+    widths: Vec<Constraint>,
 
     callback_fn: Box<dyn Fn(&mut Context, &T, Action)>,
 }
@@ -406,6 +411,26 @@ impl<T: Item> Picker<T> {
             |_editor: &mut Context, _pattern: &str, _event: PromptEvent| {},
         );
 
+        let n = options
+            .first()
+            .map(|option| option.row(&editor_data).cells.len())
+            .unwrap_or_default();
+        let max_lens = options.iter().fold(vec![0; n], |mut acc, option| {
+            let row = option.row(&editor_data);
+            // maintain max for each column
+            for (acc, cell) in acc.iter_mut().zip(row.cells.iter()) {
+                let width = cell.content.width();
+                if width > *acc {
+                    *acc = width;
+                }
+            }
+            acc
+        });
+        let widths = max_lens
+            .into_iter()
+            .map(|len| Constraint::Length(len as u16))
+            .collect();
+
         let mut picker = Self {
             options,
             editor_data,
@@ -418,6 +443,7 @@ impl<T: Item> Picker<T> {
             show_preview: true,
             callback_fn: Box::new(callback_fn),
             completion_height: 0,
+            widths,
         };
 
         // scoring on empty input:
@@ -437,8 +463,6 @@ impl<T: Item> Picker<T> {
     }
 
     pub fn score(&mut self) {
-        let now = Instant::now();
-
         let pattern = self.prompt.line();
 
         if pattern == &self.previous_pattern {
@@ -480,8 +504,6 @@ impl<T: Item> Picker<T> {
             self.force_score();
         }
 
-        log::debug!("picker score {:?}", Instant::now().duration_since(now));
-
         // reset cursor position
         self.cursor = 0;
         let pattern = self.prompt.line();
@@ -657,7 +679,7 @@ impl<T: Item + 'static> Component for Picker<T> {
     fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
         let text_style = cx.editor.theme.get("ui.text");
         let selected = cx.editor.theme.get("ui.text.focus");
-        let highlighted = cx.editor.theme.get("special").add_modifier(Modifier::BOLD);
+        let highlight_style = cx.editor.theme.get("special").add_modifier(Modifier::BOLD);
 
         // -- Render the frame:
         // clear area
@@ -697,61 +719,119 @@ impl<T: Item + 'static> Component for Picker<T> {
         }
 
         // -- Render the contents:
-        // subtract area of prompt from top and current item marker " > " from left
-        let inner = inner.clip_top(2).clip_left(3);
+        // subtract area of prompt from top
+        let inner = inner.clip_top(2);
 
         let rows = inner.height;
         let offset = self.cursor - (self.cursor % std::cmp::max(1, rows as usize));
+        let cursor = self.cursor.saturating_sub(offset);
 
-        let files = self
+        let options = self
             .matches
             .iter()
             .skip(offset)
-            .map(|pmatch| (pmatch.index, self.options.get(pmatch.index).unwrap()));
-
-        for (i, (_index, option)) in files.take(rows as usize).enumerate() {
-            let is_active = i == (self.cursor - offset);
-            if is_active {
-                surface.set_string(
-                    inner.x.saturating_sub(3),
-                    inner.y + i as u16,
-                    " > ",
-                    selected,
-                );
-                surface.set_style(
-                    Rect::new(inner.x, inner.y + i as u16, inner.width, 1),
-                    selected,
-                );
-            }
+            .take(rows as usize)
+            .map(|pmatch| &self.options[pmatch.index])
+            .map(|option| option.row(&self.editor_data))
+            .map(|mut row| {
+                const TEMP_CELL_SEP: &str = " ";
+
+                let line = row.cell_text().join(TEMP_CELL_SEP);
+
+                // Items are filtered by using the text returned by menu::Item::filter_text
+                // but we do highlighting here using the text in Row and therefore there
+                // might be inconsistencies. This is the best we can do since only the
+                // text in Row is displayed to the end user.
+                let (_score, highlights) = FuzzyQuery::new(self.prompt.line())
+                    .fuzzy_indicies(&line, &self.matcher)
+                    .unwrap_or_default();
+
+                let highlight_byte_ranges: Vec<_> = line
+                    .char_indices()
+                    .enumerate()
+                    .filter_map(|(char_idx, (byte_offset, ch))| {
+                        highlights
+                            .contains(&char_idx)
+                            .then(|| byte_offset..byte_offset + ch.len_utf8())
+                    })
+                    .collect();
+
+                // The starting byte index of the current (iterating) cell
+                let mut cell_start_byte_offset = 0;
+                for cell in row.cells.iter_mut() {
+                    let spans = match cell.content.lines.get(0) {
+                        Some(s) => s,
+                        None => continue,
+                    };
+
+                    let mut cell_len = 0;
 
-            let spans = option.label(&self.editor_data);
-            let (_score, highlights) = FuzzyQuery::new(self.prompt.line())
-                .fuzzy_indicies(&String::from(&spans), &self.matcher)
-                .unwrap_or_default();
-
-            spans.0.into_iter().fold(inner, |pos, span| {
-                let new_x = surface
-                    .set_string_truncated(
-                        pos.x,
-                        pos.y + i as u16,
-                        &span.content,
-                        pos.width as usize,
-                        |idx| {
-                            if highlights.contains(&idx) {
-                                highlighted.patch(span.style)
-                            } else if is_active {
-                                selected.patch(span.style)
+                    let graphemes_with_style: Vec<_> = spans
+                        .0
+                        .iter()
+                        .flat_map(|span| {
+                            span.content
+                                .grapheme_indices(true)
+                                .zip(std::iter::repeat(span.style))
+                        })
+                        .map(|((grapheme_byte_offset, grapheme), style)| {
+                            cell_len += grapheme.len();
+                            let start = cell_start_byte_offset;
+
+                            let grapheme_byte_range =
+                                grapheme_byte_offset..grapheme_byte_offset + grapheme.len();
+
+                            if highlight_byte_ranges.iter().any(|hl_rng| {
+                                hl_rng.start >= start + grapheme_byte_range.start
+                                    && hl_rng.end <= start + grapheme_byte_range.end
+                            }) {
+                                (grapheme, style.patch(highlight_style))
                             } else {
-                                text_style.patch(span.style)
+                                (grapheme, style)
                             }
-                        },
-                        true,
-                        self.truncate_start,
-                    )
-                    .0;
-                pos.clip_left(new_x - pos.x)
+                        })
+                        .collect();
+
+                    let mut span_list: Vec<(String, Style)> = Vec::new();
+                    for (grapheme, style) in graphemes_with_style {
+                        if span_list.last().map(|(_, sty)| sty) == Some(&style) {
+                            let (string, _) = span_list.last_mut().unwrap();
+                            string.push_str(grapheme);
+                        } else {
+                            span_list.push((String::from(grapheme), style))
+                        }
+                    }
+
+                    let spans: Vec<Span> = span_list
+                        .into_iter()
+                        .map(|(string, style)| Span::styled(string, style))
+                        .collect();
+                    let spans: Spans = spans.into();
+                    *cell = Cell::from(spans);
+
+                    cell_start_byte_offset += cell_len + TEMP_CELL_SEP.len();
+                }
+
+                row
             });
-        }
+
+        let table = Table::new(options)
+            .style(text_style)
+            .highlight_style(selected)
+            .highlight_symbol(" > ")
+            .column_spacing(1)
+            .widths(&self.widths);
+
+        use tui::widgets::TableState;
+
+        table.render_table(
+            inner,
+            surface,
+            &mut TableState {
+                offset: 0,
+                selected: Some(cursor),
+            },
+        );
     }
 
     fn cursor(&self, area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {
diff --git a/helix-tui/src/text.rs b/helix-tui/src/text.rs
index ccdafad5..6970634b 100644
--- a/helix-tui/src/text.rs
+++ b/helix-tui/src/text.rs
@@ -436,6 +436,19 @@ impl<'a> From<Vec<Spans<'a>>> for Text<'a> {
     }
 }
 
+impl<'a> From<Text<'a>> for String {
+    fn from(text: Text<'a>) -> String {
+        let lines: Vec<String> = text.lines.iter().map(String::from).collect();
+        lines.join("\n")
+    }
+}
+
+impl<'a> From<&Text<'a>> for String {
+    fn from(text: &Text<'a>) -> String {
+        let lines: Vec<String> = text.lines.iter().map(String::from).collect();
+        lines.join("\n")
+    }
+}
 impl<'a> IntoIterator for Text<'a> {
     type Item = Spans<'a>;
     type IntoIter = std::vec::IntoIter<Self::Item>;
diff --git a/helix-tui/src/widgets/table.rs b/helix-tui/src/widgets/table.rs
index a8f428a7..26860e5c 100644
--- a/helix-tui/src/widgets/table.rs
+++ b/helix-tui/src/widgets/table.rs
@@ -126,6 +126,14 @@ impl<'a> Row<'a> {
     fn total_height(&self) -> u16 {
         self.height.saturating_add(self.bottom_margin)
     }
+
+    /// Returns the contents of cells as plain text, without styles and colors.
+    pub fn cell_text(&self) -> Vec<String> {
+        self.cells
+            .iter()
+            .map(|cell| String::from(&cell.content))
+            .collect()
+    }
 }
 
 /// A widget to display data in formatted columns.
@@ -477,6 +485,9 @@ impl<'a> Table<'a> {
             };
             let mut col = table_row_start_col;
             for (width, cell) in columns_widths.iter().zip(table_row.cells.iter()) {
+                if is_selected {
+                    buf.set_style(table_row_area, self.highlight_style);
+                }
                 render_cell(
                     buf,
                     cell,
@@ -489,9 +500,6 @@ impl<'a> Table<'a> {
                 );
                 col += *width + self.column_spacing;
             }
-            if is_selected {
-                buf.set_style(table_row_area, self.highlight_style);
-            }
         }
     }
 }

From 7a76c6cbbaf851d63cb4ca4be07c5d4c67afbbb2 Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Sun, 18 Dec 2022 18:12:25 +0530
Subject: [PATCH 758/884] Use upstream implementation of table column
 calculation

Changed in https://github.com/fdehau/tui-rs/commit/a68e38e59e6735c0a99139303b1609669d2c38da.
---
 helix-term/src/ui/picker.rs    |  5 +--
 helix-tui/src/widgets/table.rs | 81 ++++++++--------------------------
 2 files changed, 20 insertions(+), 66 deletions(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index e2e72b6e..e00fe1f8 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -15,10 +15,7 @@ use tui::{
 use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
 use tui::widgets::Widget;
 
-use std::{
-    cmp::{self, Ordering},
-    time::Instant,
-};
+use std::cmp::{self, Ordering};
 use std::{collections::HashMap, io::Read, path::PathBuf};
 
 use crate::ui::{Prompt, PromptEvent};
diff --git a/helix-tui/src/widgets/table.rs b/helix-tui/src/widgets/table.rs
index 26860e5c..539f6a61 100644
--- a/helix-tui/src/widgets/table.rs
+++ b/helix-tui/src/widgets/table.rs
@@ -4,14 +4,8 @@ use crate::{
     text::Text,
     widgets::{Block, Widget},
 };
-use cassowary::{
-    strength::{MEDIUM, REQUIRED, WEAK},
-    WeightedRelation::*,
-    {Expression, Solver},
-};
 use helix_core::unicode::width::UnicodeWidthStr;
 use helix_view::graphics::{Rect, Style};
-use std::collections::HashMap;
 
 /// A [`Cell`] contains the [`Text`] to be displayed in a [`Row`] of a [`Table`].
 ///
@@ -268,69 +262,32 @@ impl<'a> Table<'a> {
     }
 
     fn get_columns_widths(&self, max_width: u16, has_selection: bool) -> Vec<u16> {
-        let mut solver = Solver::new();
-        let mut var_indices = HashMap::new();
-        let mut ccs = Vec::new();
-        let mut variables = Vec::new();
-        for i in 0..self.widths.len() {
-            let var = cassowary::Variable::new();
-            variables.push(var);
-            var_indices.insert(var, i);
-        }
-        let spacing_width = (variables.len() as u16).saturating_sub(1) * self.column_spacing;
-        let mut available_width = max_width.saturating_sub(spacing_width);
+        let mut constraints = Vec::with_capacity(self.widths.len() * 2 + 1);
         if has_selection {
             let highlight_symbol_width =
                 self.highlight_symbol.map(|s| s.width() as u16).unwrap_or(0);
-            available_width = available_width.saturating_sub(highlight_symbol_width);
+            constraints.push(Constraint::Length(highlight_symbol_width));
         }
-        for (i, constraint) in self.widths.iter().enumerate() {
-            ccs.push(variables[i] | GE(WEAK) | 0.);
-            ccs.push(match *constraint {
-                Constraint::Length(v) => variables[i] | EQ(MEDIUM) | f64::from(v),
-                Constraint::Percentage(v) => {
-                    variables[i] | EQ(WEAK) | (f64::from(v * available_width) / 100.0)
-                }
-                Constraint::Ratio(n, d) => {
-                    variables[i]
-                        | EQ(WEAK)
-                        | (f64::from(available_width) * f64::from(n) / f64::from(d))
-                }
-                Constraint::Min(v) => variables[i] | GE(WEAK) | f64::from(v),
-                Constraint::Max(v) => variables[i] | LE(WEAK) | f64::from(v),
-            })
+        for constraint in self.widths {
+            constraints.push(*constraint);
+            constraints.push(Constraint::Length(self.column_spacing));
         }
-        solver
-            .add_constraint(
-                variables
-                    .iter()
-                    .fold(Expression::from_constant(0.), |acc, v| acc + *v)
-                    | LE(REQUIRED)
-                    | f64::from(available_width),
-            )
-            .unwrap();
-        solver.add_constraints(&ccs).unwrap();
-        let mut widths = vec![0; variables.len()];
-        for &(var, value) in solver.fetch_changes() {
-            let index = var_indices[&var];
-            let value = if value.is_sign_negative() {
-                0
-            } else {
-                value.round() as u16
-            };
-            widths[index] = value;
+        if !self.widths.is_empty() {
+            constraints.pop();
         }
-        // Cassowary could still return columns widths greater than the max width when there are
-        // fixed length constraints that cannot be satisfied. Therefore, we clamp the widths from
-        // left to right.
-        let mut available_width = max_width;
-        for w in &mut widths {
-            *w = available_width.min(*w);
-            available_width = available_width
-                .saturating_sub(*w)
-                .saturating_sub(self.column_spacing);
+        let mut chunks = crate::layout::Layout::default()
+            .direction(crate::layout::Direction::Horizontal)
+            .constraints(constraints)
+            .split(Rect {
+                x: 0,
+                y: 0,
+                width: max_width,
+                height: 1,
+            });
+        if has_selection {
+            chunks.remove(0);
         }
-        widths
+        chunks.iter().step_by(2).map(|c| c.width).collect()
     }
 
     fn get_row_bounds(

From b2837ff3bea286ce7ccfba9b6fbcd861977caf83 Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Sat, 24 Dec 2022 16:51:38 +0530
Subject: [PATCH 759/884] Minimize allocation when converting table rows to
 string

---
 helix-term/src/ui/picker.rs    |  6 +++++-
 helix-tui/src/text.rs          | 21 +++++++++++++++++----
 helix-tui/src/widgets/table.rs |  7 ++-----
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index e00fe1f8..05738ccf 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -733,7 +733,11 @@ impl<T: Item + 'static> Component for Picker<T> {
             .map(|mut row| {
                 const TEMP_CELL_SEP: &str = " ";
 
-                let line = row.cell_text().join(TEMP_CELL_SEP);
+                let line = row.cell_text().fold(String::new(), |mut s, frag| {
+                    s.push_str(&frag);
+                    s.push_str(TEMP_CELL_SEP);
+                    s
+                });
 
                 // Items are filtered by using the text returned by menu::Item::filter_text
                 // but we do highlighting here using the text in Row and therefore there
diff --git a/helix-tui/src/text.rs b/helix-tui/src/text.rs
index 6970634b..a3e242fe 100644
--- a/helix-tui/src/text.rs
+++ b/helix-tui/src/text.rs
@@ -438,17 +438,30 @@ impl<'a> From<Vec<Spans<'a>>> for Text<'a> {
 
 impl<'a> From<Text<'a>> for String {
     fn from(text: Text<'a>) -> String {
-        let lines: Vec<String> = text.lines.iter().map(String::from).collect();
-        lines.join("\n")
+        String::from(&text)
     }
 }
 
 impl<'a> From<&Text<'a>> for String {
     fn from(text: &Text<'a>) -> String {
-        let lines: Vec<String> = text.lines.iter().map(String::from).collect();
-        lines.join("\n")
+        let size = text
+            .lines
+            .iter()
+            .flat_map(|spans| spans.0.iter().map(|span| span.content.len()))
+            .sum::<usize>()
+            + text.lines.len().saturating_sub(1); // for newline after each line
+        let mut output = String::with_capacity(size);
+
+        for spans in &text.lines {
+            for span in &spans.0 {
+                output.push_str(&span.content);
+            }
+            output.push('\n');
+        }
+        output
     }
 }
+
 impl<'a> IntoIterator for Text<'a> {
     type Item = Spans<'a>;
     type IntoIter = std::vec::IntoIter<Self::Item>;
diff --git a/helix-tui/src/widgets/table.rs b/helix-tui/src/widgets/table.rs
index 539f6a61..2983072d 100644
--- a/helix-tui/src/widgets/table.rs
+++ b/helix-tui/src/widgets/table.rs
@@ -122,11 +122,8 @@ impl<'a> Row<'a> {
     }
 
     /// Returns the contents of cells as plain text, without styles and colors.
-    pub fn cell_text(&self) -> Vec<String> {
-        self.cells
-            .iter()
-            .map(|cell| String::from(&cell.content))
-            .collect()
+    pub fn cell_text(&self) -> impl Iterator<Item = String> + '_ {
+        self.cells.iter().map(|cell| String::from(&cell.content))
     }
 }
 

From 5c7db7aed54f52b3af6102517f81c9d70bb6d1fb Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Sun, 25 Dec 2022 11:24:09 +0530
Subject: [PATCH 760/884] Replace menu::Item::{row, label} with format()

---
 helix-term/src/commands.rs      | 10 +++++-----
 helix-term/src/commands/dap.rs  |  8 ++++----
 helix-term/src/commands/lsp.rs  | 16 ++++++++++------
 helix-term/src/ui/completion.rs |  7 +------
 helix-term/src/ui/menu.rs       | 22 ++++++++++------------
 helix-term/src/ui/picker.rs     |  6 +++---
 helix-tui/src/widgets/table.rs  |  6 ++++++
 7 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 15e4b47b..5b3ce68e 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -5,7 +5,7 @@ pub(crate) mod typed;
 pub use dap::*;
 use helix_vcs::Hunk;
 pub use lsp::*;
-use tui::text::Spans;
+use tui::widgets::Row;
 pub use typed::*;
 
 use helix_core::{
@@ -1864,7 +1864,7 @@ fn global_search(cx: &mut Context) {
     impl ui::menu::Item for FileResult {
         type Data = Option<PathBuf>;
 
-        fn label(&self, current_path: &Self::Data) -> Spans {
+        fn format(&self, current_path: &Self::Data) -> Row {
             let relative_path = helix_core::path::get_relative_path(&self.path)
                 .to_string_lossy()
                 .into_owned();
@@ -2312,7 +2312,7 @@ fn buffer_picker(cx: &mut Context) {
     impl ui::menu::Item for BufferMeta {
         type Data = ();
 
-        fn label(&self, _data: &Self::Data) -> Spans {
+        fn format(&self, _data: &Self::Data) -> Row {
             let path = self
                 .path
                 .as_deref()
@@ -2381,7 +2381,7 @@ fn jumplist_picker(cx: &mut Context) {
     impl ui::menu::Item for JumpMeta {
         type Data = ();
 
-        fn label(&self, _data: &Self::Data) -> Spans {
+        fn format(&self, _data: &Self::Data) -> Row {
             let path = self
                 .path
                 .as_deref()
@@ -2454,7 +2454,7 @@ fn jumplist_picker(cx: &mut Context) {
 impl ui::menu::Item for MappableCommand {
     type Data = ReverseKeymap;
 
-    fn label(&self, keymap: &Self::Data) -> Spans {
+    fn format(&self, keymap: &Self::Data) -> Row {
         let fmt_binding = |bindings: &Vec<Vec<KeyEvent>>| -> String {
             bindings.iter().fold(String::new(), |mut acc, bind| {
                 if !acc.is_empty() {
diff --git a/helix-term/src/commands/dap.rs b/helix-term/src/commands/dap.rs
index b182f28c..b3166e39 100644
--- a/helix-term/src/commands/dap.rs
+++ b/helix-term/src/commands/dap.rs
@@ -12,7 +12,7 @@ use helix_view::editor::Breakpoint;
 
 use serde_json::{to_value, Value};
 use tokio_stream::wrappers::UnboundedReceiverStream;
-use tui::text::Spans;
+use tui::{text::Spans, widgets::Row};
 
 use std::collections::HashMap;
 use std::future::Future;
@@ -25,7 +25,7 @@ use helix_view::handlers::dap::{breakpoints_changed, jump_to_stack_frame, select
 impl ui::menu::Item for StackFrame {
     type Data = ();
 
-    fn label(&self, _data: &Self::Data) -> Spans {
+    fn format(&self, _data: &Self::Data) -> Row {
         self.name.as_str().into() // TODO: include thread_states in the label
     }
 }
@@ -33,7 +33,7 @@ impl ui::menu::Item for StackFrame {
 impl ui::menu::Item for DebugTemplate {
     type Data = ();
 
-    fn label(&self, _data: &Self::Data) -> Spans {
+    fn format(&self, _data: &Self::Data) -> Row {
         self.name.as_str().into()
     }
 }
@@ -41,7 +41,7 @@ impl ui::menu::Item for DebugTemplate {
 impl ui::menu::Item for Thread {
     type Data = ThreadStates;
 
-    fn label(&self, thread_states: &Self::Data) -> Spans {
+    fn format(&self, thread_states: &Self::Data) -> Row {
         format!(
             "{} ({})",
             self.name,
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 86b0c5fa..90b6d76c 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -5,7 +5,10 @@ use helix_lsp::{
     util::{diagnostic_to_lsp_diagnostic, lsp_pos_to_pos, lsp_range_to_range, range_to_lsp_range},
     OffsetEncoding,
 };
-use tui::text::{Span, Spans};
+use tui::{
+    text::{Span, Spans},
+    widgets::Row,
+};
 
 use super::{align_view, push_jump, Align, Context, Editor, Open};
 
@@ -46,7 +49,7 @@ impl ui::menu::Item for lsp::Location {
     /// Current working directory.
     type Data = PathBuf;
 
-    fn label(&self, cwdir: &Self::Data) -> Spans {
+    fn format(&self, cwdir: &Self::Data) -> Row {
         // The preallocation here will overallocate a few characters since it will account for the
         // URL's scheme, which is not used most of the time since that scheme will be "file://".
         // Those extra chars will be used to avoid allocating when writing the line number (in the
@@ -80,7 +83,7 @@ impl ui::menu::Item for lsp::SymbolInformation {
     /// Path to currently focussed document
     type Data = Option<lsp::Url>;
 
-    fn label(&self, current_doc_path: &Self::Data) -> Spans {
+    fn format(&self, current_doc_path: &Self::Data) -> Row {
         if current_doc_path.as_ref() == Some(&self.location.uri) {
             self.name.as_str().into()
         } else {
@@ -110,7 +113,7 @@ struct PickerDiagnostic {
 impl ui::menu::Item for PickerDiagnostic {
     type Data = (DiagnosticStyles, DiagnosticsFormat);
 
-    fn label(&self, (styles, format): &Self::Data) -> Spans {
+    fn format(&self, (styles, format): &Self::Data) -> Row {
         let mut style = self
             .diag
             .severity
@@ -149,6 +152,7 @@ impl ui::menu::Item for PickerDiagnostic {
             Span::styled(&self.diag.message, style),
             Span::styled(code, style),
         ])
+        .into()
     }
 }
 
@@ -467,7 +471,7 @@ pub fn workspace_diagnostics_picker(cx: &mut Context) {
 
 impl ui::menu::Item for lsp::CodeActionOrCommand {
     type Data = ();
-    fn label(&self, _data: &Self::Data) -> Spans {
+    fn format(&self, _data: &Self::Data) -> Row {
         match self {
             lsp::CodeActionOrCommand::CodeAction(action) => action.title.as_str().into(),
             lsp::CodeActionOrCommand::Command(command) => command.title.as_str().into(),
@@ -662,7 +666,7 @@ pub fn code_action(cx: &mut Context) {
 
 impl ui::menu::Item for lsp::Command {
     type Data = ();
-    fn label(&self, _data: &Self::Data) -> Spans {
+    fn format(&self, _data: &Self::Data) -> Row {
         self.title.as_str().into()
     }
 }
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 11d7886a..824bafd8 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -1,7 +1,6 @@
 use crate::compositor::{Component, Context, Event, EventResult};
 use helix_view::{apply_transaction, editor::CompleteAction, ViewId};
 use tui::buffer::Buffer as Surface;
-use tui::text::Spans;
 
 use std::borrow::Cow;
 
@@ -33,11 +32,7 @@ impl menu::Item for CompletionItem {
             .into()
     }
 
-    fn label(&self, _data: &Self::Data) -> Spans {
-        self.label.as_str().into()
-    }
-
-    fn row(&self, _data: &Self::Data) -> menu::Row {
+    fn format(&self, _data: &Self::Data) -> menu::Row {
         menu::Row::new(vec![
             menu::Cell::from(self.label.as_str()),
             menu::Cell::from(match self.kind {
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index b9c1f9de..e92578c5 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -4,7 +4,7 @@ use crate::{
     compositor::{Callback, Component, Compositor, Context, Event, EventResult},
     ctrl, key, shift,
 };
-use tui::{buffer::Buffer as Surface, text::Spans, widgets::Table};
+use tui::{buffer::Buffer as Surface, widgets::Table};
 
 pub use tui::widgets::{Cell, Row};
 
@@ -18,28 +18,24 @@ pub trait Item {
     /// Additional editor state that is used for label calculation.
     type Data;
 
-    fn label(&self, data: &Self::Data) -> Spans;
+    fn format(&self, data: &Self::Data) -> Row;
 
     fn sort_text(&self, data: &Self::Data) -> Cow<str> {
-        let label: String = self.label(data).into();
+        let label: String = self.format(data).cell_text().collect();
         label.into()
     }
 
     fn filter_text(&self, data: &Self::Data) -> Cow<str> {
-        let label: String = self.label(data).into();
+        let label: String = self.format(data).cell_text().collect();
         label.into()
     }
-
-    fn row(&self, data: &Self::Data) -> Row {
-        Row::new(vec![Cell::from(self.label(data))])
-    }
 }
 
 impl Item for PathBuf {
     /// Root prefix to strip.
     type Data = PathBuf;
 
-    fn label(&self, root_path: &Self::Data) -> Spans {
+    fn format(&self, root_path: &Self::Data) -> Row {
         self.strip_prefix(root_path)
             .unwrap_or(self)
             .to_string_lossy()
@@ -144,10 +140,10 @@ impl<T: Item> Menu<T> {
         let n = self
             .options
             .first()
-            .map(|option| option.row(&self.editor_data).cells.len())
+            .map(|option| option.format(&self.editor_data).cells.len())
             .unwrap_or_default();
         let max_lens = self.options.iter().fold(vec![0; n], |mut acc, option| {
-            let row = option.row(&self.editor_data);
+            let row = option.format(&self.editor_data);
             // maintain max for each column
             for (acc, cell) in acc.iter_mut().zip(row.cells.iter()) {
                 let width = cell.content.width();
@@ -331,7 +327,9 @@ impl<T: Item + 'static> Component for Menu<T> {
             (a + b - 1) / b
         }
 
-        let rows = options.iter().map(|option| option.row(&self.editor_data));
+        let rows = options
+            .iter()
+            .map(|option| option.format(&self.editor_data));
         let table = Table::new(rows)
             .style(style)
             .highlight_style(selected)
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 05738ccf..ccf37eb2 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -410,10 +410,10 @@ impl<T: Item> Picker<T> {
 
         let n = options
             .first()
-            .map(|option| option.row(&editor_data).cells.len())
+            .map(|option| option.format(&editor_data).cells.len())
             .unwrap_or_default();
         let max_lens = options.iter().fold(vec![0; n], |mut acc, option| {
-            let row = option.row(&editor_data);
+            let row = option.format(&editor_data);
             // maintain max for each column
             for (acc, cell) in acc.iter_mut().zip(row.cells.iter()) {
                 let width = cell.content.width();
@@ -729,7 +729,7 @@ impl<T: Item + 'static> Component for Picker<T> {
             .skip(offset)
             .take(rows as usize)
             .map(|pmatch| &self.options[pmatch.index])
-            .map(|option| option.row(&self.editor_data))
+            .map(|option| option.format(&self.editor_data))
             .map(|mut row| {
                 const TEMP_CELL_SEP: &str = " ";
 
diff --git a/helix-tui/src/widgets/table.rs b/helix-tui/src/widgets/table.rs
index 2983072d..400f65e0 100644
--- a/helix-tui/src/widgets/table.rs
+++ b/helix-tui/src/widgets/table.rs
@@ -127,6 +127,12 @@ impl<'a> Row<'a> {
     }
 }
 
+impl<'a, T: Into<Cell<'a>>> From<T> for Row<'a> {
+    fn from(cell: T) -> Self {
+        Row::new(vec![cell.into()])
+    }
+}
+
 /// A widget to display data in formatted columns.
 ///
 /// It is a collection of [`Row`]s, themselves composed of [`Cell`]s:

From 1b69c7b4af8867f46365f6e04ab2ba29676c312c Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Wed, 18 Jan 2023 17:01:17 +0100
Subject: [PATCH 761/884] doc: add build instructions for musl-libc (#5572)

---
 book/src/install.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/book/src/install.md b/book/src/install.md
index bf0ff079..e2e546c7 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -99,6 +99,14 @@ cargo install --path helix-term --locked
 
 This will install the `hx` binary to `$HOME/.cargo/bin` and build tree-sitter grammars in `./runtime/grammars`.
 
+If you are using the musl-libc instead of glibc the following environment variable must be set during the build
+to ensure tree sitter grammars can be loaded correctly:
+
+```
+RUSTFLAGS="-C target-feature=-crt-static"
+```
+
+
 Helix also needs its runtime files so make sure to copy/symlink the `runtime/` directory into the
 config directory (for example `~/.config/helix/runtime` on Linux/macOS). This location can be overridden
 via the `HELIX_RUNTIME` environment variable.

From 7868e5f2d8ab193431e45b8bb3cd048e766328c4 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Wed, 18 Jan 2023 17:28:45 +0100
Subject: [PATCH 762/884] highlight non-bar cursors (#5575)

---
 helix-term/src/ui/editor.rs | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index a19eb213..f8244600 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -392,7 +392,14 @@ impl EditorView {
             if range.head > range.anchor {
                 // Standard case.
                 let cursor_start = prev_grapheme_boundary(text, range.head);
-                spans.push((selection_scope, range.anchor..cursor_start));
+                // non block cursors look like they exclude the cursor
+                let selection_end =
+                    if selection_is_primary && !cursor_is_block && mode != Mode::Insert {
+                        range.head
+                    } else {
+                        cursor_start
+                    };
+                spans.push((selection_scope, range.anchor..selection_end));
                 if !selection_is_primary || cursor_is_block {
                     spans.push((cursor_scope, cursor_start..range.head));
                 }
@@ -402,7 +409,16 @@ impl EditorView {
                 if !selection_is_primary || cursor_is_block {
                     spans.push((cursor_scope, range.head..cursor_end));
                 }
-                spans.push((selection_scope, cursor_end..range.anchor));
+                // non block cursors look like they exclude the cursor
+                let selection_start = if selection_is_primary
+                    && !cursor_is_block
+                    && !(mode == Mode::Insert && cursor_end == range.anchor)
+                {
+                    range.head
+                } else {
+                    cursor_end
+                };
+                spans.push((selection_scope, selection_start..range.anchor));
             }
         }
 

From 4d7082eb5c432e3cf0ff0fed565e8b1438d09ad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Delafargue?= <clement@delafargue.name>
Date: Wed, 18 Jan 2023 22:15:22 +0100
Subject: [PATCH 763/884] theme(zenburn): separate theme for
 selection.ui.primary (#5573)

---
 runtime/themes/zenburn.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/runtime/themes/zenburn.toml b/runtime/themes/zenburn.toml
index 63f4ac72..4c019a2c 100644
--- a/runtime/themes/zenburn.toml
+++ b/runtime/themes/zenburn.toml
@@ -6,7 +6,8 @@
 "ui.linenr" = { fg = "#9fafaf", bg = "#262626"}
 "ui.linenr.selected" = { modifiers = ["bold"]}
 "ui.popup" = { bg = "uibg" }
-"ui.selection" = { bg = "#2f2f2f" }
+"ui.selection" = { bg = "#304a3d" }
+"ui.selection.primary" = { bg = "#2f2f2f" }
 "comment" = { fg = "#7f9f7f" }
 "comment.block.documentation" = { fg = "black", modifiers = ["bold"] }
 "ui.statusline" = { bg = "statusbg", fg = "#ccdc90" }

From 0e5159ceca6be34977349156a32cc1a3ec53ab6e Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Wed, 18 Jan 2023 22:28:47 +0100
Subject: [PATCH 764/884] Fix panic for noop selecting join (#5579)

---
 helix-term/src/commands.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 5b3ce68e..8b742d00 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3939,6 +3939,11 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
         }
     }
 
+    // nothing to do, bail out early to avoid crashes later
+    if changes.is_empty() {
+        return;
+    }
+
     changes.sort_unstable_by_key(|(from, _to, _text)| *from);
     changes.dedup();
 

From efeec1282cd82e255f54b10e94c51f51294598eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Thu, 19 Jan 2023 15:23:08 +0900
Subject: [PATCH 765/884] theme: Make github match github.com more closely

This is a slight divergence from the VSCode theme, but it's more
accurate.

https://github.com/primer/github-vscode-theme/issues/111
https://github.com/primer/github-vscode-theme/issues/88
---
 runtime/themes/github_dark.toml  | 4 ++--
 runtime/themes/github_light.toml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/runtime/themes/github_dark.toml b/runtime/themes/github_dark.toml
index cdb97aa3..2b6dbfde 100644
--- a/runtime/themes/github_dark.toml
+++ b/runtime/themes/github_dark.toml
@@ -9,9 +9,9 @@ keyword = "scale.red.3"
 namespace = "scale.orange.2"
 punctuation = "fg.default"
 "punctuation.delimiter" = "fg.default"
-operator = "scale.red.3"
+operator = "scale.blue.1"
 special = "scale.blue.1"
-"variable.other.member" = "fg.default"
+"variable.other.member" = "scale.blue.1"
 variable = "fg.default"
 "variable.parameter" = "scale.orange.2"
 "variable.builtin" = "scale.red.3"
diff --git a/runtime/themes/github_light.toml b/runtime/themes/github_light.toml
index d9969729..3492460e 100644
--- a/runtime/themes/github_light.toml
+++ b/runtime/themes/github_light.toml
@@ -9,9 +9,9 @@ keyword = "scale.red.5"
 namespace = "scale.orange.6"
 punctuation = "fg.default"
 "punctuation.delimiter" = "fg.default"
-operator = "scale.red.5"
+operator = "scale.blue.8"
 special = "scale.blue.8"
-"variable.other.member" = "fg.default"
+"variable.other.member" = "scale.blue.8"
 variable = "fg.default"
 "variable.parameter" = "scale.orange.6"
 "variable.builtin" = "scale.red.5"

From 670c6b0d40a6d7bb0c4710cf7a17324a6f0ec479 Mon Sep 17 00:00:00 2001
From: luetage <luetage@vivaldi.net>
Date: Thu, 19 Jan 2023 17:05:18 +0100
Subject: [PATCH 766/884] Kanagawa: theme rulers and some miscellaneous fixes
 (#5571)

* discern between rulers and whitespace, add sumiInk2
* darker background for menu and help, bold selection
* bold modifier for insert and select
* dark color for window separator
* bring ruler, whitespace, indent-guide together
---
 runtime/themes/kanagawa.toml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/runtime/themes/kanagawa.toml b/runtime/themes/kanagawa.toml
index f3811111..a12a0912 100644
--- a/runtime/themes/kanagawa.toml
+++ b/runtime/themes/kanagawa.toml
@@ -14,30 +14,31 @@
 "ui.linenr" = { fg = "sumiInk4" }
 "ui.linenr.selected" = { fg = "roninYellow" }
 
+"ui.virtual.ruler" = { bg = "sumiInk2" }
+"ui.virtual.whitespace" = "waveBlue1"
 "ui.virtual.indent-guide" = "sumiInk4"
 
 "ui.statusline" = { fg = "oldWhite", bg = "sumiInk0" }
 "ui.statusline.inactive" = { fg = "fujiGray", bg = "sumiInk0" }
 "ui.statusline.normal" = { fg = "sumiInk0", bg = "crystalBlue", modifiers = ["bold"] }
-"ui.statusline.insert" = { fg = "sumiInk0", bg = "autumnGreen"  }
-"ui.statusline.select" = { fg = "sumiInk0", bg = "oniViolet" }
+"ui.statusline.insert" = { fg = "sumiInk0", bg = "autumnGreen", modifiers = ["bold"] }
+"ui.statusline.select" = { fg = "sumiInk0", bg = "oniViolet", modifiers = ["bold"] }
 
 "ui.bufferline" = { fg = "oldWhite", bg = "sumiInk0" }
 "ui.bufferline.inactive" = { fg = "fujiGray", bg = "sumiInk0" }
 
 "ui.popup" = { fg = "fujiWhite", bg = "sumiInk0" }
-"ui.window" = { fg = "fujiWhite" }
-"ui.help" = { fg = "fujiWhite", bg = "sumiInk1" }
+"ui.window" = { fg = "sumiInk0" }
+"ui.help" = { fg = "fujiWhite", bg = "sumiInk0" }
 "ui.text" = "fujiWhite"
 "ui.text.focus" = { fg = "fujiWhite", bg = "waveBlue1", modifiers = ["bold"] }
-"ui.virtual" = "waveBlue1"
 
 "ui.cursor" = { fg = "waveBlue1", bg = "fujiWhite"}
 "ui.cursor.primary" = { fg = "waveBlue1", bg = "seaFoam" }
 "ui.cursor.match" = { fg = "seaFoam", modifiers = ["bold"] }
 "ui.highlight" = { fg = "fujiWhite", bg = "waveBlue2" }
-"ui.menu" = { fg = "fujiWhite", bg = "sumiInk1" }
-"ui.menu.selected" = { fg = "fujiWhite", bg = "waveBlue1" }
+"ui.menu" = { fg = "fujiWhite", bg = "sumiInk0" }
+"ui.menu.selected" = { fg = "fujiWhite", bg = "waveBlue1", modifiers = ["bold"] }
 
 "ui.cursorline.primary" = { bg = "sumiInk3"}
 
@@ -107,7 +108,8 @@ fujiWhite     = "#DCD7BA" # default foreground
 oldWhite      = "#C8C093" # dark foreground, e.g. statuslines
 sumiInk0      = "#16161D" # dark background, e.g. statuslines, floating windows
 sumiInk1      = "#1F1F28" # default background
-sumiInk3      = "#363646" # lighter background, e.g. colorcolumns and folds
+sumiInk2      = "#2A2A37" # lighter background, e.g. colorcolumns, folds
+sumiInk3      = "#363646" # lighter background, e.g. cursorline
 sumiInk4      = "#54546D" # darker foreground, e.g. linenumbers, fold column
 waveBlue1     = "#223249" # popup background, visual selection background
 waveBlue2     = "#2D4F67" # popup selection background, search background

From 94ef6fb69b837229c1e7e84967a79fc53259b00b Mon Sep 17 00:00:00 2001
From: Nachum Barcohen <38861757+nabaco@users.noreply.github.com>
Date: Thu, 19 Jan 2023 18:08:56 +0200
Subject: [PATCH 767/884] Add more file-types for python (#5593)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index a66605b2..c37860d3 100644
--- a/languages.toml
+++ b/languages.toml
@@ -473,7 +473,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-html", rev = "29f53
 name = "python"
 scope = "source.python"
 injection-regex = "python"
-file-types = ["py"]
+file-types = ["py","pyi","py3","pyw","ptl",".pythonstartup",".pythonrc","SConstruct"]
 shebangs = ["python"]
 roots = []
 comment-token = "#"

From 4535d0fa74afc5bdd84ca698480249d20fbd8b61 Mon Sep 17 00:00:00 2001
From: eugene yokota <eed3si9n@gmail.com>
Date: Thu, 19 Jan 2023 12:26:12 -0500
Subject: [PATCH 768/884] highlight(scala): update to fix potential crash
 (#5576)

* highlight(scala): update to fix crash

tree-sitter-scala has recently add a fix to workaround segv crashes in other editors.
Not sure if it happens to Helix as well, but it's probably a good idea to use the latest.

* highlight(scala): String interpolator support

This captures String interpolator as `function`

Co-authored-by: Chris Kipp <ckipp@pm.me>
---
 languages.toml                       | 2 +-
 runtime/queries/scala/highlights.scm | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index c37860d3..b6f939aa 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1065,7 +1065,7 @@ config = { "isHttpEnabled" = true }
 
 [[grammar]]
 name = "scala"
-source = { git = "https://github.com/tree-sitter/tree-sitter-scala", rev = "db1c8c23d7996476a791db85a0d292084c19c232" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-scala", rev = "f6bbf35de41653b409ca9a3537a154f2b095ef64" }
 
 [[language]]
 name = "dockerfile"
diff --git a/runtime/queries/scala/highlights.scm b/runtime/queries/scala/highlights.scm
index 07307875..67603fdd 100644
--- a/runtime/queries/scala/highlights.scm
+++ b/runtime/queries/scala/highlights.scm
@@ -112,6 +112,9 @@
 (generic_function
   function: (identifier) @function)
 
+(interpolated_string_expression
+  interpolator: (identifier) @function)
+
 (
   (identifier) @function.builtin
   (#match? @function.builtin "^super$")

From 8e10c592b90383a90b7e4a9335d323f8fab99ab5 Mon Sep 17 00:00:00 2001
From: anna <anna328p@gmail.com>
Date: Fri, 20 Jan 2023 00:20:40 -0600
Subject: [PATCH 769/884] add lua injection regex (#5606)

---
 languages.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/languages.toml b/languages.toml
index b6f939aa..32383513 100644
--- a/languages.toml
+++ b/languages.toml
@@ -717,6 +717,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-ocaml", rev = "23d4
 
 [[language]]
 name = "lua"
+injection-regex = "lua"
 scope = "source.lua"
 file-types = ["lua"]
 shebangs = ["lua"]

From 338f207d4bb4b25dfcf746a9f207dfac9a5025bd Mon Sep 17 00:00:00 2001
From: LeoniePhiline <22329650+LeoniePhiline@users.noreply.github.com>
Date: Thu, 19 Jan 2023 23:12:37 +0100
Subject: [PATCH 770/884] fix(theme): Replace non-palette color "magenta" with
 palette color "red" in monokai_pro_spectrum

---
 runtime/themes/monokai_pro_spectrum.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/themes/monokai_pro_spectrum.toml b/runtime/themes/monokai_pro_spectrum.toml
index 451f7986..1dc6de46 100644
--- a/runtime/themes/monokai_pro_spectrum.toml
+++ b/runtime/themes/monokai_pro_spectrum.toml
@@ -65,7 +65,7 @@
 "variable.parameter" = "#f59762"
 
 # error
-"error" = { bg = "magenta", fg = "yellow" }
+"error" = { bg = "red", fg = "yellow" }
 
 # annotations, decorators
 "special" = "#f59762"
@@ -88,7 +88,7 @@
 
 # make diagnostic underlined, to distinguish with selection text.
 "diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
-"diagnostic.error" = { underline = { color = "magenta", style = "curl" } } # maybe should be red?
+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
 "diagnostic.info" = { underline = { color = "base8", style = "curl" } }
 "diagnostic.hint" = { underline = { color = "base8", style = "curl" } }
 

From 248a9f3635ac7ea396c2b1b16a57637e7f23766d Mon Sep 17 00:00:00 2001
From: LeoniePhiline <22329650+LeoniePhiline@users.noreply.github.com>
Date: Thu, 19 Jan 2023 23:20:50 +0100
Subject: [PATCH 771/884] fix(theme): Fix error background-foreground-contrast
 in monokai_pro_spectrum

---
 runtime/themes/monokai_pro_spectrum.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/themes/monokai_pro_spectrum.toml b/runtime/themes/monokai_pro_spectrum.toml
index 1dc6de46..76123fcf 100644
--- a/runtime/themes/monokai_pro_spectrum.toml
+++ b/runtime/themes/monokai_pro_spectrum.toml
@@ -65,7 +65,7 @@
 "variable.parameter" = "#f59762"
 
 # error
-"error" = { bg = "red", fg = "yellow" }
+"error" = { fg = "red", modifiers = ["bold"] }
 
 # annotations, decorators
 "special" = "#f59762"

From edd0ba7f19c662555128c4b112faed0120d91197 Mon Sep 17 00:00:00 2001
From: yashpalgoyal1304 <yashpalgoyal1304@gmail.com>
Date: Fri, 20 Jan 2023 21:35:34 +0530
Subject: [PATCH 772/884] book: Link MSYS2 proper command page (#5601)

---
 book/src/install.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/src/install.md b/book/src/install.md
index e2e546c7..792799d7 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -69,7 +69,7 @@ choco install helix
 
 **MSYS2:**
 
-Choose the proper command for your system from below:
+Choose the [proper command](https://www.msys2.org/docs/package-naming/) for your system from below:
 
   - For 32 bit Windows 7 or above:
 

From 68fc10903aad7b5dbb5b8be4ee17343e1a1b8f6c Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim@nrdxp.dev>
Date: Fri, 20 Jan 2023 12:35:52 -0700
Subject: [PATCH 773/884] themes: Extend snazzy (#3971)

---
 runtime/themes/snazzy.toml | 83 +++++++++++++++++++++++++++++---------
 1 file changed, 64 insertions(+), 19 deletions(-)

diff --git a/runtime/themes/snazzy.toml b/runtime/themes/snazzy.toml
index b36d1243..110e2093 100644
--- a/runtime/themes/snazzy.toml
+++ b/runtime/themes/snazzy.toml
@@ -1,25 +1,55 @@
-# Author : Sebastian Zivota <loewenheim@mailbox.org>
 # Author : Timothy DeHerrera <tim@nrdxp.dev>
-"comment" = { fg = "comment" }
-"constant" = { fg = "purple" }
-"constant.character.escape" = { fg = "magenta" }
-"function" = { fg = "green" }
-"keyword" = { fg = "magenta" }
-"operator" = { fg = "magenta" }
-"punctuation" = { fg = "foreground" }
-"string" = { fg = "yellow" }
-"string.special.path" = { fg = "blue" }
-"string.regexp" = { fg = "red" }
-"tag" = { fg = "magenta" }
-"type" = { fg = "cyan", modifiers = ["italic"] }
-"type.enum.variant" = { fg = "foreground", modifiers = ["italic"] }
-"variable" = { fg = "foreground" }
-"variable.builtin" = { fg = "cyan", modifiers = ["italic"] }
+"comment".fg = "comment"
+
+"constant".fg = "purple"
+"constant.builtin".fg = "olive"
+"constant.character".fg = "carnation"
+"constant.character.escape".fg = "magenta"
+"constant.numeric".fg = "cyan"
+"constant.numeric.float".fg = "red"
+
+"function".fg = "green"
+"function.builtin".fg = "sand"
+"function.macro".fg = "blue"
+"function.method".fg = "opal"
+
+"keyword" = { fg = "magenta", modifiers = ["bold"] }
+"keyword.operator" = { fg = "coral", modifiers = ["bold"] }
+"keyword.function" = { fg = "lilac", modifiers = ["bold"] }
+"keyword.control" = { fg = "carnation", modifiers = ["bold"]}
+"keyword.control.exception" = { fg = "red", modifiers = ["bold"] }
+"keyword.storage" = { fg = "coral", modifiers = ["bold"] }
+
+"operator".fg = "coral"
+
+"punctuation".fg = "magenta"
+"punctuation.delimiter".fg = "coral"
+"punctuation.bracket".fg = "foreground"
+
+"string".fg = "yellow"
+"string.special".fg = "blue"
+"string.regexp".fg = "red"
+"tag".fg = "carnation"
+"attribute".fg = "opal"
+
+"type".fg = "opal"
+"type.variant".fg = "sand"
+"type.builtin".fg = "yellow"
+"type.enum.variant".fg = "sand"
+
+"variable".fg = "cyan"
+"variable.builtin".fg = "olive"
+"variable.other.member".fg = "lilac"
 "variable.parameter" = { fg ="blue", modifiers = ["italic"] }
 
-"diff.plus" = { fg = "green" }
-"diff.delta" = { fg = "blue" }
-"diff.minus" = { fg = "red" }
+"namespace".fg = "olive"
+"constructor".fg = "sand"
+"special".fg = "magenta"
+"label".fg = "magenta"
+
+"diff.plus".fg = "green"
+"diff.delta".fg = "blue"
+"diff.minus".fg = "red"
 
 "ui.background" = { fg = "foreground", bg = "background" }
 "ui.cursor" =  { fg = "background", bg = "blue", modifiers = ["dim"] }
@@ -36,16 +66,21 @@
 "ui.cursorline" = { bg = "background_dark" }
 "ui.statusline" = { fg = "foreground", bg = "background_dark" }
 "ui.statusline.inactive" = { fg = "comment", bg = "background_dark" }
+"ui.statusline.insert" = { fg = "olive", bg = "background_dark" }
+"ui.statusline.normal" = { fg = "opal", bg = "background_dark" }
+"ui.statusline.select" = { fg = "carnation", bg = "background_dark" }
 "ui.text" = { fg = "foreground" }
 "ui.text.focus" = { fg = "cyan" }
 "ui.window" = { fg = "foreground" }
 "ui.virtual.whitespace" = { fg = "comment" }
+"ui.virtual.indent-guide" = { fg = "opal" }
 "ui.virtual.ruler" = { bg = "background_dark" }
 
 "error" = { fg = "red" }
 "warning" = { fg = "cyan" }
 
 "markup.heading" = { fg = "purple", modifiers = ["bold"] }
+"markup.link.label" = { fg = "blue", modifiers = ["italic"] }
 "markup.list" = "cyan"
 "markup.bold" = { fg = "blue", modifiers = ["bold"] }
 "markup.italic" = { fg = "yellow", modifiers = ["italic"] }
@@ -61,6 +96,8 @@ primary_highlight = "#800049"
 secondary_highlight = "#4d4f66"
 foreground = "#eff0eb"
 comment = "#a39e9b"
+
+# main colors
 red = "#ff5c57"
 blue = "#57c7ff"
 yellow = "#f3f99d"
@@ -68,3 +105,11 @@ green = "#5af78e"
 purple = "#bd93f9"
 cyan = "#9aedfe"
 magenta = "#ff6ac1"
+
+# aux colors
+lilac = "#c9c5fb"
+coral = "#f97c7c"
+sand = "#ffab6f"
+carnation = "#f99fc6"
+olive = "#b6d37c"
+opal = "#b1d7c7"

From a20a96abdcfbea3b3eb890bfc266850938434a90 Mon Sep 17 00:00:00 2001
From: Ivan Tham <pickfire@riseup.net>
Date: Sun, 22 Jan 2023 02:13:43 +0800
Subject: [PATCH 774/884] Remove apply_transaction helper (#5598)

---
 helix-term/src/commands.rs       | 57 ++++++++++++++++----------------
 helix-term/src/commands/lsp.rs   |  4 +--
 helix-term/src/commands/typed.rs | 13 +++-----
 helix-term/src/ui/completion.rs  |  8 ++---
 helix-term/src/ui/editor.rs      |  3 +-
 helix-term/tests/test/helpers.rs |  4 +--
 helix-view/src/document.rs       |  9 ++---
 helix-view/src/editor.rs         |  2 +-
 helix-view/src/lib.rs            | 11 ------
 helix-view/src/view.rs           |  2 --
 10 files changed, 46 insertions(+), 67 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 8b742d00..e773a2c7 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -26,7 +26,6 @@ use helix_core::{
     SmallVec, Tendril, Transaction,
 };
 use helix_view::{
-    apply_transaction,
     clipboard::ClipboardType,
     document::{FormatterError, Mode, SCRATCH_BUFFER_NAME},
     editor::{Action, Motion},
@@ -864,7 +863,7 @@ fn align_selections(cx: &mut Context) {
     changes.sort_unstable_by_key(|(from, _, _)| *from);
 
     let transaction = Transaction::change(doc.text(), changes.into_iter());
-    apply_transaction(&transaction, doc, view);
+    doc.apply(&transaction, view.id);
 }
 
 fn goto_window(cx: &mut Context, align: Align) {
@@ -1316,7 +1315,7 @@ fn replace(cx: &mut Context) {
                 }
             });
 
-            apply_transaction(&transaction, doc, view);
+            doc.apply(&transaction, view.id);
             exit_select_mode(cx);
         }
     })
@@ -1334,7 +1333,7 @@ where
         (range.from(), range.to(), Some(text))
     });
 
-    apply_transaction(&transaction, doc, view);
+    doc.apply(&transaction, view.id);
 }
 
 fn switch_case(cx: &mut Context) {
@@ -2159,7 +2158,7 @@ fn delete_selection_impl(cx: &mut Context, op: Operation) {
     let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
         (range.from(), range.to(), None)
     });
-    apply_transaction(&transaction, doc, view);
+    doc.apply(&transaction, view.id);
 
     match op {
         Operation::Delete => {
@@ -2177,7 +2176,7 @@ fn delete_selection_insert_mode(doc: &mut Document, view: &mut View, selection:
     let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
         (range.from(), range.to(), None)
     });
-    apply_transaction(&transaction, doc, view);
+    doc.apply(&transaction, view.id);
 }
 
 fn delete_selection(cx: &mut Context) {
@@ -2273,7 +2272,7 @@ fn append_mode(cx: &mut Context) {
             doc.text(),
             [(end, end, Some(doc.line_ending.as_str().into()))].into_iter(),
         );
-        apply_transaction(&transaction, doc, view);
+        doc.apply(&transaction, view.id);
     }
 
     let selection = doc.selection(view.id).clone().transform(|range| {
@@ -2583,7 +2582,7 @@ async fn make_format_callback(
 
         if let Ok(format) = format {
             if doc.version() == doc_version {
-                apply_transaction(&format, doc, view);
+                doc.apply(&format, view.id);
                 doc.append_changes_to_history(view);
                 doc.detect_indent_and_line_ending();
                 view.ensure_cursor_in_view(doc, scrolloff);
@@ -2676,7 +2675,7 @@ fn open(cx: &mut Context, open: Open) {
 
     transaction = transaction.with_selection(Selection::new(ranges, selection.primary_index()));
 
-    apply_transaction(&transaction, doc, view);
+    doc.apply(&transaction, view.id);
 }
 
 // o inserts a new line after each line with a selection
@@ -3104,7 +3103,7 @@ pub mod insert {
 
         let (view, doc) = current!(cx.editor);
         if let Some(t) = transaction {
-            apply_transaction(&t, doc, view);
+            doc.apply(&t, view.id);
         }
 
         // TODO: need a post insert hook too for certain triggers (autocomplete, signature help, etc)
@@ -3126,7 +3125,7 @@ pub mod insert {
             &doc.selection(view.id).clone().cursors(doc.text().slice(..)),
             indent,
         );
-        apply_transaction(&transaction, doc, view);
+        doc.apply(&transaction, view.id);
     }
 
     pub fn insert_newline(cx: &mut Context) {
@@ -3231,7 +3230,7 @@ pub mod insert {
         transaction = transaction.with_selection(Selection::new(ranges, selection.primary_index()));
 
         let (view, doc) = current!(cx.editor);
-        apply_transaction(&transaction, doc, view);
+        doc.apply(&transaction, view.id);
     }
 
     pub fn delete_char_backward(cx: &mut Context) {
@@ -3326,7 +3325,7 @@ pub mod insert {
                 }
             });
         let (view, doc) = current!(cx.editor);
-        apply_transaction(&transaction, doc, view);
+        doc.apply(&transaction, view.id);
 
         lsp::signature_help_impl(cx, SignatureHelpInvoked::Automatic);
     }
@@ -3344,7 +3343,7 @@ pub mod insert {
                     None,
                 )
             });
-        apply_transaction(&transaction, doc, view);
+        doc.apply(&transaction, view.id);
 
         lsp::signature_help_impl(cx, SignatureHelpInvoked::Automatic);
     }
@@ -3625,7 +3624,7 @@ fn paste_impl(
         transaction = transaction.with_selection(Selection::new(ranges, selection.primary_index()));
     }
 
-    apply_transaction(&transaction, doc, view);
+    doc.apply(&transaction, view.id);
 }
 
 pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {
@@ -3717,7 +3716,7 @@ fn replace_with_yanked(cx: &mut Context) {
                 }
             });
 
-            apply_transaction(&transaction, doc, view);
+            doc.apply(&transaction, view.id);
             exit_select_mode(cx);
         }
     }
@@ -3741,7 +3740,7 @@ fn replace_selections_with_clipboard_impl(
                 )
             });
 
-            apply_transaction(&transaction, doc, view);
+            doc.apply(&transaction, view.id);
             doc.append_changes_to_history(view);
         }
         Err(e) => return Err(e.context("Couldn't get system clipboard contents")),
@@ -3813,7 +3812,7 @@ fn indent(cx: &mut Context) {
             Some((pos, pos, Some(indent.clone())))
         }),
     );
-    apply_transaction(&transaction, doc, view);
+    doc.apply(&transaction, view.id);
 }
 
 fn unindent(cx: &mut Context) {
@@ -3852,7 +3851,7 @@ fn unindent(cx: &mut Context) {
 
     let transaction = Transaction::change(doc.text(), changes.into_iter());
 
-    apply_transaction(&transaction, doc, view);
+    doc.apply(&transaction, view.id);
 }
 
 fn format_selections(cx: &mut Context) {
@@ -3907,7 +3906,7 @@ fn format_selections(cx: &mut Context) {
         language_server.offset_encoding(),
     );
 
-    apply_transaction(&transaction, doc, view);
+    doc.apply(&transaction, view.id);
 }
 
 fn join_selections_impl(cx: &mut Context, select_space: bool) {
@@ -3966,7 +3965,7 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
         Transaction::change(doc.text(), changes.into_iter())
     };
 
-    apply_transaction(&transaction, doc, view);
+    doc.apply(&transaction, view.id);
 }
 
 fn keep_or_remove_selections_impl(cx: &mut Context, remove: bool) {
@@ -4109,7 +4108,7 @@ fn toggle_comments(cx: &mut Context) {
         .map(|tc| tc.as_ref());
     let transaction = comment::toggle_line_comments(doc.text(), doc.selection(view.id), token);
 
-    apply_transaction(&transaction, doc, view);
+    doc.apply(&transaction, view.id);
     exit_select_mode(cx);
 }
 
@@ -4165,7 +4164,7 @@ fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
             .map(|(range, fragment)| (range.from(), range.to(), Some(fragment))),
     );
 
-    apply_transaction(&transaction, doc, view);
+    doc.apply(&transaction, view.id);
 }
 
 fn rotate_selection_contents_forward(cx: &mut Context) {
@@ -4698,7 +4697,7 @@ fn surround_add(cx: &mut Context) {
 
         let transaction = Transaction::change(doc.text(), changes.into_iter())
             .with_selection(Selection::new(ranges, selection.primary_index()));
-        apply_transaction(&transaction, doc, view);
+        doc.apply(&transaction, view.id);
         exit_select_mode(cx);
     })
 }
@@ -4738,7 +4737,7 @@ fn surround_replace(cx: &mut Context) {
                     (pos, pos + 1, Some(t))
                 }),
             );
-            apply_transaction(&transaction, doc, view);
+            doc.apply(&transaction, view.id);
             exit_select_mode(cx);
         });
     })
@@ -4766,7 +4765,7 @@ fn surround_delete(cx: &mut Context) {
 
         let transaction =
             Transaction::change(doc.text(), change_pos.into_iter().map(|p| (p, p + 1, None)));
-        apply_transaction(&transaction, doc, view);
+        doc.apply(&transaction, view.id);
         exit_select_mode(cx);
     })
 }
@@ -4981,7 +4980,7 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
     if behavior != &ShellBehavior::Ignore {
         let transaction = Transaction::change(doc.text(), changes.into_iter())
             .with_selection(Selection::new(ranges, selection.primary_index()));
-        apply_transaction(&transaction, doc, view);
+        doc.apply(&transaction, view.id);
         doc.append_changes_to_history(view);
     }
 
@@ -5044,7 +5043,7 @@ fn add_newline_impl(cx: &mut Context, open: Open) {
     });
 
     let transaction = Transaction::change(text, changes);
-    apply_transaction(&transaction, doc, view);
+    doc.apply(&transaction, view.id);
 }
 
 enum IncrementDirection {
@@ -5111,7 +5110,7 @@ fn increment_impl(cx: &mut Context, increment_direction: IncrementDirection) {
         let new_selection = Selection::new(new_selection_ranges, selection.primary_index());
         let transaction = Transaction::change(doc.text(), changes.into_iter());
         let transaction = transaction.with_selection(new_selection);
-        apply_transaction(&transaction, doc, view);
+        doc.apply(&transaction, view.id);
     }
 }
 
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 90b6d76c..578eb608 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -13,7 +13,7 @@ use tui::{
 use super::{align_view, push_jump, Align, Context, Editor, Open};
 
 use helix_core::{path, Selection};
-use helix_view::{apply_transaction, document::Mode, editor::Action, theme::Style};
+use helix_view::{document::Mode, editor::Action, theme::Style};
 
 use crate::{
     compositor::{self, Compositor},
@@ -800,7 +800,7 @@ pub fn apply_workspace_edit(
             offset_encoding,
         );
         let view = view_mut!(editor, view_id);
-        apply_transaction(&transaction, doc, view);
+        doc.apply(&transaction, view.id);
         doc.append_changes_to_history(view);
     };
 
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index de24c4fb..bd91df5a 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -4,10 +4,7 @@ use crate::job::Job;
 
 use super::*;
 
-use helix_view::{
-    apply_transaction,
-    editor::{Action, CloseError, ConfigEvent},
-};
+use helix_view::editor::{Action, CloseError, ConfigEvent};
 use ui::completers::{self, Completer};
 
 #[derive(Clone)]
@@ -480,7 +477,7 @@ fn set_line_ending(
             }
         }),
     );
-    apply_transaction(&transaction, doc, view);
+    doc.apply(&transaction, view.id);
     doc.append_changes_to_history(view);
 
     Ok(())
@@ -925,7 +922,7 @@ fn replace_selections_with_clipboard_impl(
                 (range.from(), range.to(), Some(contents.as_str().into()))
             });
 
-            apply_transaction(&transaction, doc, view);
+            doc.apply(&transaction, view.id);
             doc.append_changes_to_history(view);
             Ok(())
         }
@@ -1596,7 +1593,7 @@ fn sort_impl(
             .map(|(s, fragment)| (s.from(), s.to(), Some(fragment))),
     );
 
-    apply_transaction(&transaction, doc, view);
+    doc.apply(&transaction, view.id);
     doc.append_changes_to_history(view);
 
     Ok(())
@@ -1640,7 +1637,7 @@ fn reflow(
         (range.from(), range.to(), Some(reflowed_text))
     });
 
-    apply_transaction(&transaction, doc, view);
+    doc.apply(&transaction, view.id);
     doc.append_changes_to_history(view);
     view.ensure_cursor_in_view(doc, scrolloff);
 
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 824bafd8..2eca709d 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -1,5 +1,5 @@
 use crate::compositor::{Component, Context, Event, EventResult};
-use helix_view::{apply_transaction, editor::CompleteAction, ViewId};
+use helix_view::{editor::CompleteAction, ViewId};
 use tui::buffer::Buffer as Surface;
 
 use std::borrow::Cow;
@@ -183,7 +183,7 @@ impl Completion {
 
                     // initialize a savepoint
                     doc.savepoint();
-                    apply_transaction(&transaction, doc, view);
+                    doc.apply(&transaction, view.id);
 
                     editor.last_completion = Some(CompleteAction {
                         trigger_offset,
@@ -203,7 +203,7 @@ impl Completion {
                         trigger_offset,
                     );
 
-                    apply_transaction(&transaction, doc, view);
+                    doc.apply(&transaction, view.id);
 
                     editor.last_completion = Some(CompleteAction {
                         trigger_offset,
@@ -233,7 +233,7 @@ impl Completion {
                                 additional_edits.clone(),
                                 offset_encoding, // TODO: should probably transcode in Client
                             );
-                            apply_transaction(&transaction, doc, view);
+                            doc.apply(&transaction, view.id);
                         }
                     }
                 }
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index f8244600..a0518964 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -17,7 +17,6 @@ use helix_core::{
     visual_coords_at_pos, LineEnding, Position, Range, Selection, Transaction,
 };
 use helix_view::{
-    apply_transaction,
     document::{Mode, SCRATCH_BUFFER_NAME},
     editor::{CompleteAction, CursorShapeConfig},
     graphics::{Color, CursorKind, Modifier, Rect, Style},
@@ -1048,7 +1047,7 @@ impl EditorView {
                                         (shift_position(start), shift_position(end), t)
                                     }),
                                 );
-                                apply_transaction(&tx, doc, view);
+                                doc.apply(&tx, view.id);
                             }
                             InsertEvent::TriggerCompletion => {
                                 let (_, doc) = current!(cxt.editor);
diff --git a/helix-term/tests/test/helpers.rs b/helix-term/tests/test/helpers.rs
index 2c5043d6..a0f3a32e 100644
--- a/helix-term/tests/test/helpers.rs
+++ b/helix-term/tests/test/helpers.rs
@@ -130,7 +130,7 @@ pub async fn test_key_sequence_with_input_text<T: Into<TestCase>>(
     })
     .with_selection(test_case.in_selection.clone());
 
-    helix_view::apply_transaction(&transaction, doc, view);
+    doc.apply(&transaction, view.id);
 
     test_key_sequence(
         &mut app,
@@ -315,7 +315,7 @@ impl AppBuilder {
             .with_selection(selection);
 
             // replace the initial text with the input text
-            helix_view::apply_transaction(&trans, doc, view);
+            doc.apply(&trans, view.id);
         }
 
         Ok(app)
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 856e5628..6b33ea6a 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -27,7 +27,7 @@ use helix_core::{
 };
 
 use crate::editor::RedrawHandle;
-use crate::{apply_transaction, DocumentId, Editor, View, ViewId};
+use crate::{DocumentId, Editor, View, ViewId};
 
 /// 8kB of buffer space for encoding and decoding `Rope`s.
 const BUF_SIZE: usize = 8192;
@@ -650,7 +650,7 @@ impl Document {
         // This is not considered a modification of the contents of the file regardless
         // of the encoding.
         let transaction = helix_core::diff::compare_ropes(self.text(), &rope);
-        apply_transaction(&transaction, self, view);
+        self.apply(&transaction, view.id);
         self.append_changes_to_history(view);
         self.reset_modified();
 
@@ -852,9 +852,6 @@ impl Document {
     }
 
     /// Apply a [`Transaction`] to the [`Document`] to change its text.
-    /// Instead of calling this function directly, use [crate::apply_transaction]
-    /// to ensure that the transaction is applied to the appropriate [`View`] as
-    /// well.
     pub fn apply(&mut self, transaction: &Transaction, view_id: ViewId) -> bool {
         // store the state just before any changes are made. This allows us to undo to the
         // state just before a transaction was applied.
@@ -911,7 +908,7 @@ impl Document {
 
     pub fn restore(&mut self, view: &mut View) {
         if let Some(revert) = self.savepoint.take() {
-            apply_transaction(&revert, self, view);
+            self.apply(&revert, view.id);
         }
     }
 
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 4a44a00c..3ee0325d 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1502,6 +1502,6 @@ fn try_restore_indent(doc: &mut Document, view: &mut View) {
                 let line_start_pos = text.line_to_char(range.cursor_line(text));
                 (line_start_pos, pos, None)
             });
-        crate::apply_transaction(&transaction, doc, view);
+        doc.apply(&transaction, view.id);
     }
 }
diff --git a/helix-view/src/lib.rs b/helix-view/src/lib.rs
index 9cf36ae0..9a980446 100644
--- a/helix-view/src/lib.rs
+++ b/helix-view/src/lib.rs
@@ -66,17 +66,6 @@ pub fn align_view(doc: &Document, view: &mut View, align: Align) {
     view.offset.row = line.saturating_sub(relative);
 }
 
-/// Applies a [`helix_core::Transaction`] to the given [`Document`]
-/// and [`View`].
-pub fn apply_transaction(
-    transaction: &helix_core::Transaction,
-    doc: &mut Document,
-    view: &View,
-) -> bool {
-    // TODO remove this helper function. Just call Document::apply everywhere directly.
-    doc.apply(transaction, view.id)
-}
-
 pub use document::Document;
 pub use editor::Editor;
 pub use theme::Theme;
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index c09d502d..23fb85c9 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -380,8 +380,6 @@ impl View {
     // }
 
     /// Applies a [`Transaction`] to the view.
-    /// Instead of calling this function directly, use [crate::apply_transaction]
-    /// which applies a transaction to the [`Document`] and view together.
     pub fn apply(&mut self, transaction: &Transaction, doc: &mut Document) {
         self.jumps.apply(transaction, doc);
         self.doc_revisions

From 99fcb108609a90c922921d139291b7f99d5cb06a Mon Sep 17 00:00:00 2001
From: eugene yokota <eed3si9n@gmail.com>
Date: Sat, 21 Jan 2023 14:18:16 -0500
Subject: [PATCH 775/884] theme: monkai_aqua variant (#5578)

Current monokai (pro or otherwise) seems too red and green,
missingthe bright aqua / cyan color found in Sublime's Monokai.

This adds a variant of monokai, which I named monokai_aqua.
---
 runtime/themes/monokai_aqua.toml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 runtime/themes/monokai_aqua.toml

diff --git a/runtime/themes/monokai_aqua.toml b/runtime/themes/monokai_aqua.toml
new file mode 100644
index 00000000..0fe48254
--- /dev/null
+++ b/runtime/themes/monokai_aqua.toml
@@ -0,0 +1,17 @@
+inherits = "monokai"
+
+"keyword.control.import" = { fg = "cyan", modifiers = ["italic"] }
+"keyword.function" = { fg = "cyan", modifiers = ["italic"] }
+"keyword.storage.type" = { fg = "cyan", modifiers = ["italic"] }
+
+"namespace" = { fg = "text" }
+
+"type" = { fg = "type", modifiers = ["bold"] }
+
+"ui.statusline.normal" = { fg = "light-black", bg = "cyan" }
+"ui.statusline.insert" = { fg = "light-black", bg = "green" }
+"ui.statusline.select" = { fg = "light-black", bg = "purple" }
+
+[palette]
+cyan = "#66D9EF"
+type = "#66D9EF"

From 42b040141632e332c837765f2eb1538ec9c53a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Galv=C3=A3o?= <info@vitorgalvao.com>
Date: Sat, 21 Jan 2023 19:19:24 +0000
Subject: [PATCH 776/884] tutor: Change "Type" to "Press" for specials keys and
 modifiers (#5609)

---
 runtime/tutor | 74 +++++++++++++++++++++++++--------------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/runtime/tutor b/runtime/tutor
index 0e693dc0..d51c57c2 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -48,13 +48,13 @@ _________________________________________________________________
 
  1. Type : to enter Command mode. Your cursor will
     move to the bottom of the screen.
- 2. Type q or quit and type Enter to exit Helix.
+ 2. Type q or quit and press Enter to exit Helix.
 
  Note: The quit command will fail if there are unsaved changes.
        To force quit and DISCARD these changes, type q! or quit!.
        You will learn how to save files later.
 
- To exit Command mode without entering a command, type Escape.
+ To exit Command mode without entering a command, press Escape.
 
  Now, move on to the next lesson.
 
@@ -96,7 +96,7 @@ _________________________________________________________________
  2. Move to a place in the line which is missing text and type
     i to enter Insert mode. Keys you type will now type text.
  3. Enter the missing text.
- 4. Type Escape to exit Insert mode and return to Normal mode.
+ 4. Press Escape to exit Insert mode and return to Normal mode.
  5. Repeat until the line matches the line below it.
 
  --> Th stce misg so.
@@ -119,7 +119,7 @@ _________________________________________________________________
  2. Open a file in Helix by running: hx FILENAME
  3. Make some edits to the file.
  4. Type : to enter Command mode.
- 5. Type w or write, and type Enter to save the file.
+ 5. Type w or write, and press Enter to save the file.
 
  You can also type wq or write-quit to save and exit.
 
@@ -145,7 +145,7 @@ _________________________________________________________________
 
  * Type d to delete the character at the cursor.
 
- * Type i to enter Insert mode and type text. Type Escape to
+ * Type i to enter Insert mode and type text. Press Escape to
    return to Normal mode.
 
 
@@ -469,7 +469,7 @@ _________________________________________________________________
  Type N to go to the previous search match.
 
  1. Type / and type in a common word, like 'banana'.
- 2. Type Enter to confirm the search.
+ 2. Press Enter to confirm the search.
  3. Use n and N to cycle through the matches.
 
  Searching uses regular expressions, allowing you to target more
@@ -524,7 +524,7 @@ _________________________________________________________________
  --> Fix th two nes at same ime.
      Fix these two lines at the same time.
 
- Note: Type Alt-C to do the same above the cursor.
+ Note: Press Alt-C to do the same above the cursor.
 
 =================================================================
 =                    5.2 THE SELECT COMMAND                     =
@@ -535,11 +535,11 @@ _________________________________________________________________
  1. Move the cursor to the line marked '-->' below.
  2. Type x to select the line.
  3. Type s. A prompt will appear.
- 4. Type 'apples' and type Enter. Both occurrences of
+ 4. Type 'apples' and press Enter. Both occurrences of
     'apples' in the line will be selected.
  5. You can now type c and change 'apples' to something else,
     like 'oranges'.
- 6. Type Escape to exit Insert mode.
+ 6. Press Escape to exit Insert mode.
  7. Type , to remove the second cursor.
 
  --> I like to eat apples since my favorite fruit is apples.
@@ -558,7 +558,7 @@ _________________________________________________________________
  1. Move the cursor to the line marked '-->' below.
  2. Select the line with x and then type s.
  3. Type '  +' to select any amount of consecutive spaces >1,
-    then type Enter.
+    then press Enter.
  4. Type c and change the matches to single spaces.
 
  --> This  sentence has   some      extra spaces.
@@ -596,11 +596,11 @@ _________________________________________________________________
 =                 5.5 SPLIT SELECTION INTO LINES                =
 =================================================================
 
- Type Alt-s to split the selection(s) on newlines.
+ Press Alt-s to split the selection(s) on newlines.
 
  1. Move the cursor to the first row of the table below.
  2. Select the entire table with 6x.
- 3. Type Alt-s to split into selections at each line.
+ 3. Press Alt-s to split into selections at each line.
  4. Align the table with &.
 
     | FRUIT   | AMOUNT |
@@ -626,7 +626,7 @@ _________________________________________________________________
 
  * Type & to align selections.
 
- * Type Alt-s to split the selection into lines.
+ * Press Alt-s to split the selection into lines.
 
 
 
@@ -685,7 +685,7 @@ _________________________________________________________________
 =================================================================
 
  Type . to repeat the last insert command.
- Type Alt-. to repeat the last f / t selection.
+ Press Alt-. to repeat the last f / t selection.
 
  1. Move the cursor to the line marked '-->' below.
  2. Make a change, insertion or appendage and repeat it with . .
@@ -712,7 +712,7 @@ _________________________________________________________________
  * Type r to replace selected characters.
 
  * Type . to repeat the last insertion.
-   * Type Alt-. to repeat the last f / t selection.
+   * Press Alt-. to repeat the last f / t selection.
 
 
 
@@ -794,13 +794,13 @@ lines.
 =               7.4 INCREMENTING AND DECREMENTING               =
 =================================================================
 
- Type Ctrl-a to increment the number under selection.
- Type Ctrl-x to decrement the number under selection.
+ Press Ctrl-a to increment the number under selection.
+ Press Ctrl-x to decrement the number under selection.
 
  1. Move the cursor to the third line marked '-->' below.
- 2. Type Ctrl-a to increment the second point marked 2.
+ 2. Press Ctrl-a to increment the second point marked 2.
  3. Repeat for the point marked 3.
- 4. Move to the last point and type Ctrl-x to decrement the 6.
+ 4. Move to the last point and press Ctrl-x to decrement the 6.
 
  --> 1) First point.
  --> 2) Added point.
@@ -822,8 +822,8 @@ lines.
 
  * Type < and > to indent / outdent lines.
 
- * Type Ctrl-a to increment the selected number.
-   * Type Ctrl-x to decrement the selected number.
+ * Press Ctrl-a to increment the selected number.
+   * Press Ctrl-x to decrement the selected number.
 
 
 
@@ -952,15 +952,15 @@ lines.
  searching or jumping to the definition of a function in code. It
  stores these in what's called the jumplist.
 
- Type Ctrl-s to manually save your current position to
+ Press Ctrl-s to manually save your current position to
  the jumplist.
 
- Type Ctrl-i ("in") and Ctrl-o ("out") to move forward and
+ Press Ctrl-i ("in") and Ctrl-o ("out") to move forward and
  backwards in the jumplist respectively.
 
- 1. Type Ctrl-s somewhere.
+ 1. Press Ctrl-s somewhere.
  2. Move far away in the file.
- 3. Type Ctrl-o (just once!) to come back to where you saved.
+ 3. Press Ctrl-o (just once!) to come back to where you saved.
 
 
 
@@ -975,8 +975,8 @@ lines.
  * Type n / N in Visual mode to add selections on each search
    match.
 
- * Type Ctrl-s to save position to the jumplist.
-   * Type Ctrl-i and Ctrl-o to go forward and backward in the
+ * Press Ctrl-s to save position to the jumplist.
+   * Press Ctrl-i and Ctrl-o to go forward and backward in the
      jumplist.
 
 
@@ -995,7 +995,7 @@ lines.
  Type ) and ( to cycle the primary selection forward and backward
  through selections respectively.
 
- Type Alt-, to remove the primary selection.
+ Press Alt-, to remove the primary selection.
 
  1. Move the cursor to the line marked '-->' below.
  2. Select both lines with xx or 2x.
@@ -1014,7 +1014,7 @@ lines.
 =             10.2 CYCLING THE CONTENT OF SELECTIONS            =
 =================================================================
 
- Type Alt-) and Alt-( to cycle the content of the selections
+ Press Alt-) and Alt-( to cycle the content of the selections
  forward and backward respectively.
 
  1. Move the cursor to the line marked '-->' below.
@@ -1038,7 +1038,7 @@ lines.
 
  Type ~ to switch the case of all selected letters.
  Type ` to set all selected letters to lowercase.
- Type Alt-` to set all selected letters to uppercase.
+ Press Alt-` to set all selected letters to uppercase.
 
  1. Move the cursor to the first line marked '-->' below.
  2. Select each wrongly capitalised or lowercase letter
@@ -1048,7 +1048,7 @@ lines.
  5. Type ` to change the line to lowercase.
  6. Move to the third line marked '-->'.
  7. Type x to select the line.
- 8. Type Alt-` to change the line to uppercase.
+ 8. Press Alt-` to change the line to uppercase.
 
  --> thIs sENtencE hAs MIS-cApitalIsed leTTerS.
  --> this SENTENCE SHOULD all be in LOWERCASE.
@@ -1065,10 +1065,10 @@ lines.
  3. Type S then \. |! Enter (note the spaces after . and !).
     This effectively splits the selection into sentences at each
     dot or exclamation mark.
- 4. Type Alt-; to reverse the selections.
+ 4. Press Alt-; to reverse the selections.
  5. Type ; to reduce selections to a single character - the first
     letter of each sentence.
- 6. Type Alt-` to convert all selected letters to uppercase.
+ 6. Press Alt-` to convert all selected letters to uppercase.
 
 ---
 these are sentences. some sentences don't start with uppercase
@@ -1082,8 +1082,8 @@ letters! that is not good grammar. you can fix this.
 
  * Use ) and ( to cycle the primary selection back and forward
    through selections respectively.
-   * Type Alt-, to remove the primary selection.
-   * Type Alt-) and Alt-( to cycle the content of the selections.
+   * Press Alt-, to remove the primary selection.
+   * Press Alt-) and Alt-( to cycle the content of the selections.
 
  * Type ~ to alternate case of selected letters.
    * Use ` and Alt-` to set the case of selected letters to
@@ -1102,7 +1102,7 @@ letters! that is not good grammar. you can fix this.
 =                     11.1 COMMENTING A LINE                    =
 =================================================================
 
-Type Ctrl-c to comment the line under your cursor.
+Press Ctrl-c to comment the line under your cursor.
 To uncomment the line, press Ctrl-c again.
 
 1. Move your cursor to the line marked '-->' below.
@@ -1146,7 +1146,7 @@ multiple cursors, they won't be uncommented but commented again.
 =                       CHAPTER 11 RECAP                        =
 =================================================================
 
- * Use Ctrl-c to comment a line under your cursor. Type Ctrl-c
+ * Use Ctrl-c to comment a line under your cursor. Press Ctrl-c
    again to uncomment.
  * To comment multiple lines, use the selections 
    and multi-cursors before typing Ctrl-c.

From 8347139ff582341246975f047f04b4848f6e5af9 Mon Sep 17 00:00:00 2001
From: Soso <51865119+sgued@users.noreply.github.com>
Date: Sat, 21 Jan 2023 20:24:40 +0100
Subject: [PATCH 777/884] book: Use per-theme syntax-highlighting CSS variables
 (#5406)

Until this patch, all themes used the Colibri values for syntax highlighting.
This made the documentation very hard to read in some light themes.
---
 book/theme/css/variables.css | 71 +++++++++++++++++++++++++++++++++++-
 book/theme/highlight.css     | 16 ++++----
 2 files changed, 78 insertions(+), 9 deletions(-)

diff --git a/book/theme/css/variables.css b/book/theme/css/variables.css
index 1bf91b19..5d0978cc 100644
--- a/book/theme/css/variables.css
+++ b/book/theme/css/variables.css
@@ -48,6 +48,18 @@
     --searchresults-border-color: #888;
     --searchresults-li-bg: #252932;
     --search-mark-bg: #e3b171;
+    --hljs-background: #191f26;
+    --hljs-color: #e6e1cf;
+    --hljs-quote: #5c6773;
+    --hljs-variable: #ff7733;
+    --hljs-type: #ffee99;
+    --hljs-title: #b8cc52;
+    --hljs-symbol: #ffb454;
+    --hljs-selector-tag: #ff7733;
+    --hljs-selector-tag: #36a3d9;
+    --hljs-selector-tag: #00568d;
+    --hljs-selector-tag: #91b362;
+    --hljs-selector-tag: #d96c75;
 }
 
 .coal {
@@ -88,6 +100,18 @@
     --searchresults-border-color: #98a3ad;
     --searchresults-li-bg: #2b2b2f;
     --search-mark-bg: #355c7d;
+    --hljs-background: #969896;
+    --hljs-color: #cc6666;
+    --hljs-quote: #de935f;
+    --hljs-variable: #f0c674;
+    --hljs-type: #b5bd68;
+    --hljs-title: #8abeb7;
+    --hljs-symbol: #81a2be;
+    --hljs-selector-tag: #b294bb;
+    --hljs-selector-tag: #1d1f21;
+    --hljs-selector-tag: #c5c8c6;
+    --hljs-selector-tag: #718c00;
+    --hljs-selector-tag: #c82829;
 }
 
 .light {
@@ -128,6 +152,14 @@
     --searchresults-border-color: #888;
     --searchresults-li-bg: #e4f2fe;
     --search-mark-bg: #a2cff5;
+    --hljs-background: #f6f7f6;
+    --hljs-color: #000;
+    --hljs-quote: #575757;
+    --hljs-variable: #d70025;
+    --hljs-type: #b21e00;
+    --hljs-title: #0030f2;
+    --hljs-symbol: #008200;
+    --hljs-selector-tag: #9d00ec;
 }
 
 .navy {
@@ -168,6 +200,19 @@
     --searchresults-border-color: #5c5c68;
     --searchresults-li-bg: #242430;
     --search-mark-bg: #a2cff5;
+
+    --hljs-background: #969896;
+    --hljs-color: #cc6666;
+    --hljs-quote: #de935f;
+    --hljs-variable: #f0c674;
+    --hljs-type: #b5bd68;
+    --hljs-title: #8abeb7;
+    --hljs-symbol: #81a2be;
+    --hljs-selector-tag: #b294bb;
+    --hljs-selector-tag: #1d1f21;
+    --hljs-selector-tag: #c5c8c6;
+    --hljs-selector-tag: #718c00;
+    --hljs-selector-tag: #c82829;
 }
 
 .rust {
@@ -208,6 +253,14 @@
     --searchresults-border-color: #888;
     --searchresults-li-bg: #dec2a2;
     --search-mark-bg: #e69f67;
+    --hljs-background: #f6f7f6;
+    --hljs-color: #000;
+    --hljs-quote: #575757;
+    --hljs-variable: #d70025;
+    --hljs-type: #b21e00;
+    --hljs-title: #0030f2;
+    --hljs-symbol: #008200;
+    --hljs-selector-tag: #9d00ec;
 }
 
 @media (prefers-color-scheme: dark) {
@@ -292,7 +345,15 @@
     --searchresults-header-fg: #5f5f71;
     --searchresults-border-color: #5c5c68;
     --searchresults-li-bg: #242430;
-    --search-mark-bg: #a2cff5;
+    --search-mark-bg: #acff5;
+    --hljs-background: #2f1e2e;
+    --hljs-color: #a39e9b;
+    --hljs-quote: #8d8687;
+    --hljs-variable: #ef6155;
+    --hljs-type: #f99b15;
+    --hljs-title: #fec418;
+    --hljs-symbol: #48b685;
+    --hljs-selector-tag: #815ba4;
 }
 
 .colibri {
@@ -338,5 +399,13 @@
     --searchresults-border-color: #5c5c68;
     --searchresults-li-bg: #242430;
     --search-mark-bg: #a2cff5;
+    --hljs-background: #TODO;
+    --hljs-color: #TODO;
+    --hljs-quote: #TODO;
+    --hljs-variable: #TODO;
+    --hljs-type: #TODO;
+    --hljs-title: #TODO;
+    --hljs-symbol: #TODO;
+    --hljs-selector-tag: #TODO;
 */
 }
diff --git a/book/theme/highlight.css b/book/theme/highlight.css
index 8dce7d65..a2db0500 100644
--- a/book/theme/highlight.css
+++ b/book/theme/highlight.css
@@ -7,12 +7,12 @@ code.hljs {
  padding:3px 5px
 }
 .hljs {
- background:#2f1e2e;
- color:#a39e9b
+ background: var(--hljs-background);
+ color: var(--hljs-color);
 }
 .hljs-comment,
 .hljs-quote {
- color:#8d8687
+ color: var(--hljs-quote)
 }
 .hljs-link,
 .hljs-meta,
@@ -23,7 +23,7 @@ code.hljs {
 .hljs-tag,
 .hljs-template-variable,
 .hljs-variable {
- color:#ef6155
+ color: var(--hljs-variable)
 }
 .hljs-built_in,
 .hljs-deletion,
@@ -31,22 +31,22 @@ code.hljs {
 .hljs-number,
 .hljs-params,
 .hljs-type {
- color:#f99b15
+ color: var(--hljs-type)
 }
 .hljs-attribute,
 .hljs-section,
 .hljs-title {
- color:#fec418
+ color: var(--hljs-title)
 }
 .hljs-addition,
 .hljs-bullet,
 .hljs-string,
 .hljs-symbol {
- color:#48b685
+ color: var(--hljs-symbol)
 }
 .hljs-keyword,
 .hljs-selector-tag {
- color:#815ba4
+ color: var(--hljs-selector-tag)
 }
 .hljs-emphasis {
  font-style:italic

From 2b58ff4d7cc09bc48bcdd79096110eeb578b509f Mon Sep 17 00:00:00 2001
From: Doug Kelkhoff <18220321+dgkf@users.noreply.github.com>
Date: Sat, 21 Jan 2023 15:20:59 -0500
Subject: [PATCH 778/884] Add configuration for min width of line-numbers
 gutter (#4724)

---
 book/src/configuration.md |  52 +++++++++++++++++++
 helix-view/src/editor.rs  | 104 +++++++++++++++++++++++++++++++++----
 helix-view/src/gutter.rs  | 105 ++++++++++++++++++++++++++++++++++----
 helix-view/src/tree.rs    |  42 ++++-----------
 helix-view/src/view.rs    |  99 ++++++++++++++++++++---------------
 5 files changed, 310 insertions(+), 92 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index f89ef5ae..ab229f77 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -256,3 +256,55 @@ render = true
 character = "╎" # Some characters that work well: "▏", "┆", "┊", "⸽"
 skip-levels = 1
 ```
+
+### `[editor.gutters]` Section
+
+For simplicity, `editor.gutters` accepts an array of gutter types, which will
+use default settings for all gutter components.
+
+```toml
+[editor]
+gutters = ["diff", "diagnostics", "line-numbers", "spacer"]
+```
+
+To customize the behavior of gutters, the `[editor.gutters]` section must
+be used. This section contains top level settings, as well as settings for
+specific gutter components as sub-sections.
+
+| Key      | Description                    | Default                                                       |
+| ---      | ---                            | ---                                                           |
+| `layout` | A vector of gutters to display | `["diagnostics", "spacer", "line-numbers", "spacer", "diff"]` |
+
+Example:
+
+```toml
+[editor.gutters]
+layout = ["diff", "diagnostics", "line-numbers", "spacer"]
+```
+
+#### `[editor.gutters.line-numbers]` Section
+
+Options for the line number gutter
+
+| Key         | Description                             | Default |
+| ---         | ---                                     | ---     |
+| `min-width` | The minimum number of characters to use | `3`     |
+
+Example:
+
+```toml
+[editor.gutters.line-numbers]
+min-width = 1
+```
+
+#### `[editor.gutters.diagnotics]` Section
+
+Currently unused
+
+#### `[editor.gutters.diff]` Section
+
+Currently unused
+
+#### `[editor.gutters.spacer]` Section
+
+Currently unused
\ No newline at end of file
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 3ee0325d..9af8e4c3 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -71,6 +71,96 @@ where
     )
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case", default, deny_unknown_fields)]
+pub struct GutterConfig {
+    /// Gutter Layout
+    pub layout: Vec<GutterType>,
+    /// Options specific to the "line-numbers" gutter
+    pub line_numbers: GutterLineNumbersConfig,
+}
+
+impl Default for GutterConfig {
+    fn default() -> Self {
+        Self {
+            layout: vec![
+                GutterType::Diagnostics,
+                GutterType::Spacer,
+                GutterType::LineNumbers,
+                GutterType::Spacer,
+                GutterType::Diff,
+            ],
+            line_numbers: GutterLineNumbersConfig::default(),
+        }
+    }
+}
+
+impl From<Vec<GutterType>> for GutterConfig {
+    fn from(x: Vec<GutterType>) -> Self {
+        GutterConfig {
+            layout: x,
+            ..Default::default()
+        }
+    }
+}
+
+fn deserialize_gutter_seq_or_struct<'de, D>(deserializer: D) -> Result<GutterConfig, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    struct GutterVisitor;
+
+    impl<'de> serde::de::Visitor<'de> for GutterVisitor {
+        type Value = GutterConfig;
+
+        fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+            write!(
+                formatter,
+                "an array of gutter names or a detailed gutter configuration"
+            )
+        }
+
+        fn visit_seq<S>(self, mut seq: S) -> Result<Self::Value, S::Error>
+        where
+            S: serde::de::SeqAccess<'de>,
+        {
+            let mut gutters = Vec::new();
+            while let Some(gutter) = seq.next_element::<&str>()? {
+                gutters.push(
+                    gutter
+                        .parse::<GutterType>()
+                        .map_err(serde::de::Error::custom)?,
+                )
+            }
+
+            Ok(gutters.into())
+        }
+
+        fn visit_map<M>(self, map: M) -> Result<Self::Value, M::Error>
+        where
+            M: serde::de::MapAccess<'de>,
+        {
+            let deserializer = serde::de::value::MapAccessDeserializer::new(map);
+            Deserialize::deserialize(deserializer)
+        }
+    }
+
+    deserializer.deserialize_any(GutterVisitor)
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case", default, deny_unknown_fields)]
+pub struct GutterLineNumbersConfig {
+    /// Minimum number of characters to use for line number gutter. Defaults to 3.
+    pub min_width: usize,
+}
+
+impl Default for GutterLineNumbersConfig {
+    fn default() -> Self {
+        Self { min_width: 3 }
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case", default, deny_unknown_fields)]
 pub struct FilePickerConfig {
@@ -132,8 +222,8 @@ pub struct Config {
     pub cursorline: bool,
     /// Highlight the columns cursors are currently on. Defaults to false.
     pub cursorcolumn: bool,
-    /// Gutters. Default ["diagnostics", "line-numbers"]
-    pub gutters: Vec<GutterType>,
+    #[serde(deserialize_with = "deserialize_gutter_seq_or_struct")]
+    pub gutters: GutterConfig,
     /// Middle click paste support. Defaults to true.
     pub middle_click_paste: bool,
     /// Automatic insertion of pairs to parentheses, brackets,
@@ -606,13 +696,7 @@ impl Default for Config {
             line_number: LineNumber::Absolute,
             cursorline: false,
             cursorcolumn: false,
-            gutters: vec![
-                GutterType::Diagnostics,
-                GutterType::Spacer,
-                GutterType::LineNumbers,
-                GutterType::Spacer,
-                GutterType::Diff,
-            ],
+            gutters: GutterConfig::default(),
             middle_click_paste: true,
             auto_pairs: AutoPairConfig::default(),
             auto_completion: true,
@@ -844,6 +928,7 @@ impl Editor {
         let config = self.config();
         self.auto_pairs = (&config.auto_pairs).into();
         self.reset_idle_timer();
+        self._refresh();
     }
 
     pub fn clear_idle_timer(&mut self) {
@@ -984,6 +1069,7 @@ impl Editor {
         for (view, _) in self.tree.views_mut() {
             let doc = doc_mut!(self, &view.doc);
             view.sync_changes(doc);
+            view.gutters = config.gutters.clone();
             view.ensure_cursor_in_view(doc, config.scrolloff)
         }
     }
diff --git a/helix-view/src/gutter.rs b/helix-view/src/gutter.rs
index 377518fb..c1b5e2b1 100644
--- a/helix-view/src/gutter.rs
+++ b/helix-view/src/gutter.rs
@@ -35,10 +35,10 @@ impl GutterType {
         }
     }
 
-    pub fn width(self, _view: &View, doc: &Document) -> usize {
+    pub fn width(self, view: &View, doc: &Document) -> usize {
         match self {
             GutterType::Diagnostics => 1,
-            GutterType::LineNumbers => line_numbers_width(_view, doc),
+            GutterType::LineNumbers => line_numbers_width(view, doc),
             GutterType::Spacer => 1,
             GutterType::Diff => 1,
         }
@@ -140,12 +140,13 @@ pub fn line_numbers<'doc>(
     is_focused: bool,
 ) -> GutterFn<'doc> {
     let text = doc.text().slice(..);
-    let last_line = view.last_line(doc);
-    let width = GutterType::LineNumbers.width(view, doc);
+    let width = line_numbers_width(view, doc);
+
+    let last_line_in_view = view.last_line(doc);
 
     // Whether to draw the line number for the last line of the
     // document or not.  We only draw it if it's not an empty line.
-    let draw_last = text.line_to_byte(last_line) < text.len_bytes();
+    let draw_last = text.line_to_byte(last_line_in_view) < text.len_bytes();
 
     let linenr = theme.get("ui.linenr");
     let linenr_select = theme.get("ui.linenr.selected");
@@ -158,7 +159,7 @@ pub fn line_numbers<'doc>(
     let mode = editor.mode;
 
     Box::new(move |line: usize, selected: bool, out: &mut String| {
-        if line == last_line && !draw_last {
+        if line == last_line_in_view && !draw_last {
             write!(out, "{:>1$}", '~', width).unwrap();
             Some(linenr)
         } else {
@@ -187,14 +188,19 @@ pub fn line_numbers<'doc>(
     })
 }
 
-pub fn line_numbers_width(_view: &View, doc: &Document) -> usize {
+/// The width of a "line-numbers" gutter
+///
+/// The width of the gutter depends on the number of lines in the document,
+/// whether there is content on the last line (the `~` line), and the
+/// `editor.gutters.line-numbers.min-width` settings.
+fn line_numbers_width(view: &View, doc: &Document) -> usize {
     let text = doc.text();
     let last_line = text.len_lines().saturating_sub(1);
     let draw_last = text.line_to_byte(last_line) < text.len_bytes();
     let last_drawn = if draw_last { last_line + 1 } else { last_line };
-
-    // set a lower bound to 2-chars to minimize ambiguous relative line numbers
-    std::cmp::max(count_digits(last_drawn), 2)
+    let digits = count_digits(last_drawn);
+    let n_min = view.gutters.line_numbers.min_width;
+    digits.max(n_min)
 }
 
 pub fn padding<'doc>(
@@ -282,3 +288,82 @@ pub fn diagnostics_or_breakpoints<'doc>(
         breakpoints(line, selected, out).or_else(|| diagnostics(line, selected, out))
     })
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::document::Document;
+    use crate::editor::{GutterConfig, GutterLineNumbersConfig};
+    use crate::graphics::Rect;
+    use crate::DocumentId;
+    use helix_core::Rope;
+
+    #[test]
+    fn test_default_gutter_widths() {
+        let mut view = View::new(DocumentId::default(), GutterConfig::default());
+        view.area = Rect::new(40, 40, 40, 40);
+
+        let rope = Rope::from_str("abc\n\tdef");
+        let doc = Document::from(rope, None);
+
+        assert_eq!(view.gutters.layout.len(), 5);
+        assert_eq!(view.gutters.layout[0].width(&view, &doc), 1);
+        assert_eq!(view.gutters.layout[1].width(&view, &doc), 1);
+        assert_eq!(view.gutters.layout[2].width(&view, &doc), 3);
+        assert_eq!(view.gutters.layout[3].width(&view, &doc), 1);
+        assert_eq!(view.gutters.layout[4].width(&view, &doc), 1);
+    }
+
+    #[test]
+    fn test_configured_gutter_widths() {
+        let gutters = GutterConfig {
+            layout: vec![GutterType::Diagnostics],
+            ..Default::default()
+        };
+
+        let mut view = View::new(DocumentId::default(), gutters);
+        view.area = Rect::new(40, 40, 40, 40);
+
+        let rope = Rope::from_str("abc\n\tdef");
+        let doc = Document::from(rope, None);
+
+        assert_eq!(view.gutters.layout.len(), 1);
+        assert_eq!(view.gutters.layout[0].width(&view, &doc), 1);
+
+        let gutters = GutterConfig {
+            layout: vec![GutterType::Diagnostics, GutterType::LineNumbers],
+            line_numbers: GutterLineNumbersConfig { min_width: 10 },
+        };
+
+        let mut view = View::new(DocumentId::default(), gutters);
+        view.area = Rect::new(40, 40, 40, 40);
+
+        let rope = Rope::from_str("abc\n\tdef");
+        let doc = Document::from(rope, None);
+
+        assert_eq!(view.gutters.layout.len(), 2);
+        assert_eq!(view.gutters.layout[0].width(&view, &doc), 1);
+        assert_eq!(view.gutters.layout[1].width(&view, &doc), 10);
+    }
+
+    #[test]
+    fn test_line_numbers_gutter_width_resizes() {
+        let gutters = GutterConfig {
+            layout: vec![GutterType::Diagnostics, GutterType::LineNumbers],
+            line_numbers: GutterLineNumbersConfig { min_width: 1 },
+        };
+
+        let mut view = View::new(DocumentId::default(), gutters);
+        view.area = Rect::new(40, 40, 40, 40);
+
+        let rope = Rope::from_str("a\nb");
+        let doc_short = Document::from(rope, None);
+
+        let rope = Rope::from_str("a\nb\nc\nd\ne\nf\ng\nh\ni\nj\nk\nl\nm\nn\no\np");
+        let doc_long = Document::from(rope, None);
+
+        assert_eq!(view.gutters.layout.len(), 2);
+        assert_eq!(view.gutters.layout[1].width(&view, &doc_short), 1);
+        assert_eq!(view.gutters.layout[1].width(&view, &doc_long), 2);
+    }
+}
diff --git a/helix-view/src/tree.rs b/helix-view/src/tree.rs
index 469e913d..5ec2773d 100644
--- a/helix-view/src/tree.rs
+++ b/helix-view/src/tree.rs
@@ -701,7 +701,7 @@ impl<'a> DoubleEndedIterator for Traverse<'a> {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::editor::GutterType;
+    use crate::editor::GutterConfig;
     use crate::DocumentId;
 
     #[test]
@@ -712,34 +712,22 @@ mod test {
             width: 180,
             height: 80,
         });
-        let mut view = View::new(
-            DocumentId::default(),
-            vec![GutterType::Diagnostics, GutterType::LineNumbers],
-        );
+        let mut view = View::new(DocumentId::default(), GutterConfig::default());
         view.area = Rect::new(0, 0, 180, 80);
         tree.insert(view);
 
         let l0 = tree.focus;
-        let view = View::new(
-            DocumentId::default(),
-            vec![GutterType::Diagnostics, GutterType::LineNumbers],
-        );
+        let view = View::new(DocumentId::default(), GutterConfig::default());
         tree.split(view, Layout::Vertical);
         let r0 = tree.focus;
 
         tree.focus = l0;
-        let view = View::new(
-            DocumentId::default(),
-            vec![GutterType::Diagnostics, GutterType::LineNumbers],
-        );
+        let view = View::new(DocumentId::default(), GutterConfig::default());
         tree.split(view, Layout::Horizontal);
         let l1 = tree.focus;
 
         tree.focus = l0;
-        let view = View::new(
-            DocumentId::default(),
-            vec![GutterType::Diagnostics, GutterType::LineNumbers],
-        );
+        let view = View::new(DocumentId::default(), GutterConfig::default());
         tree.split(view, Layout::Vertical);
         let l2 = tree.focus;
 
@@ -781,40 +769,28 @@ mod test {
         });
 
         let doc_l0 = DocumentId::default();
-        let mut view = View::new(
-            doc_l0,
-            vec![GutterType::Diagnostics, GutterType::LineNumbers],
-        );
+        let mut view = View::new(doc_l0, GutterConfig::default());
         view.area = Rect::new(0, 0, 180, 80);
         tree.insert(view);
 
         let l0 = tree.focus;
 
         let doc_r0 = DocumentId::default();
-        let view = View::new(
-            doc_r0,
-            vec![GutterType::Diagnostics, GutterType::LineNumbers],
-        );
+        let view = View::new(doc_r0, GutterConfig::default());
         tree.split(view, Layout::Vertical);
         let r0 = tree.focus;
 
         tree.focus = l0;
 
         let doc_l1 = DocumentId::default();
-        let view = View::new(
-            doc_l1,
-            vec![GutterType::Diagnostics, GutterType::LineNumbers],
-        );
+        let view = View::new(doc_l1, GutterConfig::default());
         tree.split(view, Layout::Horizontal);
         let l1 = tree.focus;
 
         tree.focus = l0;
 
         let doc_l2 = DocumentId::default();
-        let view = View::new(
-            doc_l2,
-            vec![GutterType::Diagnostics, GutterType::LineNumbers],
-        );
+        let view = View::new(doc_l2, GutterConfig::default());
         tree.split(view, Layout::Vertical);
         let l2 = tree.focus;
 
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index 23fb85c9..abcf9a16 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -1,4 +1,10 @@
-use crate::{align_view, editor::GutterType, graphics::Rect, Align, Document, DocumentId, ViewId};
+use crate::{
+    align_view,
+    editor::{GutterConfig, GutterType},
+    graphics::Rect,
+    Align, Document, DocumentId, ViewId,
+};
+
 use helix_core::{
     pos_at_visual_coords, visual_coords_at_pos, Position, RopeSlice, Selection, Transaction,
 };
@@ -103,8 +109,8 @@ pub struct View {
     pub last_modified_docs: [Option<DocumentId>; 2],
     /// used to store previous selections of tree-sitter objects
     pub object_selections: Vec<Selection>,
-    /// GutterTypes used to fetch Gutter (constructor) and width for rendering
-    gutters: Vec<GutterType>,
+    /// all gutter-related configuration settings, used primarily for gutter rendering
+    pub gutters: GutterConfig,
     /// A mapping between documents and the last history revision the view was updated at.
     /// Changes between documents and views are synced lazily when switching windows. This
     /// mapping keeps track of the last applied history revision so that only new changes
@@ -123,7 +129,7 @@ impl fmt::Debug for View {
 }
 
 impl View {
-    pub fn new(doc: DocumentId, gutter_types: Vec<crate::editor::GutterType>) -> Self {
+    pub fn new(doc: DocumentId, gutters: GutterConfig) -> Self {
         Self {
             id: ViewId::default(),
             doc,
@@ -133,7 +139,7 @@ impl View {
             docs_access_history: Vec::new(),
             last_modified_docs: [None, None],
             object_selections: Vec::new(),
-            gutters: gutter_types,
+            gutters,
             doc_revisions: HashMap::new(),
         }
     }
@@ -154,11 +160,12 @@ impl View {
     }
 
     pub fn gutters(&self) -> &[GutterType] {
-        &self.gutters
+        &self.gutters.layout
     }
 
     pub fn gutter_offset(&self, doc: &Document) -> u16 {
         self.gutters
+            .layout
             .iter()
             .map(|gutter| gutter.width(self, doc) as u16)
             .sum()
@@ -414,18 +421,19 @@ impl View {
 mod tests {
     use super::*;
     use helix_core::Rope;
-    const OFFSET: u16 = 3; // 1 diagnostic + 2 linenr (< 100 lines)
-    const OFFSET_WITHOUT_LINE_NUMBERS: u16 = 1; // 1 diagnostic
-                                                // const OFFSET: u16 = GUTTERS.iter().map(|(_, width)| *width as u16).sum();
+
+    // 1 diagnostic + 1 spacer + 3 linenr (< 1000 lines) + 1 spacer + 1 diff
+    const DEFAULT_GUTTER_OFFSET: u16 = 7;
+
+    // 1 diagnostics + 1 spacer + 1 gutter
+    const DEFAULT_GUTTER_OFFSET_ONLY_DIAGNOSTICS: u16 = 3;
+
     use crate::document::Document;
-    use crate::editor::GutterType;
+    use crate::editor::{GutterConfig, GutterLineNumbersConfig, GutterType};
 
     #[test]
     fn test_text_pos_at_screen_coords() {
-        let mut view = View::new(
-            DocumentId::default(),
-            vec![GutterType::Diagnostics, GutterType::LineNumbers],
-        );
+        let mut view = View::new(DocumentId::default(), GutterConfig::default());
         view.area = Rect::new(40, 40, 40, 40);
         let rope = Rope::from_str("abc\n\tdef");
         let doc = Document::from(rope, None);
@@ -445,24 +453,24 @@ mod tests {
         assert_eq!(view.text_pos_at_screen_coords(&doc, 78, 41, 4), None);
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 3, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET + 3, 4),
             Some(3)
         );
 
         assert_eq!(view.text_pos_at_screen_coords(&doc, 40, 80, 4), Some(3));
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 41, 40 + OFFSET + 1, 4),
+            view.text_pos_at_screen_coords(&doc, 41, 40 + DEFAULT_GUTTER_OFFSET + 1, 4),
             Some(4)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 41, 40 + OFFSET + 4, 4),
+            view.text_pos_at_screen_coords(&doc, 41, 40 + DEFAULT_GUTTER_OFFSET + 4, 4),
             Some(5)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 41, 40 + OFFSET + 7, 4),
+            view.text_pos_at_screen_coords(&doc, 41, 40 + DEFAULT_GUTTER_OFFSET + 7, 4),
             Some(8)
         );
 
@@ -471,19 +479,36 @@ mod tests {
 
     #[test]
     fn test_text_pos_at_screen_coords_without_line_numbers_gutter() {
-        let mut view = View::new(DocumentId::default(), vec![GutterType::Diagnostics]);
+        let mut view = View::new(
+            DocumentId::default(),
+            GutterConfig {
+                layout: vec![GutterType::Diagnostics],
+                line_numbers: GutterLineNumbersConfig::default(),
+            },
+        );
         view.area = Rect::new(40, 40, 40, 40);
         let rope = Rope::from_str("abc\n\tdef");
         let doc = Document::from(rope, None);
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 41, 40 + OFFSET_WITHOUT_LINE_NUMBERS + 1, 4),
+            view.text_pos_at_screen_coords(
+                &doc,
+                41,
+                40 + DEFAULT_GUTTER_OFFSET_ONLY_DIAGNOSTICS + 1,
+                4
+            ),
             Some(4)
         );
     }
 
     #[test]
     fn test_text_pos_at_screen_coords_without_any_gutters() {
-        let mut view = View::new(DocumentId::default(), vec![]);
+        let mut view = View::new(
+            DocumentId::default(),
+            GutterConfig {
+                layout: vec![],
+                line_numbers: GutterLineNumbersConfig::default(),
+            },
+        );
         view.area = Rect::new(40, 40, 40, 40);
         let rope = Rope::from_str("abc\n\tdef");
         let doc = Document::from(rope, None);
@@ -492,76 +517,70 @@ mod tests {
 
     #[test]
     fn test_text_pos_at_screen_coords_cjk() {
-        let mut view = View::new(
-            DocumentId::default(),
-            vec![GutterType::Diagnostics, GutterType::LineNumbers],
-        );
+        let mut view = View::new(DocumentId::default(), GutterConfig::default());
         view.area = Rect::new(40, 40, 40, 40);
         let rope = Rope::from_str("Hi! こんにちは皆さん");
         let doc = Document::from(rope, None);
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET, 4),
             Some(0)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 4, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET + 4, 4),
             Some(4)
         );
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 5, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET + 5, 4),
             Some(4)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 6, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET + 6, 4),
             Some(5)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 7, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET + 7, 4),
             Some(5)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 8, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET + 8, 4),
             Some(6)
         );
     }
 
     #[test]
     fn test_text_pos_at_screen_coords_graphemes() {
-        let mut view = View::new(
-            DocumentId::default(),
-            vec![GutterType::Diagnostics, GutterType::LineNumbers],
-        );
+        let mut view = View::new(DocumentId::default(), GutterConfig::default());
         view.area = Rect::new(40, 40, 40, 40);
         let rope = Rope::from_str("Hèl̀l̀ò world!");
         let doc = Document::from(rope, None);
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET, 4),
             Some(0)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 1, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET + 1, 4),
             Some(1)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 2, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET + 2, 4),
             Some(3)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 3, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET + 3, 4),
             Some(5)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + OFFSET + 4, 4),
+            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET + 4, 4),
             Some(7)
         );
     }

From f103d2273baef3f0e71b896419fda4538b6c6cde Mon Sep 17 00:00:00 2001
From: Alex <3957610+CptPotato@users.noreply.github.com>
Date: Sat, 21 Jan 2023 23:21:26 +0100
Subject: [PATCH 779/884] Add `markup.strikethrough` theme keys (#5619)

---
 runtime/themes/autumn.toml                | 3 ++-
 runtime/themes/base16_default_dark.toml   | 1 +
 runtime/themes/base16_default_light.toml  | 1 +
 runtime/themes/base16_terminal.toml       | 1 +
 runtime/themes/base16_transparent.toml    | 1 +
 runtime/themes/bogster.toml               | 1 +
 runtime/themes/bogster_light.toml         | 1 +
 runtime/themes/boo_berry.toml             | 1 +
 runtime/themes/catppuccin_mocha.toml      | 1 +
 runtime/themes/darcula.toml               | 1 +
 runtime/themes/dark_high_contrast.toml    | 1 +
 runtime/themes/dark_plus.toml             | 1 +
 runtime/themes/doom_acario_dark.toml      | 1 +
 runtime/themes/dracula.toml               | 1 +
 runtime/themes/dracula_at_night.toml      | 1 +
 runtime/themes/emacs.toml                 | 1 +
 runtime/themes/everforest_dark.toml       | 1 +
 runtime/themes/everforest_light.toml      | 1 +
 runtime/themes/flatwhite.toml             | 3 ++-
 runtime/themes/fleet_dark.toml            | 1 +
 runtime/themes/github_dark.toml           | 1 +
 runtime/themes/github_light.toml          | 1 +
 runtime/themes/gruvbox.toml               | 1 +
 runtime/themes/gruvbox_dark_hard.toml     | 1 +
 runtime/themes/gruvbox_light.toml         | 1 +
 runtime/themes/hex_steel.toml             | 1 +
 runtime/themes/ingrid.toml                | 1 +
 runtime/themes/kanagawa.toml              | 1 +
 runtime/themes/meliora.toml               | 5 +++--
 runtime/themes/mellow.toml                | 1 +
 runtime/themes/monokai.toml               | 1 +
 runtime/themes/monokai_pro.toml           | 1 +
 runtime/themes/monokai_pro_machine.toml   | 1 +
 runtime/themes/monokai_pro_octagon.toml   | 1 +
 runtime/themes/monokai_pro_ristretto.toml | 1 +
 runtime/themes/monokai_pro_spectrum.toml  | 1 +
 runtime/themes/night_owl.toml             | 1 +
 runtime/themes/nightfox.toml              | 1 +
 runtime/themes/noctis.toml                | 1 +
 runtime/themes/noctis_bordo.toml          | 1 +
 runtime/themes/nord.toml                  | 1 +
 runtime/themes/onedark.toml               | 1 +
 runtime/themes/onedarker.toml             | 1 +
 runtime/themes/onelight.toml              | 1 +
 runtime/themes/papercolor-dark.toml       | 1 +
 runtime/themes/papercolor-light.toml      | 1 +
 runtime/themes/penumbra+.toml             | 1 +
 runtime/themes/pop-dark.toml              | 1 +
 runtime/themes/rasmus.toml                | 1 +
 runtime/themes/rose_pine.toml             | 1 +
 runtime/themes/serika-dark.toml           | 1 +
 runtime/themes/serika-light.toml          | 1 +
 runtime/themes/snazzy.toml                | 1 +
 runtime/themes/solarized_dark.toml        | 1 +
 runtime/themes/solarized_light.toml       | 1 +
 runtime/themes/sonokai.toml               | 1 +
 runtime/themes/spacebones_light.toml      | 1 +
 runtime/themes/tokyonight.toml            | 1 +
 theme.toml                                | 1 +
 59 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/runtime/themes/autumn.toml b/runtime/themes/autumn.toml
index 935c72e5..51860312 100644
--- a/runtime/themes/autumn.toml
+++ b/runtime/themes/autumn.toml
@@ -51,7 +51,8 @@
 "markup.heading" = "my_yellow1"
 "markup.list" = "my_white2"
 "markup.bold" = { modifiers = ["bold"] }
-"markup.italic" = {  modifiers = ["italic"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = "my_turquoise2"
 "markup.link.text" = "my_white2"
 "markup.quote" = "my_brown"
diff --git a/runtime/themes/base16_default_dark.toml b/runtime/themes/base16_default_dark.toml
index 74bbcd2e..1a38a6ae 100644
--- a/runtime/themes/base16_default_dark.toml
+++ b/runtime/themes/base16_default_dark.toml
@@ -37,6 +37,7 @@
 "markup.list" = "base08"
 "markup.bold" = { fg = "base0A", modifiers = ["bold"] }
 "markup.italic" = { fg = "base0E", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "base09", modifiers = ["underlined"] }
 "markup.link.text" = "base08"
 "markup.quote" = "base0C"
diff --git a/runtime/themes/base16_default_light.toml b/runtime/themes/base16_default_light.toml
index 3784670f..84dab530 100644
--- a/runtime/themes/base16_default_light.toml
+++ b/runtime/themes/base16_default_light.toml
@@ -37,6 +37,7 @@
 "markup.list" = "base08"
 "markup.bold" = { fg = "base0A", modifiers = ["bold"] }
 "markup.italic" = { fg = "base0E", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "base09", modifiers = ["underlined"] }
 "markup.link.text" = "base08"
 "markup.quote" = "base0C"
diff --git a/runtime/themes/base16_terminal.toml b/runtime/themes/base16_terminal.toml
index 1f5328dc..f3975861 100644
--- a/runtime/themes/base16_terminal.toml
+++ b/runtime/themes/base16_terminal.toml
@@ -34,6 +34,7 @@
 "markup.list" = "light-red"
 "markup.bold" = { fg = "light-yellow", modifiers = ["bold"] }
 "markup.italic" = { fg = "light-magenta", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
 "markup.link.text" = "light-red"
 "markup.quote" = "light-cyan"
diff --git a/runtime/themes/base16_transparent.toml b/runtime/themes/base16_transparent.toml
index f8ee0890..fd07cb28 100644
--- a/runtime/themes/base16_transparent.toml
+++ b/runtime/themes/base16_transparent.toml
@@ -45,6 +45,7 @@
 "markup.list" = "light-red"
 "markup.bold" = { fg = "light-yellow", modifiers = ["bold"] }
 "markup.italic" = { fg = "light-magenta", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "yellow", underline = { color = "yellow", style = "line"} }
 "markup.link.text" = "light-red"
 "markup.quote" = "light-cyan"
diff --git a/runtime/themes/bogster.toml b/runtime/themes/bogster.toml
index f6d9fdbf..1ea13f1f 100644
--- a/runtime/themes/bogster.toml
+++ b/runtime/themes/bogster.toml
@@ -31,6 +31,7 @@
 "markup.list" = "bogster-red"
 "markup.bold" = { fg = "bogster-yellow", modifiers = ["bold"] }
 "markup.italic" = { fg = "bogster-purp", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "bogster-yellow", modifiers = ["underlined"] }
 "markup.link.text" = "bogster-red"
 "markup.quote" = "bogster-teal"
diff --git a/runtime/themes/bogster_light.toml b/runtime/themes/bogster_light.toml
index 2270f6ee..e528d89d 100644
--- a/runtime/themes/bogster_light.toml
+++ b/runtime/themes/bogster_light.toml
@@ -31,6 +31,7 @@
 "markup.list" = "bogster-red"
 "markup.bold" = { fg = "bogster-yellow", modifiers = ["bold"] }
 "markup.italic" = { fg = "magenta", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "bogster-yellow", modifiers = ["underlined"] }
 "markup.link.text" = "bogster-red"
 "markup.quote" = "bogster-lblue"
diff --git a/runtime/themes/boo_berry.toml b/runtime/themes/boo_berry.toml
index 33d7627d..62e3b372 100644
--- a/runtime/themes/boo_berry.toml
+++ b/runtime/themes/boo_berry.toml
@@ -22,6 +22,7 @@
 "markup.list" = { fg = "bubblegum" }
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "violet", modifiers = ["underlined"] }
 "markup.link.text" = { fg = "violet" }
 "markup.quote" = { fg = "berry_desaturated" }
diff --git a/runtime/themes/catppuccin_mocha.toml b/runtime/themes/catppuccin_mocha.toml
index 575ef303..2504fec8 100644
--- a/runtime/themes/catppuccin_mocha.toml
+++ b/runtime/themes/catppuccin_mocha.toml
@@ -50,6 +50,7 @@
 "markup.list" = "mauve"
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "rosewater", modifiers = ["italic", "underlined"] }
 "markup.link.text" = "blue"
 "markup.raw" = "flamingo"
diff --git a/runtime/themes/darcula.toml b/runtime/themes/darcula.toml
index ed2b081a..2779a944 100644
--- a/runtime/themes/darcula.toml
+++ b/runtime/themes/darcula.toml
@@ -56,6 +56,7 @@
 "markup.list" = "white"
 "markup.bold" = { fg = "white", modifiers = ["bold"] }
 "markup.italic" = { fg = "white", modifiers = ["italic"] }
+"markup.strikethrough" = { fg = "white", modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "lightblue", modifiers = ["underlined"] }
 "markup.link.text" = "white"
 "markup.quote" = "darkgreen"
diff --git a/runtime/themes/dark_high_contrast.toml b/runtime/themes/dark_high_contrast.toml
index 1c911eb5..897c31e2 100644
--- a/runtime/themes/dark_high_contrast.toml
+++ b/runtime/themes/dark_high_contrast.toml
@@ -84,6 +84,7 @@
 "markup.list" = "pink"
 "markup.bold" = { fg = "emerald_green", modifiers = ["bold"] }
 "markup.italic" = { fg = "blue", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "blue", underline = { color = "blue", style = "line" } }
 "markup.link.text" = "pink"
 "markup.quote" = "yellow"
diff --git a/runtime/themes/dark_plus.toml b/runtime/themes/dark_plus.toml
index b4e30798..be8245c4 100644
--- a/runtime/themes/dark_plus.toml
+++ b/runtime/themes/dark_plus.toml
@@ -44,6 +44,7 @@
 "markup.list" = "blue3"
 "markup.bold" = { fg = "blue2", modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { modifiers = ["underlined"] }
 "markup.link.text" = "orange"
 "markup.quote" = "dark_green"
diff --git a/runtime/themes/doom_acario_dark.toml b/runtime/themes/doom_acario_dark.toml
index c103dbfb..47f1dfca 100644
--- a/runtime/themes/doom_acario_dark.toml
+++ b/runtime/themes/doom_acario_dark.toml
@@ -29,6 +29,7 @@
 
 'markup.bold' = { fg = 'orange', modifiers = ['bold'] }
 'markup.italic' = { fg = 'magenta', modifiers = ['italic'] }
+'markup.strikethrough' = { modifiers = ['crossed_out'] }
 'markup.heading' = { fg = 'red' }
 'markup.link' = { fg = 'orange' }
 'markup.link.url' = { fg = 'magenta' }
diff --git a/runtime/themes/dracula.toml b/runtime/themes/dracula.toml
index 0f459311..109a1bb3 100644
--- a/runtime/themes/dracula.toml
+++ b/runtime/themes/dracula.toml
@@ -50,6 +50,7 @@
 "markup.list" = "cyan"
 "markup.bold" = { fg = "orange", modifiers = ["bold"] }
 "markup.italic" = { fg = "yellow", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = "cyan"
 "markup.link.text" = "pink"
 "markup.quote" = { fg = "yellow", modifiers = ["italic"] }
diff --git a/runtime/themes/dracula_at_night.toml b/runtime/themes/dracula_at_night.toml
index 4a32f930..9f10ec90 100644
--- a/runtime/themes/dracula_at_night.toml
+++ b/runtime/themes/dracula_at_night.toml
@@ -50,6 +50,7 @@
 "markup.list" = "cyan"
 "markup.bold" = { fg = "orange", modifiers = ["bold"] }
 "markup.italic" = { fg = "yellow", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = "cyan"
 "markup.link.text" = "pink"
 "markup.quote" = { fg = "yellow", modifiers = ["italic"] }
diff --git a/runtime/themes/emacs.toml b/runtime/themes/emacs.toml
index ea8e711c..bb33e2d8 100644
--- a/runtime/themes/emacs.toml
+++ b/runtime/themes/emacs.toml
@@ -37,6 +37,7 @@
 "markup.list" = { fg = "black" }
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "royalblue3", modifiers = ["underlined"] }
 "markup.link.text" = { fg = "royalblue3" }
 "markup.quote" = { fg = "gray60" }
diff --git a/runtime/themes/everforest_dark.toml b/runtime/themes/everforest_dark.toml
index 67aafbf2..4947e4f3 100644
--- a/runtime/themes/everforest_dark.toml
+++ b/runtime/themes/everforest_dark.toml
@@ -46,6 +46,7 @@
 "markup.list" = "red"
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "blue", modifiers = ["underlined"] }
 "markup.link.text" = "purple"
 "markup.quote" = "grey2"
diff --git a/runtime/themes/everforest_light.toml b/runtime/themes/everforest_light.toml
index 6daf7963..f9a55b0a 100644
--- a/runtime/themes/everforest_light.toml
+++ b/runtime/themes/everforest_light.toml
@@ -46,6 +46,7 @@
 "markup.list" = "red"
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "blue", modifiers = ["underlined"] }
 "markup.link.text" = "purple"
 "markup.quote" = "grey2"
diff --git a/runtime/themes/flatwhite.toml b/runtime/themes/flatwhite.toml
index 1743012b..5818b56b 100644
--- a/runtime/themes/flatwhite.toml
+++ b/runtime/themes/flatwhite.toml
@@ -37,14 +37,15 @@
 "markup.raw" = { fg = "orange_text", bg = "orange_bg" }
 "markup.raw.inline" = { fg = "orange_text", bg = "orange_bg" }
 "markup.raw.block" = { fg = "orange_text", bg = "orange_bg" }
+"markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "blue_text", bg = "blue_bg", modifiers = [
   "underlined",
 ] }
 "markup.link.label" = { fg = "blue_text", bg = "blue_bg" }
 "markup.link.text" = { fg = "blue_text", bg = "blue_bg" }
 "markup.quote" = { fg = "teal_text", bg = "teal_bg" }
-"markup.bold" = { modifiers = ["bold"] }
 "markup.list" = { fg = "purple_text", bg = "purple_bg" }
 
 "ui.background" = { fg = "base1", bg = "base7" }
diff --git a/runtime/themes/fleet_dark.toml b/runtime/themes/fleet_dark.toml
index f3285a76..0fc9e812 100644
--- a/runtime/themes/fleet_dark.toml
+++ b/runtime/themes/fleet_dark.toml
@@ -46,6 +46,7 @@
 # "markup.normal" = {} # .completion / .hover
 "markup.bold" = { fg = "lightest", modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.heading" = { fg = "cyan", modifiers = ["bold"] } # .marker / .1 / .2 / .3 / .4 / .5 / .6
 "markup.list" = "pink" # .unnumbered / .numbered
 "markup.list.numbered" = "cyan"
diff --git a/runtime/themes/github_dark.toml b/runtime/themes/github_dark.toml
index 2b6dbfde..4f9aa562 100644
--- a/runtime/themes/github_dark.toml
+++ b/runtime/themes/github_dark.toml
@@ -33,6 +33,7 @@ label = "scale.red.3"
 "markup.heading" = "scale.blue.2"
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { modifiers = ["underlined"] }
 "markup.link.text" = { fg = "scale.blue.1", modifiers = ["underlined"] }
 "markup.raw" = "scale.blue.2"
diff --git a/runtime/themes/github_light.toml b/runtime/themes/github_light.toml
index 3492460e..3e226969 100644
--- a/runtime/themes/github_light.toml
+++ b/runtime/themes/github_light.toml
@@ -33,6 +33,7 @@ label = "scale.red.5"
 "markup.heading" = "scale.blue.6"
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { modifiers = ["underlined"] }
 "markup.link.text" = { fg = "scale.blue.8", modifiers = ["underlined"] }
 "markup.raw" = "scale.blue.6"
diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml
index c293fc3e..b88becd1 100644
--- a/runtime/themes/gruvbox.toml
+++ b/runtime/themes/gruvbox.toml
@@ -69,6 +69,7 @@
 "markup.heading" = "aqua1"
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "green1", modifiers = ["underlined"] }
 "markup.link.text" = "red1"
 "markup.raw" = "red1"
diff --git a/runtime/themes/gruvbox_dark_hard.toml b/runtime/themes/gruvbox_dark_hard.toml
index f39cd906..7fe45e8c 100644
--- a/runtime/themes/gruvbox_dark_hard.toml
+++ b/runtime/themes/gruvbox_dark_hard.toml
@@ -70,6 +70,7 @@
 "markup.heading" = "aqua1"
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "green1", modifiers = ["underlined"] }
 "markup.link.text" = "red1"
 "markup.raw" = "red1"
diff --git a/runtime/themes/gruvbox_light.toml b/runtime/themes/gruvbox_light.toml
index 8ea9d625..bd1a5ef2 100644
--- a/runtime/themes/gruvbox_light.toml
+++ b/runtime/themes/gruvbox_light.toml
@@ -70,6 +70,7 @@
 "markup.heading" = "aqua1"
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "green1", modifiers = ["underlined"] }
 "markup.link.text" = "red1"
 "markup.raw" = "red1"
diff --git a/runtime/themes/hex_steel.toml b/runtime/themes/hex_steel.toml
index c9b62559..c81df409 100644
--- a/runtime/themes/hex_steel.toml
+++ b/runtime/themes/hex_steel.toml
@@ -75,6 +75,7 @@
 "markup.list" = { fg = "t4" }
 "markup.bold" = { fg = "t4" }
 "markup.italic" = { fg = "t4" }
+"markup.strikethrough" = { fg = "t4", modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "t4", modifiers = ["underlined"] }
 "markup.link.text" = { fg = "t4" }
 "markup.quote" = { fg = "t4" }
diff --git a/runtime/themes/ingrid.toml b/runtime/themes/ingrid.toml
index fa1a4fdb..8942c3ca 100644
--- a/runtime/themes/ingrid.toml
+++ b/runtime/themes/ingrid.toml
@@ -33,6 +33,7 @@
 "markup.list" = "red"
 "markup.bold" = { fg = "yellow", modifiers = ["bold"] }
 "markup.italic" = { fg = "magenta", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
 "markup.link.text" = "red"
 "markup.quote" = "cyan"
diff --git a/runtime/themes/kanagawa.toml b/runtime/themes/kanagawa.toml
index a12a0912..16e27362 100644
--- a/runtime/themes/kanagawa.toml
+++ b/runtime/themes/kanagawa.toml
@@ -97,6 +97,7 @@ hint = "dragonBlue"
 "markup.list" = "oniViolet"
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "springBlue", modifiers = ["underlined"] }
 "markup.link.text" = "crystalBlue"
 "markup.quote" = "seaFoam"
diff --git a/runtime/themes/meliora.toml b/runtime/themes/meliora.toml
index d4cb9883..e7037e18 100644
--- a/runtime/themes/meliora.toml
+++ b/runtime/themes/meliora.toml
@@ -67,8 +67,9 @@
 
 "markup.heading" = { fg = "orange" }
 "markup.list" = { fg = "blue" }
-"markup.bold" = { fg = "magenta" }
-"markup.italic" = { fg = "blue" }
+"markup.bold" = { fg = "magenta", modifiers = ["bold"] }
+"markup.italic" = { fg = "blue", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "comment" , modifiers = ["underlined"] }
 "markup.link.text" = { fg = "comment" }
 "markup.quote" = { fg = "yellow" }
diff --git a/runtime/themes/mellow.toml b/runtime/themes/mellow.toml
index a878df8a..279fd5c2 100644
--- a/runtime/themes/mellow.toml
+++ b/runtime/themes/mellow.toml
@@ -50,6 +50,7 @@
 "markup.list" = "gray06"
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "green", modifiers = ["underlined"] }
 "markup.link.text" = { fg = "blue", modifiers = ["italic"] }
 "markup.raw" = "yellow"
diff --git a/runtime/themes/monokai.toml b/runtime/themes/monokai.toml
index 92b81a8e..b75912f7 100644
--- a/runtime/themes/monokai.toml
+++ b/runtime/themes/monokai.toml
@@ -46,6 +46,7 @@
 "markup.list" = "red"
 "markup.bold" = { fg = "yellow", modifiers = ["bold"] }
 "markup.italic" = { fg = "magenta", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
 "markup.link.text" = "red"
 "markup.quote" = "cyan"
diff --git a/runtime/themes/monokai_pro.toml b/runtime/themes/monokai_pro.toml
index 276f1f94..57bede94 100644
--- a/runtime/themes/monokai_pro.toml
+++ b/runtime/themes/monokai_pro.toml
@@ -99,6 +99,7 @@
 "markup.heading" = "green"
 "markup.bold" = { fg = "orange", modifiers = ["bold"] }
 "markup.italic" = { fg = "orange", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "orange", modifiers = ["underlined"] }
 "markup.link.text" = "yellow"
 "markup.quote" = "green"
diff --git a/runtime/themes/monokai_pro_machine.toml b/runtime/themes/monokai_pro_machine.toml
index ae391f3d..b292e6b0 100644
--- a/runtime/themes/monokai_pro_machine.toml
+++ b/runtime/themes/monokai_pro_machine.toml
@@ -96,6 +96,7 @@
 "markup.heading" = "green"
 "markup.bold" = { fg = "orange", modifiers = ["bold"] }
 "markup.italic" = { fg = "orange", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "orange", modifiers = ["underlined"] }
 "markup.link.text" = "yellow"
 "markup.quote" = "green"
diff --git a/runtime/themes/monokai_pro_octagon.toml b/runtime/themes/monokai_pro_octagon.toml
index 70e8f05b..3236fc16 100644
--- a/runtime/themes/monokai_pro_octagon.toml
+++ b/runtime/themes/monokai_pro_octagon.toml
@@ -99,6 +99,7 @@
 "markup.heading" = "green"
 "markup.bold" = { fg = "orange", modifiers = ["bold"] }
 "markup.italic" = { fg = "orange", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "orange", modifiers = ["underlined"] }
 "markup.link.text" = "yellow"
 "markup.quote" = "green"
diff --git a/runtime/themes/monokai_pro_ristretto.toml b/runtime/themes/monokai_pro_ristretto.toml
index ab740446..f897bddb 100644
--- a/runtime/themes/monokai_pro_ristretto.toml
+++ b/runtime/themes/monokai_pro_ristretto.toml
@@ -96,6 +96,7 @@
 "markup.heading" = "green"
 "markup.bold" = { fg = "orange", modifiers = ["bold"] }
 "markup.italic" = { fg = "orange", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "orange", modifiers = ["underlined"] }
 "markup.link.text" = "yellow"
 "markup.quote" = "green"
diff --git a/runtime/themes/monokai_pro_spectrum.toml b/runtime/themes/monokai_pro_spectrum.toml
index 76123fcf..74533404 100644
--- a/runtime/themes/monokai_pro_spectrum.toml
+++ b/runtime/themes/monokai_pro_spectrum.toml
@@ -96,6 +96,7 @@
 "markup.heading" = "green"
 "markup.bold" = { fg = "orange", modifiers = ["bold"] }
 "markup.italic" = { fg = "orange", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "orange", modifiers = ["underlined"] }
 "markup.link.text" = "yellow"
 "markup.quote" = "green"
diff --git a/runtime/themes/night_owl.toml b/runtime/themes/night_owl.toml
index 7ef6e214..fc27dc7c 100644
--- a/runtime/themes/night_owl.toml
+++ b/runtime/themes/night_owl.toml
@@ -80,6 +80,7 @@
 'markup.list' = { fg = 'pink' }
 'markup.bold' = { fg = 'foreground', modifiers = ['bold'] }
 'markup.italic' = { fg = 'foreground', modifiers = ['italic'] }
+'markup.strikethrough' = { fg = 'foreground', modifiers = ['crossed_out'] }
 'markup.link' = { fg = 'pink', modifiers = ['underlined'] }
 'markup.link.url' = { fg = 'slate', modifiers = ['underlined'] }
 'markup.quote' = { fg = 'green', modifiers = ['italic'] }
diff --git a/runtime/themes/nightfox.toml b/runtime/themes/nightfox.toml
index 1f248d5c..8cddbbae 100644
--- a/runtime/themes/nightfox.toml
+++ b/runtime/themes/nightfox.toml
@@ -55,6 +55,7 @@
 "markup.list" = { fg = "magenta", modifiers = ["bold"] }
 "markup.bold" = { fg = "orange", modifiers = ["bold"] }
 "markup.italic" = { fg = "pink" }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link" = { fg = "yellow-bright", modifiers = ["bold"] }
 "markup.quote" = { fg = "blue" }
 
diff --git a/runtime/themes/noctis.toml b/runtime/themes/noctis.toml
index e5abbec0..81733e63 100644
--- a/runtime/themes/noctis.toml
+++ b/runtime/themes/noctis.toml
@@ -150,6 +150,7 @@
 
 'markup.bold' = { modifiers = ["bold"] } # Bold text.
 'markup.italic' = { modifiers = ["italic"] } # Italicised text.
+"markup.strikethrough" = { modifiers = ["crossed_out"] } # Crossed out text.
 
 'markup.link' = { fg = "light-blue", modifiers = ["underlined"] }
 'markup.link.url' = { } # Urls pointed to by links.
diff --git a/runtime/themes/noctis_bordo.toml b/runtime/themes/noctis_bordo.toml
index d446543d..c3bbe79c 100644
--- a/runtime/themes/noctis_bordo.toml
+++ b/runtime/themes/noctis_bordo.toml
@@ -49,6 +49,7 @@
 "markup.list" = "base08"
 "markup.quote" = "base0C"
 "markup.raw" = "base0B"
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 
 "diff.delta" = "base09"
 "diff.plus" = "base0B"
diff --git a/runtime/themes/nord.toml b/runtime/themes/nord.toml
index 7eba10ac..c653f539 100644
--- a/runtime/themes/nord.toml
+++ b/runtime/themes/nord.toml
@@ -95,6 +95,7 @@
 "markup.list" = "nord9"
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.text" = "nord8"
 "markup.raw" = "nord7"
 
diff --git a/runtime/themes/onedark.toml b/runtime/themes/onedark.toml
index c4a56b90..9cab0901 100644
--- a/runtime/themes/onedark.toml
+++ b/runtime/themes/onedark.toml
@@ -30,6 +30,7 @@
 "markup.raw.inline" = { fg = "green" }
 "markup.bold" = { fg = "gold", modifiers = ["bold"] }
 "markup.italic" = { fg = "purple", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.list" = { fg = "red" }
 "markup.quote" = { fg = "yellow" }
 "markup.link.url" = { fg = "cyan", modifiers = ["underlined"]}
diff --git a/runtime/themes/onedarker.toml b/runtime/themes/onedarker.toml
index 7a6e4a62..33f900cc 100644
--- a/runtime/themes/onedarker.toml
+++ b/runtime/themes/onedarker.toml
@@ -31,6 +31,7 @@
 "markup.raw.block" = { fg = "white" }
 "markup.bold" = { fg = "gold", modifiers = ["bold"] }
 "markup.italic" = { fg = "purple", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.list" = { fg = "red" }
 "markup.quote" = { fg = "yellow" }
 "markup.link.url" = { fg = "blue", modifiers = ["underlined"]}
diff --git a/runtime/themes/onelight.toml b/runtime/themes/onelight.toml
index ad900a78..7c266979 100644
--- a/runtime/themes/onelight.toml
+++ b/runtime/themes/onelight.toml
@@ -48,6 +48,7 @@
 "markup.raw.inline" = { fg = "green", bg = "grey-200" }
 "markup.bold" = { fg = "yellow", modifiers = ["bold"] }
 "markup.italic" = { fg = "purple", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.list" = { fg = "light-blue" }
 "markup.quote" = { fg = "gray" }
 "markup.link.url" = { fg = "cyan", modifiers = ["underlined"] }
diff --git a/runtime/themes/papercolor-dark.toml b/runtime/themes/papercolor-dark.toml
index d4b62660..088658e9 100644
--- a/runtime/themes/papercolor-dark.toml
+++ b/runtime/themes/papercolor-dark.toml
@@ -31,6 +31,7 @@
 "markup.list" = "bright3"
 "markup.bold" = { fg = "foreground", modifiers = ["bold"] }
 "markup.italic" = { fg = "bright0", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "bright6", modifiers = ["underlined"] }
 "markup.link.text" = "bright2"
 "markup.link.label" = { fg = "regular2", modifiers = ["bold"] }
diff --git a/runtime/themes/papercolor-light.toml b/runtime/themes/papercolor-light.toml
index 0d3fc77c..c44c6709 100644
--- a/runtime/themes/papercolor-light.toml
+++ b/runtime/themes/papercolor-light.toml
@@ -32,6 +32,7 @@
 "markup.list" = "regular4"
 "markup.bold" = { fg = "foreground", modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "regular4", modifiers = ["underlined"] }
 "markup.link.text" = "bright2"
 "markup.link.label" = { fg = "regular7", modifiers = ["bold"] }
diff --git a/runtime/themes/penumbra+.toml b/runtime/themes/penumbra+.toml
index 62db2f8a..bc53e82e 100644
--- a/runtime/themes/penumbra+.toml
+++ b/runtime/themes/penumbra+.toml
@@ -95,6 +95,7 @@ error = "red"
 "markup.list" = "sky"
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { modifiers = ["underlined"] }
 "markup.link.text" = "magenta"
 "markup.quote" = "green"
diff --git a/runtime/themes/pop-dark.toml b/runtime/themes/pop-dark.toml
index bd16f34b..2ee55903 100644
--- a/runtime/themes/pop-dark.toml
+++ b/runtime/themes/pop-dark.toml
@@ -103,6 +103,7 @@ namespace = { fg = 'orangeL' }
 'markup.list.unnumbered' = { fg = 'greenN' }
 'markup.bold' = { modifiers = ['bold'] }
 'markup.italic' = { modifiers = ['italic'] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 'markup.link' = { fg = 'blueD' }
 'markup.link.url' = { fg = 'blueL' }
 'markup.link.label' = { fg = 'blueH' }
diff --git a/runtime/themes/rasmus.toml b/runtime/themes/rasmus.toml
index 996271d3..3158a6a4 100644
--- a/runtime/themes/rasmus.toml
+++ b/runtime/themes/rasmus.toml
@@ -55,6 +55,7 @@
 "markup.list" = "gray07"
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "cyan", modifiers = ["underlined"] }
 "markup.link.text" = "blue"
 "markup.raw" = "yellow"
diff --git a/runtime/themes/rose_pine.toml b/runtime/themes/rose_pine.toml
index 3386fffb..06e89306 100644
--- a/runtime/themes/rose_pine.toml
+++ b/runtime/themes/rose_pine.toml
@@ -143,6 +143,7 @@
 # "markup.list.numbered" = ""
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link" = "iris"
 "markup.link.url" = { fg = "iris",  underline = { color = "iris", style = "line" } } 
 "markup.link.label" = "subtle"
diff --git a/runtime/themes/serika-dark.toml b/runtime/themes/serika-dark.toml
index 480dc2cc..ba9bd3b3 100644
--- a/runtime/themes/serika-dark.toml
+++ b/runtime/themes/serika-dark.toml
@@ -71,6 +71,7 @@
 "markup.list" = "cyan"
 "markup.bold" = { fg = "orange", modifiers = ["bold"] }
 "markup.italic" = { fg = "yellow", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = "cyan"
 "markup.link.text" = "pink"
 "markup.quote" = { fg = "yellow", modifiers = ["italic"] }
diff --git a/runtime/themes/serika-light.toml b/runtime/themes/serika-light.toml
index 8a62e23d..bac8b240 100644
--- a/runtime/themes/serika-light.toml
+++ b/runtime/themes/serika-light.toml
@@ -71,6 +71,7 @@
 "markup.list" = "cyan"
 "markup.bold" = { fg = "orange", modifiers = ["bold"] }
 "markup.italic" = { fg = "yellow", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = "cyan"
 "markup.link.text" = "pink"
 "markup.quote" = { fg = "yellow", modifiers = ["italic"] }
diff --git a/runtime/themes/snazzy.toml b/runtime/themes/snazzy.toml
index 110e2093..eb88c5eb 100644
--- a/runtime/themes/snazzy.toml
+++ b/runtime/themes/snazzy.toml
@@ -84,6 +84,7 @@
 "markup.list" = "cyan"
 "markup.bold" = { fg = "blue", modifiers = ["bold"] }
 "markup.italic" = { fg = "yellow", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = "cyan"
 "markup.link.text" = "magenta"
 "markup.quote" = { fg = "yellow", modifiers = ["italic"] }
diff --git a/runtime/themes/solarized_dark.toml b/runtime/themes/solarized_dark.toml
index a81c9299..6e5b790b 100644
--- a/runtime/themes/solarized_dark.toml
+++ b/runtime/themes/solarized_dark.toml
@@ -27,6 +27,7 @@
 "markup.list" = "red"
 "markup.bold" = { fg = "yellow", modifiers = ["bold"] }
 "markup.italic" = { fg = "magenta", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
 "markup.link.text" = "red"
 "markup.quote" = "cyan"
diff --git a/runtime/themes/solarized_light.toml b/runtime/themes/solarized_light.toml
index 849751e8..ba21b90e 100644
--- a/runtime/themes/solarized_light.toml
+++ b/runtime/themes/solarized_light.toml
@@ -27,6 +27,7 @@
 "markup.list" = "red"
 "markup.bold" = { fg = "yellow", modifiers = ["bold"] }
 "markup.italic" = { fg = "magenta", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
 "markup.link.text" = "red"
 "markup.quote" = "cyan"
diff --git a/runtime/themes/sonokai.toml b/runtime/themes/sonokai.toml
index 19f187d5..06aff50b 100644
--- a/runtime/themes/sonokai.toml
+++ b/runtime/themes/sonokai.toml
@@ -41,6 +41,7 @@
 "markup.list" = "red"
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "blue", modifiers = ["underlined"] }
 "markup.link.text" = "purple"
 "markup.quote" = "grey"
diff --git a/runtime/themes/spacebones_light.toml b/runtime/themes/spacebones_light.toml
index f01b19dc..a62c7c82 100644
--- a/runtime/themes/spacebones_light.toml
+++ b/runtime/themes/spacebones_light.toml
@@ -34,6 +34,7 @@
 "markup.list" = "theme_red"
 "markup.bold" = { fg = "theme_yellow", modifiers = ["bold"] }
 "markup.italic" = { fg = "theme_magenta", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "theme_yellow", modifiers = ["underlined"] }
 "markup.link.text" = "theme_red"
 "markup.quote" = "theme_cyan"
diff --git a/runtime/themes/tokyonight.toml b/runtime/themes/tokyonight.toml
index 35ceaeba..4b082dc7 100644
--- a/runtime/themes/tokyonight.toml
+++ b/runtime/themes/tokyonight.toml
@@ -64,6 +64,7 @@
 "markup.list" = { fg = "cyan" }
 "markup.bold" = { fg = "orange", modifiers = ["bold"] }
 "markup.italic" = { fg = "yellow", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "green" }
 "markup.link.text" = { fg = "light-gray" }
 "markup.quote" = { fg = "yellow", modifiers = ["italic"] }
diff --git a/theme.toml b/theme.toml
index c7b5dc84..b67eaecc 100644
--- a/theme.toml
+++ b/theme.toml
@@ -31,6 +31,7 @@ label = "honey"
 "markup.heading" = "lilac"
 "markup.bold" = { modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
 "markup.link.url" = { fg = "silver", modifiers = ["underlined"] }
 "markup.link.text" = "almond"
 "markup.raw" = "almond"

From d99a72053676658759ef6ae7531f432daabb025a Mon Sep 17 00:00:00 2001
From: Luca Saccarola <96259932+saccarosium@users.noreply.github.com>
Date: Sat, 21 Jan 2023 23:52:56 +0100
Subject: [PATCH 780/884] theme: make dracula ui.virtual.whitespace less
 intrusive (#5627)

---
 runtime/themes/dracula.toml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/runtime/themes/dracula.toml b/runtime/themes/dracula.toml
index 109a1bb3..51464824 100644
--- a/runtime/themes/dracula.toml
+++ b/runtime/themes/dracula.toml
@@ -40,7 +40,7 @@
 "ui.text" = { fg = "foreground" }
 "ui.text.focus" = { fg = "cyan" }
 "ui.window" = { fg = "foreground" }
-"ui.virtual.whitespace" = { fg = "comment" }
+"ui.virtual.whitespace" = { fg = "subtle" }
 "ui.virtual.ruler" = { bg = "background_dark"}
 
 "error" = { fg = "red" }
@@ -64,6 +64,7 @@ background = "#282a36"
 background_dark = "#21222c"
 primary_highlight = "#800049"
 secondary_highlight = "#4d4f66"
+subtle = "#424450"
 foreground = "#f8f8f2"
 comment = "#6272a4"
 red = "#ff5555"
@@ -73,3 +74,4 @@ green = "#50fa7b"
 purple = "#bd93f9"
 cyan = "#8be9fd"
 pink = "#ff79c6"
+

From c8d77cfdb5f3f6ad04e9ffc5de8de33a0594447a Mon Sep 17 00:00:00 2001
From: Yuta Yamaguchi <yamaguchi7073xtt@gmail.com>
Date: Mon, 23 Jan 2023 03:04:14 +0900
Subject: [PATCH 781/884] refactor(helix-view): remove cfg_attr references a
 nonexistent feature (#5630)

Fixes https://github.com/helix-editor/helix/issues/5615
---
 helix-view/src/graphics.rs | 3 ---
 helix-view/src/keyboard.rs | 1 -
 2 files changed, 4 deletions(-)

diff --git a/helix-view/src/graphics.rs b/helix-view/src/graphics.rs
index 9264c50f..a0b645fa 100644
--- a/helix-view/src/graphics.rs
+++ b/helix-view/src/graphics.rs
@@ -251,7 +251,6 @@ impl Rect {
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum Color {
     Reset,
     Black,
@@ -353,7 +352,6 @@ bitflags! {
     ///
     /// let m = Modifier::BOLD | Modifier::ITALIC;
     /// ```
-    #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
     pub struct Modifier: u16 {
         const BOLD              = 0b0000_0000_0001;
         const DIM               = 0b0000_0000_0010;
@@ -450,7 +448,6 @@ impl FromStr for Modifier {
 /// );
 /// ```
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct Style {
     pub fg: Option<Color>,
     pub bg: Option<Color>,
diff --git a/helix-view/src/keyboard.rs b/helix-view/src/keyboard.rs
index cf673e11..04a9922a 100644
--- a/helix-view/src/keyboard.rs
+++ b/helix-view/src/keyboard.rs
@@ -2,7 +2,6 @@ use bitflags::bitflags;
 
 bitflags! {
     /// Represents key modifiers (shift, control, alt).
-    #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
     pub struct KeyModifiers: u8 {
         const SHIFT = 0b0000_0001;
         const CONTROL = 0b0000_0010;

From 5c6b7127f88ef7508cefec74e2dc6479e1cfa609 Mon Sep 17 00:00:00 2001
From: Jared Moulton <jared.moulton@bakerhughes.com>
Date: Mon, 23 Jan 2023 00:49:54 -0700
Subject: [PATCH 782/884] Add build.gradle to list of java roots (#5641)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 32383513..cdfd3a2d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -652,7 +652,7 @@ name = "java"
 scope = "source.java"
 injection-regex = "java"
 file-types = ["java"]
-roots = ["pom.xml"]
+roots = ["pom.xml", "build.gradle"]
 language-server = { command = "jdtls" }
 indent = { tab-width = 4, unit = "    " }
 

From 769fb5fe97ac321ba030ac8fbf7e3793700f282c Mon Sep 17 00:00:00 2001
From: Jonathan LEI <me@xjonathan.dev>
Date: Mon, 23 Jan 2023 21:51:34 +0800
Subject: [PATCH 783/884] Make clippy happy on Windows (#5644)

---
 helix-view/src/editor.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 9af8e4c3..eef4a3f9 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -296,10 +296,10 @@ pub fn get_terminal_provider() -> Option<TerminalConfig> {
         });
     }
 
-    return Some(TerminalConfig {
+    Some(TerminalConfig {
         command: "conhost".to_string(),
         args: vec!["cmd".to_string(), "/C".to_string()],
-    });
+    })
 }
 
 #[cfg(not(any(windows, target_os = "wasm32")))]

From 17acadb305bebfef094e4fcc9ba1e6fda6159c3b Mon Sep 17 00:00:00 2001
From: Eric Crosson <EricCrosson@users.noreply.github.com>
Date: Mon, 23 Jan 2023 08:51:42 -0600
Subject: [PATCH 784/884] Use markdown language for hub pull-request files
 (#5634)

The hub[^1] command-line tool uses a file called `PULLREQ_EDITMSG`[^2].
This file is used to edit the text from of each commit being submitted
in a pull request, and the final content is rendered as markdown by
GitHub.

This commit adds `PULLREQ_EDITMSG` to the list of markdown file-types.

[^1]: https://github.com/github/hub
[^2]: https://github.com/github/hub/blob/c8e68d548a39ec0fab6f674a669c21b54d4eec61/commands/pull_request.go#L225
---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index cdfd3a2d..d1ab92b6 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1019,7 +1019,7 @@ source = { git = "https://github.com/Flakebi/tree-sitter-tablegen", rev = "568dd
 name = "markdown"
 scope = "source.md"
 injection-regex = "md|markdown"
-file-types = ["md", "markdown"]
+file-types = ["md", "markdown", "PULLREQ_EDITMSG"]
 roots = [".marksman.toml"]
 language-server = { command = "marksman", args=["server"] }
 indent = { tab-width = 2, unit = "  " }

From 361a8344866841799199e362285b119960151eff Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Mon, 23 Jan 2023 18:18:44 +0100
Subject: [PATCH 785/884] Fix selecting a changed file in global search (#5639)

---
 helix-term/src/commands.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index e773a2c7..e7091401 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2003,6 +2003,10 @@ fn global_search(cx: &mut Context) {
                         let line_num = *line_num;
                         let (view, doc) = current!(cx.editor);
                         let text = doc.text();
+                        if line_num >= text.len_lines() {
+                            cx.editor.set_error("The line you jumped to does not exist anymore because the file has changed.");
+                            return;
+                        }
                         let start = text.line_to_char(line_num);
                         let end = text.line_to_char((line_num + 1).min(text.len_lines()));
 

From 7e191f59157d024e8b8aaabc62f292183d39f6f9 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Mon, 23 Jan 2023 19:10:27 +0100
Subject: [PATCH 786/884] Support sagemath language (#5649)

---
 book/src/generated/lang-support.md   |  1 +
 languages.toml                       | 10 ++++++++++
 runtime/queries/sage/highlights.scm  |  1 +
 runtime/queries/sage/injections.scm  |  2 ++
 runtime/queries/sage/textobjects.scm |  1 +
 5 files changed, 15 insertions(+)
 create mode 100644 runtime/queries/sage/highlights.scm
 create mode 100644 runtime/queries/sage/injections.scm
 create mode 100644 runtime/queries/sage/textobjects.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 00e6a91e..c0b5b558 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -109,6 +109,7 @@
 | ron | ✓ |  | ✓ |  |
 | ruby | ✓ | ✓ | ✓ | `solargraph` |
 | rust | ✓ | ✓ | ✓ | `rust-analyzer` |
+| sage | ✓ | ✓ |  |  |
 | scala | ✓ |  | ✓ | `metals` |
 | scheme | ✓ |  |  |  |
 | scss | ✓ |  |  | `vscode-css-language-server` |
diff --git a/languages.toml b/languages.toml
index d1ab92b6..1685c2a3 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2109,3 +2109,13 @@ formatter = { command = "dhall" , args = ["format"] }
 [[grammar]]
 name = "dhall"
 source = { git = "https://github.com/jbellerb/tree-sitter-dhall", rev = "affb6ee38d629c9296749767ab832d69bb0d9ea8" }
+
+[[language]]
+name = "sage"
+scope = "source.sage"
+file-types = ["sage"]
+injection-regex = "sage"
+roots = []
+comment-token = "#"
+indent = { tab-width = 4, unit = "    " }
+grammar = "python"
diff --git a/runtime/queries/sage/highlights.scm b/runtime/queries/sage/highlights.scm
new file mode 100644
index 00000000..0b920cbf
--- /dev/null
+++ b/runtime/queries/sage/highlights.scm
@@ -0,0 +1 @@
+; inherits: python
diff --git a/runtime/queries/sage/injections.scm b/runtime/queries/sage/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/sage/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/sage/textobjects.scm b/runtime/queries/sage/textobjects.scm
new file mode 100644
index 00000000..0b920cbf
--- /dev/null
+++ b/runtime/queries/sage/textobjects.scm
@@ -0,0 +1 @@
+; inherits: python

From 639f22559e0b9354b02305a21c2423784d9f630e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Jan 2023 17:24:42 -0600
Subject: [PATCH 787/884] build(deps): bump tokio from 1.24.1 to 1.24.2 (#5657)

Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.24.1 to 1.24.2.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/commits)

---
updated-dependencies:
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 665eb4b9..84eaf7e6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2122,9 +2122,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.24.1"
+version = "1.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae"
+checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb"
 dependencies = [
  "autocfg",
  "bytes",

From 64ec0256d3e41d6b6e5a24f749489880a147ab8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Jan 2023 17:25:49 -0600
Subject: [PATCH 788/884] build(deps): bump which from 4.3.0 to 4.4.0 (#5655)

Bumps [which](https://github.com/harryfei/which-rs) from 4.3.0 to 4.4.0.
- [Release notes](https://github.com/harryfei/which-rs/releases)
- [Commits](https://github.com/harryfei/which-rs/compare/4.3.0...4.4.0)

---
updated-dependencies:
- dependency-name: which
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 4 ++--
 helix-dap/Cargo.toml  | 2 +-
 helix-lsp/Cargo.toml  | 2 +-
 helix-term/Cargo.toml | 2 +-
 helix-view/Cargo.toml | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 84eaf7e6..96d75697 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2336,9 +2336,9 @@ checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
 
 [[package]]
 name = "which"
-version = "4.3.0"
+version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
+checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
 dependencies = [
  "either",
  "libc",
diff --git a/helix-dap/Cargo.toml b/helix-dap/Cargo.toml
index 95a05905..d42ce23f 100644
--- a/helix-dap/Cargo.toml
+++ b/helix-dap/Cargo.toml
@@ -19,7 +19,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "net", "sync"] }
-which = "4.2"
+which = "4.4"
 
 [dev-dependencies]
 fern = "0.6"
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index d31731d2..0db61ad4 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -25,4 +25,4 @@ serde_json = "1.0"
 thiserror = "1.0"
 tokio = { version = "1.24", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
 tokio-stream = "0.1.11"
-which = "4.2"
+which = "4.4"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 895a0882..d4eebefb 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -37,7 +37,7 @@ helix-loader = { version = "0.6", path = "../helix-loader" }
 anyhow = "1"
 once_cell = "1.17"
 
-which = "4.2"
+which = "4.4"
 
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
 tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index 7d130317..c75291cc 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -42,7 +42,7 @@ serde_json = "1.0"
 toml = "0.5"
 log = "~0.4"
 
-which = "4.2"
+which = "4.4"
 
 
 [target.'cfg(windows)'.dependencies]

From e9dc9f493554bd54ea3710e66a2fb0fd2e70b462 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Tue, 24 Jan 2023 17:07:01 +0100
Subject: [PATCH 789/884] Switch from toml::from_slice to toml::from_str
 (#5659)

---
 helix-loader/src/config.rs |  9 ++++++---
 helix-loader/src/lib.rs    | 12 ++++++++----
 helix-view/src/theme.rs    | 12 +++++++-----
 xtask/src/helpers.rs       |  4 ++--
 xtask/src/themelint.rs     |  4 ++--
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/helix-loader/src/config.rs b/helix-loader/src/config.rs
index 259b1318..a4c6dcbd 100644
--- a/helix-loader/src/config.rs
+++ b/helix-loader/src/config.rs
@@ -1,6 +1,9 @@
+use std::str::from_utf8;
+
 /// Default built-in languages.toml.
 pub fn default_lang_config() -> toml::Value {
-    toml::from_slice(include_bytes!("../../languages.toml"))
+    let default_config = include_bytes!("../../languages.toml");
+    toml::from_str(from_utf8(default_config).unwrap())
         .expect("Could not parse built-in languages.toml to valid toml")
 }
 
@@ -11,8 +14,8 @@ pub fn user_lang_config() -> Result<toml::Value, toml::de::Error> {
         .chain([crate::config_dir()].into_iter())
         .map(|path| path.join("languages.toml"))
         .filter_map(|file| {
-            std::fs::read(&file)
-                .map(|config| toml::from_slice(&config))
+            std::fs::read_to_string(&file)
+                .map(|config| toml::from_str(&config))
                 .ok()
         })
         .collect::<Result<Vec<_>, _>>()?
diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs
index 80d44a82..8dc2928a 100644
--- a/helix-loader/src/lib.rs
+++ b/helix-loader/src/lib.rs
@@ -179,6 +179,8 @@ pub fn merge_toml_values(left: toml::Value, right: toml::Value, merge_depth: usi
 
 #[cfg(test)]
 mod merge_toml_tests {
+    use std::str;
+
     use super::merge_toml_values;
     use toml::Value;
 
@@ -191,8 +193,9 @@ mod merge_toml_tests {
         indent = { tab-width = 4, unit = "    ", test = "aaa" }
         "#;
 
-        let base: Value = toml::from_slice(include_bytes!("../../languages.toml"))
-            .expect("Couldn't parse built-in languages config");
+        let base = include_bytes!("../../languages.toml");
+        let base = str::from_utf8(base).expect("Couldn't parse built-in languages config");
+        let base: Value = toml::from_str(base).expect("Couldn't parse built-in languages config");
         let user: Value = toml::from_str(USER).unwrap();
 
         let merged = merge_toml_values(base, user, 3);
@@ -224,8 +227,9 @@ mod merge_toml_tests {
         language-server = { command = "deno", args = ["lsp"] }
         "#;
 
-        let base: Value = toml::from_slice(include_bytes!("../../languages.toml"))
-            .expect("Couldn't parse built-in languages config");
+        let base = include_bytes!("../../languages.toml");
+        let base = str::from_utf8(base).expect("Couldn't parse built-in languages config");
+        let base: Value = toml::from_str(base).expect("Couldn't parse built-in languages config");
         let user: Value = toml::from_str(USER).unwrap();
 
         let merged = merge_toml_values(base, user, 3);
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index cb0d3ac4..9eae88a8 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -1,6 +1,7 @@
 use std::{
     collections::HashMap,
     path::{Path, PathBuf},
+    str,
 };
 
 use anyhow::{anyhow, Context, Result};
@@ -15,12 +16,13 @@ use crate::graphics::UnderlineStyle;
 pub use crate::graphics::{Color, Modifier, Style};
 
 pub static DEFAULT_THEME_DATA: Lazy<Value> = Lazy::new(|| {
-    toml::from_slice(include_bytes!("../../theme.toml")).expect("Failed to parse default theme")
+    let bytes = include_bytes!("../../theme.toml");
+    toml::from_str(str::from_utf8(bytes).unwrap()).expect("Failed to parse base default theme")
 });
 
 pub static BASE16_DEFAULT_THEME_DATA: Lazy<Value> = Lazy::new(|| {
-    toml::from_slice(include_bytes!("../../base16_theme.toml"))
-        .expect("Failed to parse base 16 default theme")
+    let bytes = include_bytes!("../../base16_theme.toml");
+    toml::from_str(str::from_utf8(bytes).unwrap()).expect("Failed to parse base 16 default theme")
 });
 
 pub static DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| Theme {
@@ -148,8 +150,8 @@ impl Loader {
 
     // Loads the theme data as `toml::Value` first from the user_dir then in default_dir
     fn load_toml(&self, path: PathBuf) -> Result<Value> {
-        let data = std::fs::read(&path)?;
-        let value = toml::from_slice(data.as_slice())?;
+        let data = std::fs::read_to_string(&path)?;
+        let value = toml::from_str(&data)?;
 
         Ok(value)
     }
diff --git a/xtask/src/helpers.rs b/xtask/src/helpers.rs
index 4f759e74..f96cdfb3 100644
--- a/xtask/src/helpers.rs
+++ b/xtask/src/helpers.rs
@@ -39,6 +39,6 @@ pub fn find_files(dir: &Path, filename: &str) -> Vec<PathBuf> {
 }
 
 pub fn lang_config() -> LangConfig {
-    let bytes = std::fs::read(path::lang_config()).unwrap();
-    toml::from_slice(&bytes).unwrap()
+    let text = std::fs::read_to_string(path::lang_config()).unwrap();
+    toml::from_str(&text).unwrap()
 }
diff --git a/xtask/src/themelint.rs b/xtask/src/themelint.rs
index 06dfae40..e9980574 100644
--- a/xtask/src/themelint.rs
+++ b/xtask/src/themelint.rs
@@ -156,8 +156,8 @@ pub fn lint(file: String) -> Result<(), DynError> {
         return Ok(());
     }
     let path = path::themes().join(file.clone() + ".toml");
-    let theme = std::fs::read(&path).unwrap();
-    let theme: Theme = toml::from_slice(&theme).expect("Failed to parse theme");
+    let theme = std::fs::read_to_string(&path).unwrap();
+    let theme: Theme = toml::from_str(&theme).expect("Failed to parse theme");
 
     let mut messages: Vec<String> = vec![];
     get_rules().iter().for_each(|lint| match lint {

From 52d854fa62e58909d5abb803bdf225b2a5069a4e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Jan 2023 11:10:35 -0600
Subject: [PATCH 790/884] build(deps): bump toml from 0.5.10 to 0.6.0

Bumps [toml](https://github.com/toml-rs/toml) from 0.5.10 to 0.6.0.
- [Release notes](https://github.com/toml-rs/toml/releases)
- [Commits](https://github.com/toml-rs/toml/compare/toml-v0.5.10...toml-v0.6.0)

---
updated-dependencies:
- dependency-name: toml
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock              | 57 +++++++++++++++++++++++++++++++++++++++--
 helix-core/Cargo.toml   |  2 +-
 helix-loader/Cargo.toml |  2 +-
 helix-term/Cargo.toml   |  2 +-
 helix-view/Cargo.toml   |  2 +-
 xtask/Cargo.toml        |  2 +-
 6 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 96d75697..f7812f4d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1379,6 +1379,16 @@ dependencies = [
  "hashbrown 0.12.3",
 ]
 
+[[package]]
+name = "indexmap"
+version = "1.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+]
+
 [[package]]
 name = "indoc"
 version = "1.0.8"
@@ -1546,6 +1556,15 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nom8"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@@ -1867,6 +1886,15 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c68e921cef53841b8925c2abadd27c9b891d9613bdc43d6b823062866df38e8"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "sha1_smol"
 version = "1.0.0"
@@ -2164,11 +2192,36 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.10"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
+checksum = "729bfd096e40da9c001f778f5cdecbd2957929a24e10e5883d9392220a751581"
 dependencies = [
+ "indexmap",
+ "nom8",
  "serde",
+ "serde_spanned",
+ "toml_datetime",
 ]
 
 [[package]]
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 73e64cfd..bfe1106d 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -36,7 +36,7 @@ hashbrown = { version = "0.13.2", features = ["raw"] }
 log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-toml = "0.5"
+toml = "0.6"
 
 imara-diff = "0.1.0"
 
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index a3d14584..5d0f0013 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -16,7 +16,7 @@ path = "src/main.rs"
 [dependencies]
 anyhow = "1"
 serde = { version = "1.0", features = ["derive"] }
-toml = "0.5"
+toml = "0.6"
 etcetera = "0.4"
 tree-sitter = "0.20"
 once_cell = "1.17"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index d4eebefb..5736ecde 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -61,7 +61,7 @@ pulldown-cmark = { version = "0.9", default-features = false }
 content_inspector = "0.2.4"
 
 # config
-toml = "0.5"
+toml = "0.6"
 
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index c75291cc..a4b97f86 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -39,7 +39,7 @@ chardetng = "0.1"
 
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-toml = "0.5"
+toml = "0.6"
 log = "~0.4"
 
 which = "4.4"
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 127b931c..2811ed05 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -10,4 +10,4 @@ helix-term = { version = "0.6", path = "../helix-term" }
 helix-core = { version = "0.6", path = "../helix-core" }
 helix-view = { version = "0.6", path = "../helix-view" }
 helix-loader = { version = "0.6", path = "../helix-loader" }
-toml = "0.5"
+toml = "0.6"

From b3e9f6233a64bb08dcb87788d5ca54dd25f13a27 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 24 Jan 2023 11:11:07 -0600
Subject: [PATCH 791/884] Fix compatibility with toml 0.6.0

`toml::from_slice` has been removed. The CHANGELOG recommends using
`toml::from_str` instead and doing the byte-to-str conversion yourself.

The `toml::toml!` macro has also changed to return the type of the
value declared within the macro body. In the change in
`helix-view/src/theme.rs` this is a `toml::map::Map` (it was a
`toml::Value` previously) allowing us to skip the match and use the
map directly.

Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>
---
 helix-core/tests/indent.rs | 4 ++--
 helix-view/src/theme.rs    | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/helix-core/tests/indent.rs b/helix-core/tests/indent.rs
index e1114f4a..f74b576a 100644
--- a/helix-core/tests/indent.rs
+++ b/helix-core/tests/indent.rs
@@ -28,8 +28,8 @@ fn test_treesitter_indent(file_name: &str, lang_scope: &str) {
 
     let mut config_file = test_dir;
     config_file.push("languages.toml");
-    let config = std::fs::read(config_file).unwrap();
-    let config = toml::from_slice(&config).unwrap();
+    let config = std::fs::read_to_string(config_file).unwrap();
+    let config = toml::from_str(&config).unwrap();
     let loader = Loader::new(config);
 
     // set runtime path so we can find the queries
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index 9eae88a8..ead0b9fb 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -517,10 +517,8 @@ mod tests {
 
         let mut style = Style::default();
         let palette = ThemePalette::default();
-        if let Value::Table(entries) = table {
-            for (_name, value) in entries {
-                palette.parse_style(&mut style, value).unwrap();
-            }
+        for (_name, value) in table {
+            palette.parse_style(&mut style, value).unwrap();
         }
 
         assert_eq!(

From 70887b7378d642226ad5102fbe601fecb225225c Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 24 Jan 2023 11:07:46 -0600
Subject: [PATCH 792/884] Refactor toml::Value->Theme conversion

The `From<Value>` implementation for `Theme` converted the Value to a
string and re-parsed the string to convert it to
`HashMap<String, Value>` which feels a bit wasteful. This change uses
the underlying `toml::map::Map` directly when the value is a table and
warns about the unexpected `Value` shape otherwise.

This is necessary because toml 0.6.0 changes the Display implementation
for Value::Table so that the `to_string` no longer encodes the value as
a Document, just a Value. So the parse of the Value fails to be decoded
as a HashMap.

The behavior for returning `Default::default` matches the previous
code's behavior except that it did not warn when the input Value was
failed to parse.
---
 helix-view/src/theme.rs | 78 ++++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index ead0b9fb..43d4a7a7 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -4,7 +4,7 @@ use std::{
     str,
 };
 
-use anyhow::{anyhow, Context, Result};
+use anyhow::{anyhow, Result};
 use helix_core::hashmap;
 use helix_loader::merge_toml_values;
 use log::warn;
@@ -209,16 +209,18 @@ pub struct Theme {
 
 impl From<Value> for Theme {
     fn from(value: Value) -> Self {
-        let values: Result<HashMap<String, Value>> =
-            toml::from_str(&value.to_string()).context("Failed to load theme");
-
-        let (styles, scopes, highlights) = build_theme_values(values);
-
-        Self {
-            styles,
-            scopes,
-            highlights,
-            ..Default::default()
+        if let Value::Table(table) = value {
+            let (styles, scopes, highlights) = build_theme_values(table);
+
+            Self {
+                styles,
+                scopes,
+                highlights,
+                ..Default::default()
+            }
+        } else {
+            warn!("Expected theme TOML value to be a table, found {:?}", value);
+            Default::default()
         }
     }
 }
@@ -228,9 +230,9 @@ impl<'de> Deserialize<'de> for Theme {
     where
         D: Deserializer<'de>,
     {
-        let values = HashMap::<String, Value>::deserialize(deserializer)?;
+        let values = Map::<String, Value>::deserialize(deserializer)?;
 
-        let (styles, scopes, highlights) = build_theme_values(Ok(values));
+        let (styles, scopes, highlights) = build_theme_values(values);
 
         Ok(Self {
             styles,
@@ -242,39 +244,37 @@ impl<'de> Deserialize<'de> for Theme {
 }
 
 fn build_theme_values(
-    values: Result<HashMap<String, Value>>,
+    mut values: Map<String, Value>,
 ) -> (HashMap<String, Style>, Vec<String>, Vec<Style>) {
     let mut styles = HashMap::new();
     let mut scopes = Vec::new();
     let mut highlights = Vec::new();
 
-    if let Ok(mut colors) = values {
-        // TODO: alert user of parsing failures in editor
-        let palette = colors
-            .remove("palette")
-            .map(|value| {
-                ThemePalette::try_from(value).unwrap_or_else(|err| {
-                    warn!("{}", err);
-                    ThemePalette::default()
-                })
-            })
-            .unwrap_or_default();
-        // remove inherits from value to prevent errors
-        let _ = colors.remove("inherits");
-        styles.reserve(colors.len());
-        scopes.reserve(colors.len());
-        highlights.reserve(colors.len());
-        for (name, style_value) in colors {
-            let mut style = Style::default();
-            if let Err(err) = palette.parse_style(&mut style, style_value) {
+    // TODO: alert user of parsing failures in editor
+    let palette = values
+        .remove("palette")
+        .map(|value| {
+            ThemePalette::try_from(value).unwrap_or_else(|err| {
                 warn!("{}", err);
-            }
-
-            // these are used both as UI and as highlights
-            styles.insert(name.clone(), style);
-            scopes.push(name);
-            highlights.push(style);
+                ThemePalette::default()
+            })
+        })
+        .unwrap_or_default();
+    // remove inherits from value to prevent errors
+    let _ = values.remove("inherits");
+    styles.reserve(values.len());
+    scopes.reserve(values.len());
+    highlights.reserve(values.len());
+    for (name, style_value) in values {
+        let mut style = Style::default();
+        if let Err(err) = palette.parse_style(&mut style, style_value) {
+            warn!("{}", err);
         }
+
+        // these are used both as UI and as highlights
+        styles.insert(name.clone(), style);
+        scopes.push(name);
+        highlights.push(style);
     }
 
     (styles, scopes, highlights)

From e83ce7224063afc52d44f9c2b68e3c5a03412f5c Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Tue, 24 Jan 2023 19:30:19 +0100
Subject: [PATCH 793/884] refactor: don't deserialize &str from toml

The new version of the `toml` crate is based on `toml_edit` and does
not support zero copy deserialization anymore. So we need to deserialize
`String` instead of `&str` in the keympa
---
 helix-term/src/keymap.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index 4a131f0a..416dcd86 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -184,7 +184,7 @@ impl<'de> serde::de::Visitor<'de> for KeyTrieVisitor {
         S: serde::de::SeqAccess<'de>,
     {
         let mut commands = Vec::new();
-        while let Some(command) = seq.next_element::<&str>()? {
+        while let Some(command) = seq.next_element::<String>()? {
             commands.push(
                 command
                     .parse::<MappableCommand>()

From 4726ae9df65821b0bdccb73e2355ede746433cd6 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Tue, 24 Jan 2023 18:23:09 -0500
Subject: [PATCH 794/884] Sonokai theme: style secondary selections differently
 (#5440)

Without styling the primary and secondary selections differently, it's
impossible to tell them apart when cycling through selections.

Make the primary selection slightly brighter and secondary selections
slightly paler.
---
 runtime/themes/sonokai.toml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/runtime/themes/sonokai.toml b/runtime/themes/sonokai.toml
index 06aff50b..f60bd4db 100644
--- a/runtime/themes/sonokai.toml
+++ b/runtime/themes/sonokai.toml
@@ -56,7 +56,8 @@
 "ui.cursor.match" = { fg = "orange", bg = "diff_yellow" }
 "ui.cursor.insert" = { fg = "black", bg = "grey" }
 "ui.cursor.select" = { fg = "bg0", bg = "blue" }
-"ui.selection" = { bg = "bg4" }
+"ui.selection" = { bg = "bg5" }
+"ui.selection.primary" = { bg = "bg4" }
 "ui.linenr" = "grey"
 "ui.linenr.selected" = "fg"
 "ui.cursorline.primary" = { bg = "bg1" }
@@ -91,7 +92,8 @@ bg0 = "#2c2e34"
 bg1 = "#33353f"
 bg2 = "#363944"
 bg3 = "#3b3e48"
-bg4 = "#545862"
+bg4 = "#5C606A"
+bg5 = "#444852"
 bg_red = "#ff6077"
 diff_red = "#55393d"
 bg_green = "#a7df78"

From 91dca3f667e146f93e6dca205b0a3f2a7a64b488 Mon Sep 17 00:00:00 2001
From: blt__ <63462729+blt-r@users.noreply.github.com>
Date: Wed, 25 Jan 2023 03:26:42 +0400
Subject: [PATCH 795/884] Add Appstream metadata file (#5643)

---
 contrib/Helix.appdata.xml | 87 +++++++++++++++++++++++++++++++++++++++
 docs/releases.md          |  1 +
 2 files changed, 88 insertions(+)
 create mode 100644 contrib/Helix.appdata.xml

diff --git a/contrib/Helix.appdata.xml b/contrib/Helix.appdata.xml
new file mode 100644
index 00000000..a2428497
--- /dev/null
+++ b/contrib/Helix.appdata.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>com.helix_editor.Helix</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>MPL-2.0</project_license>
+  <name>Helix</name>
+  <summary>A post-modern text editor</summary>
+
+  <description>
+    <p>
+      Helix is a terminal-based text editor inspired by Kakoune / Neovim and written in Rust.
+    </p>
+    <ul>
+      <li>Vim-like modal editing</li>
+      <li>Multiple selections</li>
+      <li>Built-in language server support</li>
+      <li>Smart, incremental syntax highlighting and code editing via tree-sitter</li>
+    </ul>
+  </description>
+
+  <launchable type="desktop-id">Helix.desktop</launchable>
+
+  <screenshots>
+    <screenshot type="default">
+      <caption>Helix with default theme</caption>
+      <image>https://github.com/helix-editor/helix/raw/d4565b4404cabc522bd60822abd374755581d751/screenshot.png</image>
+    </screenshot>
+  </screenshots>
+
+  <url type="homepage">https://helix-editor.com/</url>
+  <url type="donation">https://opencollective.com/helix-editor</url>
+  <url type="help">https://docs.helix-editor.com/</url>
+  <url type="vcs-browser">https://github.com/helix-editor/helix</url>
+  <url type="bugtracker">https://github.com/helix-editor/helix/issues</url>
+
+  <content_rating type="oars-1.1" />
+
+  <releases>
+    <release version="22.12" date="2022-12-6">
+      <url>https://helix-editor.com/news/release-22-12-highlights/</url>
+    </release>
+    <release version="22.08" date="2022-8-31">
+      <url>https://helix-editor.com/news/release-22-08-highlights/</url>
+    </release>
+    <release version="22.05" date="2022-5-28">
+      <url>https://helix-editor.com/news/release-22-05-highlights/</url>
+    </release>
+    <release version="22.03" date="2022-3-28">
+      <url>https://helix-editor.com/news/release-22-03-highlights/</url>
+    </release>
+  </releases>
+
+  <requires>
+    <control>keyboard</control>
+  </requires>
+
+  <categories>
+    <category>Utility</category>
+    <category>TextEditor</category>
+  </categories>
+
+  <keywords>
+    <keyword>text</keyword>
+    <keyword>editor</keyword>
+    <keyword>development</keyword>
+    <keyword>programming</keyword>
+  </keywords>
+
+  <provides>
+    <binary>hx</binary>
+    <mediatype>text/english</mediatype>
+    <mediatype>text/plain</mediatype>
+    <mediatype>text/x-makefile</mediatype>
+    <mediatype>text/x-c++hdr</mediatype>
+    <mediatype>text/x-c++src</mediatype>
+    <mediatype>text/x-chdr</mediatype>
+    <mediatype>text/x-csrc</mediatype>
+    <mediatype>text/x-java</mediatype>
+    <mediatype>text/x-moc</mediatype>
+    <mediatype>text/x-pascal</mediatype>
+    <mediatype>text/x-tcl</mediatype>
+    <mediatype>text/x-tex</mediatype>
+    <mediatype>application/x-shellscript</mediatype>
+    <mediatype>text/x-c</mediatype>
+    <mediatype>text/x-c++</mediatype>
+  </provides>
+</component>
diff --git a/docs/releases.md b/docs/releases.md
index ec0b7270..6e7c37c6 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -5,6 +5,7 @@ Helix releases are versioned in the Calendar Versioning scheme:
 we'll use `<tag>` as a placeholder for the tag being published.
 
 * Merge the changelog PR
+* Add new `<release>` entry in `contrib/Helix.appdata.xml` with release information according to the [AppStream spec](https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Releases.html)
 * Tag and push
     * `git tag -s -m "<tag>" -a <tag> && git push`
     * Make sure to switch to master and pull first

From 67a287dd818bea14d550951a9660e8b0775bd8d0 Mon Sep 17 00:00:00 2001
From: ds-cbo <82801887+ds-cbo@users.noreply.github.com>
Date: Fri, 16 Dec 2022 15:53:37 +0100
Subject: [PATCH 796/884] keymap: Test backslash escaping in commands

---
 helix-term/src/commands.rs | 23 ++++++++++++++++------
 helix-term/src/keymap.rs   | 39 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index e7091401..365d5b65 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -448,9 +448,16 @@ impl MappableCommand {
 
 impl fmt::Debug for MappableCommand {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_tuple("MappableCommand")
-            .field(&self.name())
-            .finish()
+        match self {
+            MappableCommand::Static { name, .. } => {
+                f.debug_tuple("MappableCommand").field(name).finish()
+            }
+            MappableCommand::Typable { name, args, .. } => f
+                .debug_tuple("MappableCommand")
+                .field(name)
+                .field(args)
+                .finish(),
+        }
     }
 }
 
@@ -505,12 +512,16 @@ impl PartialEq for MappableCommand {
         match (self, other) {
             (
                 MappableCommand::Typable {
-                    name: first_name, ..
+                    name: first_name,
+                    args: first_args,
+                    ..
                 },
                 MappableCommand::Typable {
-                    name: second_name, ..
+                    name: second_name,
+                    args: second_args,
+                    ..
                 },
-            ) => first_name == second_name,
+            ) => first_name == second_name && first_args == second_args,
             (
                 MappableCommand::Static {
                     name: first_name, ..
diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index 416dcd86..e94a5f66 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -600,4 +600,43 @@ mod tests {
             "Mismatch"
         )
     }
+
+    #[test]
+    fn escaped_keymap() {
+        use crate::commands::MappableCommand;
+        use helix_view::input::{KeyCode, KeyEvent, KeyModifiers};
+
+        let keys = r#"
+"+" = [
+    "select_all",
+    ":pipe sed -E 's/\\s+$//g'",
+]
+        "#;
+
+        let key = KeyEvent {
+            code: KeyCode::Char('+'),
+            modifiers: KeyModifiers::NONE,
+        };
+
+        let expectation = Keymap::new(KeyTrie::Node(KeyTrieNode::new(
+            "",
+            hashmap! {
+                key => KeyTrie::Sequence(vec!{
+                    MappableCommand::select_all,
+                    MappableCommand::Typable {
+                        name: "pipe".to_string(),
+                        args: vec!{
+                            "sed".to_string(),
+                            "-E".to_string(),
+                            "'s/\\s+$//g'".to_string()
+                        },
+                        doc: "".to_string(),
+                    },
+                })
+            },
+            vec![key],
+        )));
+
+        assert_eq!(toml::from_str(keys), Ok(expectation));
+    }
 }

From 56c0810c6811df6607c7fe19bc912f419f2650de Mon Sep 17 00:00:00 2001
From: Antonius Naumann <antonius.naumann@student.hpi.de>
Date: Wed, 25 Jan 2023 16:56:51 +0100
Subject: [PATCH 797/884] Change default language server for 'v' from 'vls' to
 'v ls' (#5677)

---
 book/src/generated/lang-support.md | 2 +-
 languages.toml                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index c0b5b558..1711ec36 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -130,7 +130,7 @@
 | twig | ✓ |  |  |  |
 | typescript | ✓ | ✓ | ✓ | `typescript-language-server` |
 | ungrammar | ✓ |  |  |  |
-| v | ✓ |  |  | `vls` |
+| v | ✓ |  |  | `v` |
 | vala | ✓ |  |  | `vala-language-server` |
 | verilog | ✓ | ✓ |  | `svlangserver` |
 | vhs | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 1685c2a3..7ca71c8e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1603,7 +1603,7 @@ scope = "source.v"
 file-types = ["v", "vv"]
 shebangs = ["v run"]
 roots = ["v.mod"]
-language-server = { command = "vls", args = [] }
+language-server = { command = "v", args = ["ls"] }
 auto-format = true
 comment-token = "//"
 indent = { tab-width = 4, unit = "\t" }

From 2db879629f299007e389ee76826d3bce72f8039a Mon Sep 17 00:00:00 2001
From: Jimmy Zelinskie <jimmy@zelinskie.com>
Date: Wed, 25 Jan 2023 17:25:08 -0500
Subject: [PATCH 798/884] add explicit formatter for cue (#5679)

cuelsp does not support formatting.
Cue language support was added to Helix before
"formatter" was available.

References:
https://github.com/helix-editor/helix/pull/3262
https://github.com/dagger/cuelsp/issues/44
---
 languages.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/languages.toml b/languages.toml
index 7ca71c8e..ae266dce 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1778,6 +1778,7 @@ auto-format = true
 comment-token = "//"
 language-server = { command = "cuelsp" }
 indent = { tab-width = 4, unit = "\t" }
+formatter = { command = "cue", args = ["fmt", "-"] }
 
 [[grammar]]
 name = "cue"

From 22b3d3d6367f2e559a7193172bd1dba03b864bd3 Mon Sep 17 00:00:00 2001
From: pacien <pacien@users.noreply.github.com>
Date: Wed, 25 Jan 2023 23:44:24 +0100
Subject: [PATCH 799/884] queries/nix: add injections for builtins and writers
 (#5629)

---
 runtime/queries/nix/injections.scm | 110 +++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)

diff --git a/runtime/queries/nix/injections.scm b/runtime/queries/nix/injections.scm
index a1a0ebb8..62b48233 100644
--- a/runtime/queries/nix/injections.scm
+++ b/runtime/queries/nix/injections.scm
@@ -6,6 +6,8 @@
   (indented_string_expression (string_fragment) @injection.content))
   (#set! injection.combined))
 
+; Common attribute keys corresponding to scripts,
+; such as those of stdenv.mkDerivation.
 ((binding
    attrpath: (attrpath (identifier) @_path)
    expression: (indented_string_expression
@@ -14,6 +16,25 @@
  (#set! injection.language "bash")
  (#set! injection.combined))
 
+; builtins.{match,split} regex str
+; Example: nix/tests/lang/eval-okay-regex-{match,split}.nix
+((apply_expression
+   function: (_) @_func
+   argument: (indented_string_expression (string_fragment) @injection.content))
+ (#match? @_func "(^|\\.)match|split$")
+ (#set! injection.language "regex")
+ (#set! injection.combined))
+
+; builtins.fromJSON json
+; Example: nix/tests/lang/eval-okay-fromjson.nix
+((apply_expression
+   function: (_) @_func
+   argument: (indented_string_expression (string_fragment) @injection.content))
+ (#match? @_func "(^|\\.)fromJSON$")
+ (#set! injection.language "json")
+ (#set! injection.combined))
+
+; trivial-builders.nix pkgs.writeShellScript[Bin] name content
 ((apply_expression
    function: (apply_expression function: (_) @_func)
    argument: (indented_string_expression (string_fragment) @injection.content))
@@ -21,6 +42,8 @@
  (#set! injection.language "bash")
  (#set! injection.combined))
 
+; trivial-builders.nix, aliases.nix
+; pkgs.runCommand[[No]CC][Local] name attrs content
 (apply_expression
   (apply_expression
     function: (apply_expression
@@ -30,6 +53,7 @@
   (#set! injection.language "bash")
   (#set! injection.combined))
 
+; trivial-builders.nix pkgs.writeShellApplication { text = content; }
 (apply_expression
   function: ((_) @_func)
   argument: (_ (_)* (_ (_)* (binding
@@ -40,3 +64,89 @@
   (#match? @_path "^text$")
   (#set! injection.language "bash")
   (#set! injection.combined))
+
+; trivial-builders.nix pkgs.writeCBin name content
+((apply_expression
+   function: (apply_expression function: (_) @_func)
+   argument: (indented_string_expression (string_fragment) @injection.content))
+ (#match? @_func "(^|\\.)writeC(Bin)?$")
+ (#set! injection.language "c")
+ (#set! injection.combined))
+
+; pkgs.writers.* usage examples: nixpkgs/pkgs/build-support/writers/test.nix
+
+; pkgs.writers.write{Bash,Dash}[Bin] name content
+((apply_expression
+   function: (apply_expression function: (_) @_func)
+   argument: (indented_string_expression (string_fragment) @injection.content))
+ (#match? @_func "(^|\\.)write[BD]ash(Bin)?$")
+ (#set! injection.language "bash")
+ (#set! injection.combined))
+
+; pkgs.writers.writeFish[Bin] name content
+((apply_expression
+   function: (apply_expression function: (_) @_func)
+   argument: (indented_string_expression (string_fragment) @injection.content))
+ (#match? @_func "(^|\\.)writeFish(Bin)?$")
+ (#set! injection.language "fish")
+ (#set! injection.combined))
+
+; pkgs.writers.writeRust[Bin] name attrs content
+(apply_expression
+  (apply_expression
+    function: (apply_expression
+      function: ((_) @_func)))
+    argument: (indented_string_expression (string_fragment) @injection.content)
+  (#match? @_func "(^|\\.)writeRust(Bin)?$")
+  (#set! injection.language "rust")
+  (#set! injection.combined))
+
+; pkgs.writers.writeHaskell[Bin] name attrs content
+(apply_expression
+  (apply_expression
+    function: (apply_expression
+      function: ((_) @_func)))
+    argument: (indented_string_expression (string_fragment) @injection.content)
+  (#match? @_func "(^|\\.)writeHaskell(Bin)?$")
+  (#set! injection.language "haskell")
+  (#set! injection.combined))
+
+; pkgs.writers.writeJS[Bin] name attrs content
+(apply_expression
+  (apply_expression
+    function: (apply_expression
+      function: ((_) @_func)))
+    argument: (indented_string_expression (string_fragment) @injection.content)
+  (#match? @_func "(^|\\.)writeJS(Bin)?$")
+  (#set! injection.language "javascript")
+  (#set! injection.combined))
+
+; pkgs.writers.writePerl[Bin] name attrs content
+(apply_expression
+  (apply_expression
+    function: (apply_expression
+      function: ((_) @_func)))
+    argument: (indented_string_expression (string_fragment) @injection.content)
+  (#match? @_func "(^|\\.)writePerl(Bin)?$")
+  (#set! injection.language "perl")
+  (#set! injection.combined))
+
+; pkgs.writers.write{Python,PyPy}{2,3}[Bin] name attrs content
+(apply_expression
+  (apply_expression
+    function: (apply_expression
+      function: ((_) @_func)))
+    argument: (indented_string_expression (string_fragment) @injection.content)
+  (#match? @_func "(^|\\.)write(Python|PyPy)[23](Bin)?$")
+  (#set! injection.language "python")
+  (#set! injection.combined))
+
+; pkgs.writers.writeFSharp[Bin] name content
+; No query available for f-sharp as of the time of writing
+; See: https://github.com/helix-editor/helix/issues/4943
+; ((apply_expression
+;    function: (apply_expression function: (_) @_func)
+;    argument: (indented_string_expression (string_fragment) @injection.content))
+;  (#match? @_func "(^|\\.)writeFSharp(Bin)?$")
+;  (#set! injection.language "f-sharp")
+;  (#set! injection.combined))

From 250b6cd7f095032b1dea01c9e7bb2be2c3793898 Mon Sep 17 00:00:00 2001
From: LeoniePhiline <22329650+LeoniePhiline@users.noreply.github.com>
Date: Thu, 26 Jan 2023 22:24:21 +0100
Subject: [PATCH 800/884] Update tree-sitter-xml to fix whitespace parsing
 (#5685)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index ae266dce..18fae13e 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1981,7 +1981,7 @@ roots = []
 
 [[grammar]]
 name = "xml"
-source = { git = "https://github.com/RenjiSann/tree-sitter-xml", rev = "422528a43630db6dcc1e222d1c5ee3babd559473" }
+source = { git = "https://github.com/RenjiSann/tree-sitter-xml", rev = "48a7c2b6fb9d515577e115e6788937e837815651" }
 
 [[language]]
 name = "wit"

From 291f39d66b7009dc97544942ff908d8ecee636d3 Mon Sep 17 00:00:00 2001
From: Sam Nystrom <82178396+Stonks3141@users.noreply.github.com>
Date: Thu, 26 Jan 2023 17:06:35 -0500
Subject: [PATCH 801/884] Add `Justfile` to the file types for make (#5687)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 18fae13e..9c2fba86 100644
--- a/languages.toml
+++ b/languages.toml
@@ -878,7 +878,7 @@ source = { git = "https://github.com/uyha/tree-sitter-cmake", rev = "6e51463ef30
 [[language]]
 name = "make"
 scope = "source.make"
-file-types = ["Makefile", "makefile", "mk", "justfile", ".justfile"]
+file-types = ["Makefile", "makefile", "mk", "Justfile", "justfile", ".justfile"]
 injection-regex = "(make|makefile|Makefile|mk|just)"
 roots = []
 comment-token = "#"

From 4d548a0ee39c14ba54b672f6b57072cf306c11a9 Mon Sep 17 00:00:00 2001
From: Rino <pokkos@tuta.io>
Date: Thu, 26 Jan 2023 23:29:29 +0100
Subject: [PATCH 802/884] Parse gutter-types as Strings (#5696)

This is necessary for configurations like:

    [editor]
    gutters = ["diagnostics", "line-numbers"]

after the toml 0.6.0 dependency update.
---
 helix-view/src/editor.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index eef4a3f9..1029c14f 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -125,7 +125,7 @@ where
             S: serde::de::SeqAccess<'de>,
         {
             let mut gutters = Vec::new();
-            while let Some(gutter) = seq.next_element::<&str>()? {
+            while let Some(gutter) = seq.next_element::<String>()? {
                 gutters.push(
                     gutter
                         .parse::<GutterType>()

From d2d302433747ba04dc2fa541c4da9e878d4a5886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Madrid-Menc=C3=ADa?=
 <miguel.madrid.mencia@gmail.com>
Date: Fri, 27 Jan 2023 16:43:46 +0100
Subject: [PATCH 803/884] Fix clippy 1.67 warnings (#5697)

---
 helix-loader/src/config.rs  |  2 +-
 helix-loader/src/grammar.rs |  2 +-
 helix-term/src/ui/menu.rs   |  2 +-
 helix-term/src/ui/picker.rs |  2 +-
 helix-tui/src/buffer.rs     | 10 +++++-----
 helix-view/src/theme.rs     |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/helix-loader/src/config.rs b/helix-loader/src/config.rs
index a4c6dcbd..0f329d21 100644
--- a/helix-loader/src/config.rs
+++ b/helix-loader/src/config.rs
@@ -14,7 +14,7 @@ pub fn user_lang_config() -> Result<toml::Value, toml::de::Error> {
         .chain([crate::config_dir()].into_iter())
         .map(|path| path.join("languages.toml"))
         .filter_map(|file| {
-            std::fs::read_to_string(&file)
+            std::fs::read_to_string(file)
                 .map(|config| toml::from_str(&config))
                 .ok()
         })
diff --git a/helix-loader/src/grammar.rs b/helix-loader/src/grammar.rs
index 2aa92475..01c966c8 100644
--- a/helix-loader/src/grammar.rs
+++ b/helix-loader/src/grammar.rs
@@ -515,5 +515,5 @@ pub fn load_runtime_file(language: &str, filename: &str) -> Result<String, std::
         .join("queries")
         .join(language)
         .join(filename);
-    std::fs::read_to_string(&path)
+    std::fs::read_to_string(path)
 }
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index e92578c5..da00aa89 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -77,7 +77,7 @@ impl<T: Item> Menu<T> {
         Self {
             options,
             editor_data,
-            matcher: Box::new(Matcher::default()),
+            matcher: Box::default(),
             matches,
             cursor: None,
             widths: Vec::new(),
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index ccf37eb2..6bd64251 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -431,7 +431,7 @@ impl<T: Item> Picker<T> {
         let mut picker = Self {
             options,
             editor_data,
-            matcher: Box::new(Matcher::default()),
+            matcher: Box::default(),
             matches: Vec::new(),
             cursor: 0,
             prompt,
diff --git a/helix-tui/src/buffer.rs b/helix-tui/src/buffer.rs
index 9b93c405..b1fd4478 100644
--- a/helix-tui/src/buffer.rs
+++ b/helix-tui/src/buffer.rs
@@ -433,7 +433,7 @@ impl Buffer {
         (x_offset as u16, y)
     }
 
-    pub fn set_spans<'a>(&mut self, x: u16, y: u16, spans: &Spans<'a>, width: u16) -> (u16, u16) {
+    pub fn set_spans(&mut self, x: u16, y: u16, spans: &Spans, width: u16) -> (u16, u16) {
         let mut remaining_width = width;
         let mut x = x;
         for span in &spans.0 {
@@ -454,7 +454,7 @@ impl Buffer {
         (x, y)
     }
 
-    pub fn set_span<'a>(&mut self, x: u16, y: u16, span: &Span<'a>, width: u16) -> (u16, u16) {
+    pub fn set_span(&mut self, x: u16, y: u16, span: &Span, width: u16) -> (u16, u16) {
         self.set_stringn(x, y, span.content.as_ref(), width as usize, span.style)
     }
 
@@ -521,10 +521,10 @@ impl Buffer {
     pub fn merge(&mut self, other: &Buffer) {
         let area = self.area.union(other.area);
         let cell: Cell = Default::default();
-        self.content.resize(area.area() as usize, cell.clone());
+        self.content.resize(area.area(), cell.clone());
 
         // Move original content to the appropriate space
-        let size = self.area.area() as usize;
+        let size = self.area.area();
         for i in (0..size).rev() {
             let (x, y) = self.pos_of(i);
             // New index in content
@@ -537,7 +537,7 @@ impl Buffer {
 
         // Push content of the other buffer into this one (may erase previous
         // data)
-        let size = other.area.area() as usize;
+        let size = other.area.area();
         for i in 0..size {
             let (x, y) = other.pos_of(i);
             // New index in content
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index 43d4a7a7..8fb15a10 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -150,7 +150,7 @@ impl Loader {
 
     // Loads the theme data as `toml::Value` first from the user_dir then in default_dir
     fn load_toml(&self, path: PathBuf) -> Result<Value> {
-        let data = std::fs::read_to_string(&path)?;
+        let data = std::fs::read_to_string(path)?;
         let value = toml::from_str(&data)?;
 
         Ok(value)

From 4a59d337f4a2dae04c0726c70dc65463c561639d Mon Sep 17 00:00:00 2001
From: g-re-g <123515925+g-re-g@users.noreply.github.com>
Date: Fri, 27 Jan 2023 14:50:39 -0500
Subject: [PATCH 804/884] Update tutor logo (#5681)

---
 runtime/tutor | 38 ++++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/runtime/tutor b/runtime/tutor
index d51c57c2..e0b41bcf 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -1,13 +1,29 @@
-                  _   _                 __    __
-                 | | | |         _      \ \  / /
-                 | |_| |   ___  | | (_)  \ \/ /
-                 |  _  |  / _ \ | |  _    )  (
-                 | | | | |  __/ | | | |  / /\ \
-                 |_| |_|  \___| |_| |_| /_/  \_\
 
-                 A post-modern modal text editor.
-_________________________________________________________________
 
+       .
+       ###x.        .|
+       d#####x,   ,v||
+        '+#####v||||||
+           ,v|||||+'.      _     _           _
+        ,v|||||^'>####    | |   | |   ___   | | (_) __  __
+       |||||^'  .v####    | |___| |  /   \  | |  _  \ \/ /
+       ||||=..v#####P'    |  ___  | /  ^  | | | | |  \  /
+       ''v'>#####P'       | |   | | |  ---  | | | |  /  \
+       ,######/P||x.      |_|   |_|  \___/  |_| |_| /_/\_\
+       ####P' "x|||||,
+       |/'       'x|||    A post-modern modal text editor.
+        '           '|
+
+
+                 Welcome to the Helix tutorial!
+        Press the j key until you reach the introduction.
+
+
+
+=================================================================
+=                        INTRODUCTION                           =
+=================================================================
+                                                                 
  Welcome to the Helix editor! Helix is different from editors
  you might be used to in that it is modal, meaning that it has
  different modes for editing text. The primary modes you will
@@ -20,6 +36,12 @@ _________________________________________________________________
  the first lesson.
 
 
+
+
+
+
+
+
 =================================================================
 =                  1.1 BASIC CURSOR MOVEMENT                    =
 =================================================================

From 2c6bf6fca60a21f39939f5ae027ed3f56cf92dbd Mon Sep 17 00:00:00 2001
From: LeoniePhiline <22329650+LeoniePhiline@users.noreply.github.com>
Date: Sat, 28 Jan 2023 00:16:23 +0100
Subject: [PATCH 805/884] fix: Typo in variable name (#5710)

---
 helix-view/src/theme.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index 8fb15a10..125725e0 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -72,7 +72,7 @@ impl Loader {
     fn load_theme(
         &self,
         name: &str,
-        base_them_name: &str,
+        base_theme_name: &str,
         only_default_dir: bool,
     ) -> Result<Value> {
         let path = self.path(name, only_default_dir);
@@ -94,8 +94,8 @@ impl Loader {
                 "base16_default" => BASE16_DEFAULT_THEME_DATA.clone(),
                 _ => self.load_theme(
                     parent_theme_name,
-                    base_them_name,
-                    base_them_name == parent_theme_name,
+                    base_theme_name,
+                    base_theme_name == parent_theme_name,
                 )?,
             };
 

From 482cc22fecc109773882d3e0fd6251c33862e89e Mon Sep 17 00:00:00 2001
From: LeoniePhiline <22329650+LeoniePhiline@users.noreply.github.com>
Date: Sat, 28 Jan 2023 21:15:53 +0100
Subject: [PATCH 806/884] Update tree-sitter-sql and improve highlight queries
 (#5683)

---
 languages.toml                     |  2 +-
 runtime/queries/sql/highlights.scm | 28 +++++++++++-----------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/languages.toml b/languages.toml
index 9c2fba86..495acfec 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1434,7 +1434,7 @@ injection-regex = "sql"
 
 [[grammar]]
 name = "sql"
-source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "2743c7b5e710e6854d4e8c14c302548b436e2a1f" }
+source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "4fe05b2d81565ddb689d2f415e07afdacc515c52" }
 
 [[language]]
 name = "gdscript"
diff --git a/runtime/queries/sql/highlights.scm b/runtime/queries/sql/highlights.scm
index ece8be33..aad5ed31 100644
--- a/runtime/queries/sql/highlights.scm
+++ b/runtime/queries/sql/highlights.scm
@@ -42,21 +42,13 @@
   "."
 ] @punctuation.delimiter
 
-[
-  "*"
-  "+"
-  "-"
-  "/"
-  "%"
-  "^"
-  "||"  
-  "="
-  "<"
-  "<="
-  "!="
-  ">="
-  ">"
-] @operator
+(binary_expression
+  operator: _ @operator)
+
+(unary_expression
+  operator: _ @operator)
+
+(all_fields) @special
 
 [
   (keyword_null)
@@ -64,11 +56,11 @@
   (keyword_false)
 ] @constant.builtin
 
-(literal) @string
-
 ((literal) @constant.numeric
   (#match? @constant.numeric "^(-?\d*\.?\d*)$"))
 
+(literal) @string
+
 [
   (keyword_select)
   (keyword_delete)
@@ -146,6 +138,8 @@
   (keyword_commit)
   (keyword_rollback)
   (keyword_transaction)
+  (keyword_group_concat)
+  (keyword_separator)
 ] @keyword
 
 [

From 86ae81ec5d44f79422d2ae8c2544c7129b42ecb4 Mon Sep 17 00:00:00 2001
From: Jonathan LEI <me@xjonathan.dev>
Date: Mon, 30 Jan 2023 22:48:27 +0800
Subject: [PATCH 807/884] Use filename completer on run-shell-command (#5729)

---
 helix-term/src/commands/typed.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index bd91df5a..ec7100a6 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -2335,7 +2335,7 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
             aliases: &["sh"],
             doc: "Run a shell command",
             fun: run_shell_command,
-            completer: Some(completers::directory),
+            completer: Some(completers::filename),
         },
     ];
 

From 8b25f44f0570c7b430d632108126a91f1939de65 Mon Sep 17 00:00:00 2001
From: alice <alice@ayaya.dev>
Date: Mon, 30 Jan 2023 15:49:26 +0100
Subject: [PATCH 808/884] build(deps): bump toml from 0.6.0 to 0.7.0 (#5726)

---
 Cargo.lock              | 12 ++++++------
 helix-core/Cargo.toml   |  2 +-
 helix-loader/Cargo.toml |  2 +-
 helix-term/Cargo.toml   |  2 +-
 helix-view/Cargo.toml   |  2 +-
 xtask/Cargo.toml        |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f7812f4d..85ca5747 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2192,9 +2192,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217"
+checksum = "2f560bc7fb3eb31f5eee1340c68a2160cad39605b7b9c9ec32045ddbdee13b85"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2204,18 +2204,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
+checksum = "886f31a9b85b6182cabd4d8b07df3b451afcc216563748201490940d2a28ed36"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.18.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "729bfd096e40da9c001f778f5cdecbd2957929a24e10e5883d9392220a751581"
+checksum = "233d8716cdc5d20ec88a18a839edaf545edc71efa4a5ff700ef4a102c26cd8fa"
 dependencies = [
  "indexmap",
  "nom8",
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index bfe1106d..6605f7ce 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -36,7 +36,7 @@ hashbrown = { version = "0.13.2", features = ["raw"] }
 log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-toml = "0.6"
+toml = "0.7"
 
 imara-diff = "0.1.0"
 
diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
index 5d0f0013..9225ad1a 100644
--- a/helix-loader/Cargo.toml
+++ b/helix-loader/Cargo.toml
@@ -16,7 +16,7 @@ path = "src/main.rs"
 [dependencies]
 anyhow = "1"
 serde = { version = "1.0", features = ["derive"] }
-toml = "0.6"
+toml = "0.7"
 etcetera = "0.4"
 tree-sitter = "0.20"
 once_cell = "1.17"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 5736ecde..0057114e 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -61,7 +61,7 @@ pulldown-cmark = { version = "0.9", default-features = false }
 content_inspector = "0.2.4"
 
 # config
-toml = "0.6"
+toml = "0.7"
 
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
index a4b97f86..17e07e9a 100644
--- a/helix-view/Cargo.toml
+++ b/helix-view/Cargo.toml
@@ -39,7 +39,7 @@ chardetng = "0.1"
 
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-toml = "0.6"
+toml = "0.7"
 log = "~0.4"
 
 which = "4.4"
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 2811ed05..ed118294 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -10,4 +10,4 @@ helix-term = { version = "0.6", path = "../helix-term" }
 helix-core = { version = "0.6", path = "../helix-core" }
 helix-view = { version = "0.6", path = "../helix-view" }
 helix-loader = { version = "0.6", path = "../helix-loader" }
-toml = "0.6"
+toml = "0.7"

From 447909e4d0b865a1177babe2214536979fdbeb7c Mon Sep 17 00:00:00 2001
From: Eric Crosson <EricCrosson@users.noreply.github.com>
Date: Mon, 30 Jan 2023 08:56:42 -0600
Subject: [PATCH 809/884] Modify env language to extend bash (#5720)

Additionally, add `.envrc` to the `env`-supported file types.
---
 languages.toml                     |  7 ++-----
 runtime/queries/env/highlights.scm | 20 +-------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/languages.toml b/languages.toml
index 495acfec..755f577f 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2007,15 +2007,12 @@ source = { git = "https://github.com/hh9527/tree-sitter-wit", rev = "c917790ab9a
 [[language]]
 name = "env"
 scope = "source.env"
-file-types = [".env", ".env.local", ".env.development", ".env.production"]
+file-types = [".env", ".env.local", ".env.development", ".env.production", ".envrc"]
 injection-regex = "env"
 comment-token = "#"
 indent = { tab-width = 4, unit = "\t" }
 roots = []
-
-[[grammar]]
-name = "env"
-source = { git = "https://github.com/seshotake/tree-sitter-env", rev = "e6c6bb1e7b51d481cba463fe949f083cf22d81f7" }
+grammar = "bash"
 
 [[language]]
 name = "ini"
diff --git a/runtime/queries/env/highlights.scm b/runtime/queries/env/highlights.scm
index 6a27e8e5..8a70c41c 100644
--- a/runtime/queries/env/highlights.scm
+++ b/runtime/queries/env/highlights.scm
@@ -1,19 +1 @@
-(env_variable (quoted_string)) @string
-(env_variable (unquoted_string)) @string
-
-(env_key) @keyword
-
-((variable) @keyword
-  (#match? @keyword "^([A-Z][A-Z_0-9]*)$"))
-  
-[
-  "{"
-  "}"
-] @punctuation.bracket
-
-[
-  "$"
-  "=" 
-] @operator
-
-(comment) @comment
\ No newline at end of file
+; inherits: bash
\ No newline at end of file

From 75eeda69e7fee2bf4cecf90c6fbeb614088783c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Jan 2023 17:47:30 -0600
Subject: [PATCH 810/884] build(deps): bump indoc from 1.0.8 to 2.0.0 (#5742)

Bumps [indoc](https://github.com/dtolnay/indoc) from 1.0.8 to 2.0.0.
- [Release notes](https://github.com/dtolnay/indoc/releases)
- [Commits](https://github.com/dtolnay/indoc/compare/1.0.8...2.0.0)

---
updated-dependencies:
- dependency-name: indoc
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 4 ++--
 helix-term/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 85ca5747..c972103b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1391,9 +1391,9 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "1.0.8"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da2d6f23ffea9d7e76c53eee25dfb67bcd8fde7f1198b0855350698c9f07c780"
+checksum = "6fe2b9d82064e8a0226fddb3547f37f28eaa46d0fc210e275d835f08cf3b76a7"
 
 [[package]]
 name = "instant"
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
index 0057114e..603f37d3 100644
--- a/helix-term/Cargo.toml
+++ b/helix-term/Cargo.toml
@@ -78,5 +78,5 @@ helix-loader = { version = "0.6", path = "../helix-loader" }
 
 [dev-dependencies]
 smallvec = "1.10"
-indoc = "1.0.8"
+indoc = "2.0.0"
 tempfile = "3.3.0"

From 9d22c64c78a1a4be7d64623cd07a942d882d611c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Jan 2023 17:48:21 -0600
Subject: [PATCH 811/884] build(deps): bump ahash from 0.8.2 to 0.8.3 (#5743)

Bumps [ahash](https://github.com/tkaitchuck/ahash) from 0.8.2 to 0.8.3.
- [Release notes](https://github.com/tkaitchuck/ahash/releases)
- [Commits](https://github.com/tkaitchuck/ahash/compare/v0.8.2...v0.8.3)

---
updated-dependencies:
- dependency-name: ahash
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 10 +++++-----
 helix-core/Cargo.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c972103b..d1e98bf0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -21,9 +21,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107"
+checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
 dependencies = [
  "cfg-if",
  "getrandom",
@@ -1108,14 +1108,14 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 dependencies = [
- "ahash 0.8.2",
+ "ahash 0.8.3",
 ]
 
 [[package]]
 name = "helix-core"
 version = "0.6.0"
 dependencies = [
- "ahash 0.8.2",
+ "ahash 0.8.3",
  "arc-swap",
  "bitflags",
  "chrono",
@@ -1375,7 +1375,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8"
 dependencies = [
- "ahash 0.8.2",
+ "ahash 0.8.3",
  "hashbrown 0.12.3",
 ]
 
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 6605f7ce..10de738f 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -30,7 +30,7 @@ once_cell = "1.17"
 arc-swap = "1"
 regex = "1"
 bitflags = "1.3"
-ahash = "0.8.2"
+ahash = "0.8.3"
 hashbrown = { version = "0.13.2", features = ["raw"] }
 
 log = "0.4"

From ac6e71f9c632b1c34c68c9c84cdfba0a742cd0c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Jan 2023 17:49:21 -0600
Subject: [PATCH 812/884] build(deps): bump futures-executor from 0.3.25 to
 0.3.26 (#5744)

Bumps [futures-executor](https://github.com/rust-lang/futures-rs) from 0.3.25 to 0.3.26.
- [Release notes](https://github.com/rust-lang/futures-rs/releases)
- [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.25...0.3.26)

---
updated-dependencies:
- dependency-name: futures-executor
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d1e98bf0..f8be2e25 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -485,15 +485,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
+checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
+checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -502,15 +502,15 @@ dependencies = [
 
 [[package]]
 name = "futures-task"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
+checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"
 
 [[package]]
 name = "futures-util"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
+checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"
 dependencies = [
  "futures-core",
  "futures-task",

From c9b583ea9b59aa78c12e3831ed9c73f83d1d35d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Jan 2023 17:49:50 -0600
Subject: [PATCH 813/884] build(deps): bump toml from 0.7.0 to 0.7.1 (#5745)

Bumps [toml](https://github.com/toml-rs/toml) from 0.7.0 to 0.7.1.
- [Release notes](https://github.com/toml-rs/toml/releases)
- [Commits](https://github.com/toml-rs/toml/compare/toml-v0.7.0...toml-v0.7.1)

---
updated-dependencies:
- dependency-name: toml
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f8be2e25..066af528 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1888,9 +1888,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c68e921cef53841b8925c2abadd27c9b891d9613bdc43d6b823062866df38e8"
+checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
 dependencies = [
  "serde",
 ]
@@ -2192,9 +2192,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f560bc7fb3eb31f5eee1340c68a2160cad39605b7b9c9ec32045ddbdee13b85"
+checksum = "772c1426ab886e7362aedf4abc9c0d1348a979517efedfc25862944d10137af0"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2204,18 +2204,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "886f31a9b85b6182cabd4d8b07df3b451afcc216563748201490940d2a28ed36"
+checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233d8716cdc5d20ec88a18a839edaf545edc71efa4a5ff700ef4a102c26cd8fa"
+checksum = "90a238ee2e6ede22fb95350acc78e21dc40da00bb66c0334bde83de4ed89424e"
 dependencies = [
  "indexmap",
  "nom8",

From 4eca4b3079bf53de874959270d0b3471d320debc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Kr=C3=BCger?= <ole@vprsm.de>
Date: Tue, 31 Jan 2023 11:38:53 +0100
Subject: [PATCH 814/884] Support goto-declaration LSP command (#5646)

---
 helix-lsp/src/client.rs          | 25 +++++++++++++++++++++++++
 helix-term/src/commands.rs       |  1 +
 helix-term/src/commands/lsp.rs   | 25 +++++++++++++++++++++++++
 helix-term/src/keymap/default.rs |  1 +
 4 files changed, 52 insertions(+)

diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index dd2581c6..6827f568 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -886,6 +886,31 @@ impl Client {
         ))
     }
 
+    pub fn goto_declaration(
+        &self,
+        text_document: lsp::TextDocumentIdentifier,
+        position: lsp::Position,
+        work_done_token: Option<lsp::ProgressToken>,
+    ) -> Option<impl Future<Output = Result<Value>>> {
+        let capabilities = self.capabilities.get().unwrap();
+
+        // Return early if the server does not support goto-declaration.
+        match capabilities.declaration_provider {
+            Some(
+                lsp::DeclarationCapability::Simple(true)
+                | lsp::DeclarationCapability::RegistrationOptions(_)
+                | lsp::DeclarationCapability::Options(_),
+            ) => (),
+            _ => return None,
+        }
+
+        Some(self.goto_request::<lsp::request::GotoDeclaration>(
+            text_document,
+            position,
+            work_done_token,
+        ))
+    }
+
     pub fn goto_type_definition(
         &self,
         text_document: lsp::TextDocumentIdentifier,
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 365d5b65..47ef1ff1 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -285,6 +285,7 @@ impl MappableCommand {
         select_mode, "Enter selection extend mode",
         exit_select_mode, "Exit selection mode",
         goto_definition, "Goto definition",
+        goto_declaration, "Goto declaration",
         add_newline_above, "Add newline above",
         add_newline_below, "Add newline below",
         goto_type_definition, "Goto type definition",
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 578eb608..d12aa436 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -914,6 +914,31 @@ fn to_locations(definitions: Option<lsp::GotoDefinitionResponse>) -> Vec<lsp::Lo
     }
 }
 
+pub fn goto_declaration(cx: &mut Context) {
+    let (view, doc) = current!(cx.editor);
+    let language_server = language_server!(cx.editor, doc);
+    let offset_encoding = language_server.offset_encoding();
+
+    let pos = doc.position(view.id, offset_encoding);
+
+    let future = match language_server.goto_declaration(doc.identifier(), pos, None) {
+        Some(future) => future,
+        None => {
+            cx.editor
+                .set_error("Language server does not support goto-declaration");
+            return;
+        }
+    };
+
+    cx.callback(
+        future,
+        move |editor, compositor, response: Option<lsp::GotoDefinitionResponse>| {
+            let items = to_locations(response);
+            goto_impl(editor, compositor, items, offset_encoding);
+        },
+    );
+}
+
 pub fn goto_definition(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
     let language_server = language_server!(cx.editor, doc);
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index ef93dee0..d48e6935 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -44,6 +44,7 @@ pub fn default() -> HashMap<Mode, Keymap> {
             "l" => goto_line_end,
             "s" => goto_first_nonwhitespace,
             "d" => goto_definition,
+            "D" => goto_declaration,
             "y" => goto_type_definition,
             "r" => goto_reference,
             "i" => goto_implementation,

From 4dcf1fe66ba30a78edc054780d9b65c2f826530f Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Tue, 31 Jan 2023 18:03:19 +0100
Subject: [PATCH 815/884] rework positioning/rendering and enable
 softwrap/virtual text (#5420)

* rework positioning/rendering, enables softwrap/virtual text

This commit is a large rework of the core text positioning and
rendering code in helix to remove the assumption that on-screen
columns/lines correspond to text columns/lines.

A generic `DocFormatter` is introduced that positions graphemes on
and is used both for rendering and for movements/scrolling.
Both virtual text support (inline, grapheme overlay and multi-line)
and a capable softwrap implementation is included.

fix picker highlight

cleanup doc formatter, use word bondaries for wrapping

make visual vertical movement a seperate commnad

estimate line gutter width to improve performance

cache cursor position

cleanup and optimize doc formatter

cleanup documentation

fix typos

Co-authored-by: Daniel Hines <d4hines@gmail.com>

update documentation

fix panic in last_visual_line funciton

improve soft-wrap documentation

add extend_visual_line_up/down commands

fix non-visual vertical movement

streamline virtual text highlighting, add softwrap indicator

fix cursor position if softwrap is disabled

improve documentation of text_annotations module

avoid crashes if view anchor is out of bounds

fix: consider horizontal offset when traslation char_idx -> vpos

improve default configuration

fix: mixed up horizontal and vertical offset

reset view position after config reload

apply suggestions from review

disabled softwrap for very small screens to avoid endless spin

fix wrap_indicator setting

fix bar cursor disappearring on the EOF character

add keybinding for linewise vertical movement

fix: inconsistent gutter highlights

improve virtual text API

make scope idx lookup more ergonomic

allow overlapping overlays

correctly track char_pos for virtual text

adjust configuration

deprecate old position fucntions

fix infinite loop in highlight lookup

fix gutter style

fix formatting

document max-line-width interaction with softwrap

change wrap-indicator example to use empty string

fix: rare panic when view is in invalid state (bis)

* Apply suggestions from code review

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* improve documentation for positoning functions

* simplify tests

* fix documentation of Grapheme::width

* Apply suggestions from code review

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* add explicit drop invocation

* Add explicit MoveFn type alias

* add docuntation to Editor::cursor_cache

* fix a few typos

* explain use of allow(deprecated)

* make gj and gk extend in select mode

* remove unneded debug and TODO

* mark tab_width_at #[inline]

* add fast-path to move_vertically_visual in case softwrap is disabled

* rename first_line to first_visual_line

* simplify duplicate if/else

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/configuration.md            |  23 +-
 book/src/languages.md                |   2 +-
 helix-core/src/doc_formatter.rs      | 384 ++++++++++++++++
 helix-core/src/doc_formatter/test.rs | 222 +++++++++
 helix-core/src/graphemes.rs          | 183 +++++++-
 helix-core/src/lib.rs                |   8 +-
 helix-core/src/movement.rs           | 202 ++++++++-
 helix-core/src/position.rs           | 428 +++++++++++++++++-
 helix-core/src/selection.rs          |  32 +-
 helix-core/src/text_annotations.rs   | 271 +++++++++++
 helix-term/src/application.rs        |  13 +-
 helix-term/src/commands.rs           | 228 +++++++---
 helix-term/src/keymap/default.rs     |  18 +-
 helix-term/src/ui/completion.rs      |   6 +-
 helix-term/src/ui/document.rs        | 475 ++++++++++++++++++++
 helix-term/src/ui/editor.rs          | 512 ++++++++-------------
 helix-term/src/ui/lsp.rs             |   5 +-
 helix-term/src/ui/mod.rs             |   1 +
 helix-term/src/ui/picker.rs          |  81 ++--
 helix-view/src/document.rs           |  74 ++-
 helix-view/src/editor.rs             |  85 +++-
 helix-view/src/gutter.rs             | 293 +++++++-----
 helix-view/src/lib.rs                |  23 +-
 helix-view/src/theme.rs              |  15 +-
 helix-view/src/view.rs               | 647 +++++++++++++++++++++------
 25 files changed, 3481 insertions(+), 750 deletions(-)
 create mode 100644 helix-core/src/doc_formatter.rs
 create mode 100644 helix-core/src/doc_formatter/test.rs
 create mode 100644 helix-core/src/text_annotations.rs
 create mode 100644 helix-term/src/ui/document.rs

diff --git a/book/src/configuration.md b/book/src/configuration.md
index ab229f77..528fafd0 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -307,4 +307,25 @@ Currently unused
 
 #### `[editor.gutters.spacer]` Section
 
-Currently unused
\ No newline at end of file
+Currently unused
+
+### `[editor.soft-wrap]` Section
+
+Options for soft wrapping lines that exceed the view width
+
+| Key                 | Description                                                  | Default |
+| ---                 | ---                                                          | ---     |
+| `enable`            | Whether soft wrapping is enabled.                            | `false` |
+| `max-wrap`          | Maximum free space left at the end of the line.              | `20`    |
+| `max-indent-retain` | Maximum indentation to carry over when soft wrapping a line. | `40`    |
+| `wrap-indicator`    | Text inserted before soft wrapped lines, highlighted with `ui.virtual.wrap` | `↪ `    |
+
+Example:
+
+```toml
+[editor.soft-wrap]
+enable = true
+max-wrap = 25 # increase value to reduce forced mid-word wrapping
+max-indent-retain = 0
+wrap-indicator = ""  # set wrap-indicator to "" to hide it
+```
diff --git a/book/src/languages.md b/book/src/languages.md
index ff06dc00..0646b9af 100644
--- a/book/src/languages.md
+++ b/book/src/languages.md
@@ -61,7 +61,7 @@ These configuration keys are available:
 | `config`              | Language Server configuration                                 |
 | `grammar`             | The tree-sitter grammar to use (defaults to the value of `name`) |
 | `formatter`           | The formatter for the language, it will take precedence over the lsp when defined. The formatter must be able to take the original file as input from stdin and write the formatted file to stdout |
-| `max-line-length`     | Maximum line length. Used for the `:reflow` command           |
+| `max-line-length`     | Maximum line length. Used for the `:reflow` command and soft-wrapping           |
 
 ### File-type detection and the `file-types` key
 
diff --git a/helix-core/src/doc_formatter.rs b/helix-core/src/doc_formatter.rs
new file mode 100644
index 00000000..c7dc9081
--- /dev/null
+++ b/helix-core/src/doc_formatter.rs
@@ -0,0 +1,384 @@
+//! The `DocumentFormatter` forms the bridge between the raw document text
+//! and onscreen positioning. It yields the text graphemes as an iterator
+//! and traverses (part) of the document text. During that traversal it
+//! handles grapheme detection, softwrapping and annotations.
+//! It yields `FormattedGrapheme`s and their corresponding visual coordinates.
+//!
+//! As both virtual text and softwrapping can insert additional lines into the document
+//! it is generally not possible to find the start of the previous visual line.
+//! Instead the `DocumentFormatter` starts at the last "checkpoint" (usually a linebreak)
+//! called a "block" and the caller must advance it as needed.
+
+use std::borrow::Cow;
+use std::fmt::Debug;
+use std::mem::{replace, take};
+
+#[cfg(test)]
+mod test;
+
+use unicode_segmentation::{Graphemes, UnicodeSegmentation};
+
+use crate::graphemes::{Grapheme, GraphemeStr};
+use crate::syntax::Highlight;
+use crate::text_annotations::TextAnnotations;
+use crate::{Position, RopeGraphemes, RopeSlice};
+
+/// TODO make Highlight a u32 to reduce the size of this enum to a single word.
+#[derive(Debug, Clone, Copy)]
+pub enum GraphemeSource {
+    Document {
+        codepoints: u32,
+    },
+    /// Inline virtual text can not be highlighted with a `Highlight` iterator
+    /// because it's not part of the document. Instead the `Highlight`
+    /// is emitted right by the document formatter
+    VirtualText {
+        highlight: Option<Highlight>,
+    },
+}
+
+#[derive(Debug, Clone)]
+pub struct FormattedGrapheme<'a> {
+    pub grapheme: Grapheme<'a>,
+    pub source: GraphemeSource,
+}
+
+impl<'a> FormattedGrapheme<'a> {
+    pub fn new(
+        g: GraphemeStr<'a>,
+        visual_x: usize,
+        tab_width: u16,
+        source: GraphemeSource,
+    ) -> FormattedGrapheme<'a> {
+        FormattedGrapheme {
+            grapheme: Grapheme::new(g, visual_x, tab_width),
+            source,
+        }
+    }
+    /// Returns whether this grapheme is virtual inline text
+    pub fn is_virtual(&self) -> bool {
+        matches!(self.source, GraphemeSource::VirtualText { .. })
+    }
+
+    pub fn placeholder() -> Self {
+        FormattedGrapheme {
+            grapheme: Grapheme::Other { g: " ".into() },
+            source: GraphemeSource::Document { codepoints: 0 },
+        }
+    }
+
+    pub fn doc_chars(&self) -> usize {
+        match self.source {
+            GraphemeSource::Document { codepoints } => codepoints as usize,
+            GraphemeSource::VirtualText { .. } => 0,
+        }
+    }
+
+    pub fn is_whitespace(&self) -> bool {
+        self.grapheme.is_whitespace()
+    }
+
+    pub fn width(&self) -> usize {
+        self.grapheme.width()
+    }
+
+    pub fn is_word_boundary(&self) -> bool {
+        self.grapheme.is_word_boundary()
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct TextFormat {
+    pub soft_wrap: bool,
+    pub tab_width: u16,
+    pub max_wrap: u16,
+    pub max_indent_retain: u16,
+    pub wrap_indicator: Box<str>,
+    pub wrap_indicator_highlight: Option<Highlight>,
+    pub viewport_width: u16,
+}
+
+// test implementation is basically only used for testing or when softwrap is always disabled
+impl Default for TextFormat {
+    fn default() -> Self {
+        TextFormat {
+            soft_wrap: false,
+            tab_width: 4,
+            max_wrap: 3,
+            max_indent_retain: 4,
+            wrap_indicator: Box::from(" "),
+            viewport_width: 17,
+            wrap_indicator_highlight: None,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct DocumentFormatter<'t> {
+    text_fmt: &'t TextFormat,
+    annotations: &'t TextAnnotations,
+
+    /// The visual position at the end of the last yielded word boundary
+    visual_pos: Position,
+    graphemes: RopeGraphemes<'t>,
+    /// The character pos of the `graphemes` iter used for inserting annotations
+    char_pos: usize,
+    /// The line pos of the `graphemes` iter used for inserting annotations
+    line_pos: usize,
+    exhausted: bool,
+
+    /// Line breaks to be reserved for virtual text
+    /// at the next line break
+    virtual_lines: usize,
+    inline_anntoation_graphemes: Option<(Graphemes<'t>, Option<Highlight>)>,
+
+    // softwrap specific
+    /// The indentation of the current line
+    /// Is set to `None` if the indentation level is not yet known
+    /// because no non-whitespace graphemes have been encountered yet
+    indent_level: Option<usize>,
+    /// In case a long word needs to be split a single grapheme might need to be wrapped
+    /// while the rest of the word stays on the same line
+    peeked_grapheme: Option<(FormattedGrapheme<'t>, usize)>,
+    /// A first-in first-out (fifo) buffer for the Graphemes of any given word
+    word_buf: Vec<FormattedGrapheme<'t>>,
+    /// The index of the next grapheme that will be yielded from the `word_buf`
+    word_i: usize,
+}
+
+impl<'t> DocumentFormatter<'t> {
+    /// Creates a new formatter at the last block before `char_idx`.
+    /// A block is a chunk which always ends with a linebreak.
+    /// This is usually just a normal line break.
+    /// However very long lines are always wrapped at constant intervals that can be cheaply calculated
+    /// to avoid pathological behaviour.
+    pub fn new_at_prev_checkpoint(
+        text: RopeSlice<'t>,
+        text_fmt: &'t TextFormat,
+        annotations: &'t TextAnnotations,
+        char_idx: usize,
+    ) -> (Self, usize) {
+        // TODO divide long lines into blocks to avoid bad performance for long lines
+        let block_line_idx = text.char_to_line(char_idx.min(text.len_chars()));
+        let block_char_idx = text.line_to_char(block_line_idx);
+        annotations.reset_pos(block_char_idx);
+        (
+            DocumentFormatter {
+                text_fmt,
+                annotations,
+                visual_pos: Position { row: 0, col: 0 },
+                graphemes: RopeGraphemes::new(text.slice(block_char_idx..)),
+                char_pos: block_char_idx,
+                exhausted: false,
+                virtual_lines: 0,
+                indent_level: None,
+                peeked_grapheme: None,
+                word_buf: Vec::with_capacity(64),
+                word_i: 0,
+                line_pos: block_line_idx,
+                inline_anntoation_graphemes: None,
+            },
+            block_char_idx,
+        )
+    }
+
+    fn next_inline_annotation_grapheme(&mut self) -> Option<(&'t str, Option<Highlight>)> {
+        loop {
+            if let Some(&mut (ref mut annotation, highlight)) =
+                self.inline_anntoation_graphemes.as_mut()
+            {
+                if let Some(grapheme) = annotation.next() {
+                    return Some((grapheme, highlight));
+                }
+            }
+
+            if let Some((annotation, highlight)) =
+                self.annotations.next_inline_annotation_at(self.char_pos)
+            {
+                self.inline_anntoation_graphemes = Some((
+                    UnicodeSegmentation::graphemes(&*annotation.text, true),
+                    highlight,
+                ))
+            } else {
+                return None;
+            }
+        }
+    }
+
+    fn advance_grapheme(&mut self, col: usize) -> Option<FormattedGrapheme<'t>> {
+        let (grapheme, source) =
+            if let Some((grapheme, highlight)) = self.next_inline_annotation_grapheme() {
+                (grapheme.into(), GraphemeSource::VirtualText { highlight })
+            } else if let Some(grapheme) = self.graphemes.next() {
+                self.virtual_lines += self.annotations.annotation_lines_at(self.char_pos);
+                let codepoints = grapheme.len_chars() as u32;
+
+                let overlay = self.annotations.overlay_at(self.char_pos);
+                let grapheme = match overlay {
+                    Some((overlay, _)) => overlay.grapheme.as_str().into(),
+                    None => Cow::from(grapheme).into(),
+                };
+
+                self.char_pos += codepoints as usize;
+                (grapheme, GraphemeSource::Document { codepoints })
+            } else {
+                if self.exhausted {
+                    return None;
+                }
+                self.exhausted = true;
+                // EOF grapheme is required for rendering
+                // and correct position computations
+                return Some(FormattedGrapheme {
+                    grapheme: Grapheme::Other { g: " ".into() },
+                    source: GraphemeSource::Document { codepoints: 0 },
+                });
+            };
+
+        let grapheme = FormattedGrapheme::new(grapheme, col, self.text_fmt.tab_width, source);
+
+        Some(grapheme)
+    }
+
+    /// Move a word to the next visual line
+    fn wrap_word(&mut self, virtual_lines_before_word: usize) -> usize {
+        // softwrap this word to the next line
+        let indent_carry_over = if let Some(indent) = self.indent_level {
+            if indent as u16 <= self.text_fmt.max_indent_retain {
+                indent as u16
+            } else {
+                0
+            }
+        } else {
+            // ensure the indent stays 0
+            self.indent_level = Some(0);
+            0
+        };
+
+        self.visual_pos.col = indent_carry_over as usize;
+        self.virtual_lines -= virtual_lines_before_word;
+        self.visual_pos.row += 1 + virtual_lines_before_word;
+        let mut i = 0;
+        let mut word_width = 0;
+        let wrap_indicator = UnicodeSegmentation::graphemes(&*self.text_fmt.wrap_indicator, true)
+            .map(|g| {
+                i += 1;
+                let grapheme = FormattedGrapheme::new(
+                    g.into(),
+                    self.visual_pos.col + word_width,
+                    self.text_fmt.tab_width,
+                    GraphemeSource::VirtualText {
+                        highlight: self.text_fmt.wrap_indicator_highlight,
+                    },
+                );
+                word_width += grapheme.width();
+                grapheme
+            });
+        self.word_buf.splice(0..0, wrap_indicator);
+
+        for grapheme in &mut self.word_buf[i..] {
+            let visual_x = self.visual_pos.col + word_width;
+            grapheme
+                .grapheme
+                .change_position(visual_x, self.text_fmt.tab_width);
+            word_width += grapheme.width();
+        }
+        word_width
+    }
+
+    fn advance_to_next_word(&mut self) {
+        self.word_buf.clear();
+        let mut word_width = 0;
+        let virtual_lines_before_word = self.virtual_lines;
+        let mut virtual_lines_before_grapheme = self.virtual_lines;
+
+        loop {
+            // softwrap word if necessary
+            if word_width + self.visual_pos.col >= self.text_fmt.viewport_width as usize {
+                // wrapping this word would move too much text to the next line
+                // split the word at the line end instead
+                if word_width > self.text_fmt.max_wrap as usize {
+                    // Usually we stop accomulating graphemes as soon as softwrapping becomes necessary.
+                    // However if the last grapheme is multiple columns wide it might extend beyond the EOL.
+                    // The condition below ensures that this grapheme is not cutoff and instead wrapped to the next line
+                    if word_width + self.visual_pos.col > self.text_fmt.viewport_width as usize {
+                        self.peeked_grapheme = self.word_buf.pop().map(|grapheme| {
+                            (grapheme, self.virtual_lines - virtual_lines_before_grapheme)
+                        });
+                        self.virtual_lines = virtual_lines_before_grapheme;
+                    }
+                    return;
+                }
+
+                word_width = self.wrap_word(virtual_lines_before_word);
+            }
+
+            virtual_lines_before_grapheme = self.virtual_lines;
+
+            let grapheme = if let Some((grapheme, virtual_lines)) = self.peeked_grapheme.take() {
+                self.virtual_lines += virtual_lines;
+                grapheme
+            } else if let Some(grapheme) = self.advance_grapheme(self.visual_pos.col + word_width) {
+                grapheme
+            } else {
+                return;
+            };
+
+            // Track indentation
+            if !grapheme.is_whitespace() && self.indent_level.is_none() {
+                self.indent_level = Some(self.visual_pos.col);
+            } else if grapheme.grapheme == Grapheme::Newline {
+                self.indent_level = None;
+            }
+
+            let is_word_boundary = grapheme.is_word_boundary();
+            word_width += grapheme.width();
+            self.word_buf.push(grapheme);
+
+            if is_word_boundary {
+                return;
+            }
+        }
+    }
+
+    /// returns the document line pos of the **next** grapheme that will be yielded
+    pub fn line_pos(&self) -> usize {
+        self.line_pos
+    }
+
+    /// returns the visual pos of the **next** grapheme that will be yielded
+    pub fn visual_pos(&self) -> Position {
+        self.visual_pos
+    }
+}
+
+impl<'t> Iterator for DocumentFormatter<'t> {
+    type Item = (FormattedGrapheme<'t>, Position);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let grapheme = if self.text_fmt.soft_wrap {
+            if self.word_i >= self.word_buf.len() {
+                self.advance_to_next_word();
+                self.word_i = 0;
+            }
+            let grapheme = replace(
+                self.word_buf.get_mut(self.word_i)?,
+                FormattedGrapheme::placeholder(),
+            );
+            self.word_i += 1;
+            grapheme
+        } else {
+            self.advance_grapheme(self.visual_pos.col)?
+        };
+
+        let pos = self.visual_pos;
+        if grapheme.grapheme == Grapheme::Newline {
+            self.visual_pos.row += 1;
+            self.visual_pos.row += take(&mut self.virtual_lines);
+            self.visual_pos.col = 0;
+            self.line_pos += 1;
+        } else {
+            self.visual_pos.col += grapheme.width();
+        }
+        Some((grapheme, pos))
+    }
+}
diff --git a/helix-core/src/doc_formatter/test.rs b/helix-core/src/doc_formatter/test.rs
new file mode 100644
index 00000000..e68b31fd
--- /dev/null
+++ b/helix-core/src/doc_formatter/test.rs
@@ -0,0 +1,222 @@
+use std::rc::Rc;
+
+use crate::doc_formatter::{DocumentFormatter, TextFormat};
+use crate::text_annotations::{InlineAnnotation, Overlay, TextAnnotations};
+
+impl TextFormat {
+    fn new_test(softwrap: bool) -> Self {
+        TextFormat {
+            soft_wrap: softwrap,
+            tab_width: 2,
+            max_wrap: 3,
+            max_indent_retain: 4,
+            wrap_indicator: ".".into(),
+            wrap_indicator_highlight: None,
+            // use a prime number to allow lining up too often with repeat
+            viewport_width: 17,
+        }
+    }
+}
+
+impl<'t> DocumentFormatter<'t> {
+    fn collect_to_str(&mut self) -> String {
+        use std::fmt::Write;
+        let mut res = String::new();
+        let viewport_width = self.text_fmt.viewport_width;
+        let mut line = 0;
+
+        for (grapheme, pos) in self {
+            if pos.row != line {
+                line += 1;
+                assert_eq!(pos.row, line);
+                write!(res, "\n{}", ".".repeat(pos.col)).unwrap();
+                assert!(
+                    pos.col <= viewport_width as usize,
+                    "softwrapped failed {}<={viewport_width}",
+                    pos.col
+                );
+            }
+            write!(res, "{}", grapheme.grapheme).unwrap();
+        }
+
+        res
+    }
+}
+
+fn softwrap_text(text: &str) -> String {
+    DocumentFormatter::new_at_prev_checkpoint(
+        text.into(),
+        &TextFormat::new_test(true),
+        &TextAnnotations::default(),
+        0,
+    )
+    .0
+    .collect_to_str()
+}
+
+#[test]
+fn basic_softwrap() {
+    assert_eq!(
+        softwrap_text(&"foo ".repeat(10)),
+        "foo foo foo foo \n.foo foo foo foo \n.foo foo  "
+    );
+    assert_eq!(
+        softwrap_text(&"fooo ".repeat(10)),
+        "fooo fooo fooo \n.fooo fooo fooo \n.fooo fooo fooo \n.fooo  "
+    );
+
+    // check that we don't wrap unnecessarily
+    assert_eq!(softwrap_text("\t\txxxx1xxxx2xx\n"), "    xxxx1xxxx2xx \n ");
+}
+
+#[test]
+fn softwrap_indentation() {
+    assert_eq!(
+        softwrap_text("\t\tfoo1 foo2 foo3 foo4 foo5 foo6\n"),
+        "    foo1 foo2 \n.....foo3 foo4 \n.....foo5 foo6 \n "
+    );
+    assert_eq!(
+        softwrap_text("\t\t\tfoo1 foo2 foo3 foo4 foo5 foo6\n"),
+        "      foo1 foo2 \n.foo3 foo4 foo5 \n.foo6 \n "
+    );
+}
+
+#[test]
+fn long_word_softwrap() {
+    assert_eq!(
+        softwrap_text("\t\txxxx1xxxx2xxxx3xxxx4xxxx5xxxx6xxxx7xxxx8xxxx9xxx\n"),
+        "    xxxx1xxxx2xxx\n.....x3xxxx4xxxx5\n.....xxxx6xxxx7xx\n.....xx8xxxx9xxx \n "
+    );
+    assert_eq!(
+        softwrap_text("xxxxxxxx1xxxx2xxx\n"),
+        "xxxxxxxx1xxxx2xxx\n. \n "
+    );
+    assert_eq!(
+        softwrap_text("\t\txxxx1xxxx 2xxxx3xxxx4xxxx5xxxx6xxxx7xxxx8xxxx9xxx\n"),
+        "    xxxx1xxxx \n.....2xxxx3xxxx4x\n.....xxx5xxxx6xxx\n.....x7xxxx8xxxx9\n.....xxx \n "
+    );
+    assert_eq!(
+        softwrap_text("\t\txxxx1xxx 2xxxx3xxxx4xxxx5xxxx6xxxx7xxxx8xxxx9xxx\n"),
+        "    xxxx1xxx 2xxx\n.....x3xxxx4xxxx5\n.....xxxx6xxxx7xx\n.....xx8xxxx9xxx \n "
+    );
+}
+
+fn overlay_text(text: &str, char_pos: usize, softwrap: bool, overlays: &[Overlay]) -> String {
+    DocumentFormatter::new_at_prev_checkpoint(
+        text.into(),
+        &TextFormat::new_test(softwrap),
+        TextAnnotations::default().add_overlay(overlays.into(), None),
+        char_pos,
+    )
+    .0
+    .collect_to_str()
+}
+
+#[test]
+fn overlay() {
+    assert_eq!(
+        overlay_text(
+            "foobar",
+            0,
+            false,
+            &[
+                Overlay {
+                    char_idx: 0,
+                    grapheme: "X".into(),
+                },
+                Overlay {
+                    char_idx: 2,
+                    grapheme: "\t".into(),
+                },
+            ]
+        ),
+        "Xo  bar "
+    );
+    assert_eq!(
+        overlay_text(
+            &"foo ".repeat(10),
+            0,
+            true,
+            &[
+                Overlay {
+                    char_idx: 2,
+                    grapheme: "\t".into(),
+                },
+                Overlay {
+                    char_idx: 5,
+                    grapheme: "\t".into(),
+                },
+                Overlay {
+                    char_idx: 16,
+                    grapheme: "X".into(),
+                },
+            ]
+        ),
+        "fo   f  o foo \n.foo Xoo foo foo \n.foo foo foo  "
+    );
+}
+
+fn annotate_text(text: &str, softwrap: bool, annotations: &[InlineAnnotation]) -> String {
+    DocumentFormatter::new_at_prev_checkpoint(
+        text.into(),
+        &TextFormat::new_test(softwrap),
+        TextAnnotations::default().add_inline_annotations(annotations.into(), None),
+        0,
+    )
+    .0
+    .collect_to_str()
+}
+
+#[test]
+fn annotation() {
+    assert_eq!(
+        annotate_text(
+            "bar",
+            false,
+            &[InlineAnnotation {
+                char_idx: 0,
+                text: "foo".into(),
+            }]
+        ),
+        "foobar "
+    );
+    assert_eq!(
+        annotate_text(
+            &"foo ".repeat(10),
+            true,
+            &[InlineAnnotation {
+                char_idx: 0,
+                text: "foo ".into(),
+            }]
+        ),
+        "foo foo foo foo \n.foo foo foo foo \n.foo foo foo  "
+    );
+}
+#[test]
+fn annotation_and_overlay() {
+    assert_eq!(
+        DocumentFormatter::new_at_prev_checkpoint(
+            "bbar".into(),
+            &TextFormat::new_test(false),
+            TextAnnotations::default()
+                .add_inline_annotations(
+                    Rc::new([InlineAnnotation {
+                        char_idx: 0,
+                        text: "fooo".into(),
+                    }]),
+                    None
+                )
+                .add_overlay(
+                    Rc::new([Overlay {
+                        char_idx: 0,
+                        grapheme: "\t".into(),
+                    }]),
+                    None
+                ),
+            0,
+        )
+        .0
+        .collect_to_str(),
+        "fooo  bar "
+    );
+}
diff --git a/helix-core/src/graphemes.rs b/helix-core/src/graphemes.rs
index 675f5750..15ef3eb0 100644
--- a/helix-core/src/graphemes.rs
+++ b/helix-core/src/graphemes.rs
@@ -5,7 +5,88 @@ use ropey::{iter::Chunks, str_utils::byte_to_char_idx, RopeSlice};
 use unicode_segmentation::{GraphemeCursor, GraphemeIncomplete};
 use unicode_width::UnicodeWidthStr;
 
-use std::fmt;
+use std::borrow::Cow;
+use std::fmt::{self, Debug, Display};
+use std::marker::PhantomData;
+use std::ops::Deref;
+use std::ptr::NonNull;
+use std::{slice, str};
+
+use crate::chars::{char_is_whitespace, char_is_word};
+use crate::LineEnding;
+
+#[inline]
+pub fn tab_width_at(visual_x: usize, tab_width: u16) -> usize {
+    tab_width as usize - (visual_x % tab_width as usize)
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Grapheme<'a> {
+    Newline,
+    Tab { width: usize },
+    Other { g: GraphemeStr<'a> },
+}
+
+impl<'a> Grapheme<'a> {
+    pub fn new(g: GraphemeStr<'a>, visual_x: usize, tab_width: u16) -> Grapheme<'a> {
+        match g {
+            g if g == "\t" => Grapheme::Tab {
+                width: tab_width_at(visual_x, tab_width),
+            },
+            _ if LineEnding::from_str(&g).is_some() => Grapheme::Newline,
+            _ => Grapheme::Other { g },
+        }
+    }
+
+    pub fn change_position(&mut self, visual_x: usize, tab_width: u16) {
+        if let Grapheme::Tab { width } = self {
+            *width = tab_width_at(visual_x, tab_width)
+        }
+    }
+
+    /// Returns the a visual width of this grapheme,
+    #[inline]
+    pub fn width(&self) -> usize {
+        match *self {
+            // width is not cached because we are dealing with
+            // ASCII almost all the time which already has a fastpath
+            // it's okay to convert to u16 here because no codepoint has a width larger
+            // than 2 and graphemes are usually atmost two visible codepoints wide
+            Grapheme::Other { ref g } => grapheme_width(g),
+            Grapheme::Tab { width } => width,
+            Grapheme::Newline => 1,
+        }
+    }
+
+    pub fn is_whitespace(&self) -> bool {
+        !matches!(&self, Grapheme::Other { g } if !g.chars().all(char_is_whitespace))
+    }
+
+    // TODO currently word boundaries are used for softwrapping.
+    // This works best for programming languages and well for prose.
+    // This could however be improved in the future by considering unicode
+    // character classes but
+    pub fn is_word_boundary(&self) -> bool {
+        !matches!(&self, Grapheme::Other { g,.. } if g.chars().all(char_is_word))
+    }
+}
+
+impl Display for Grapheme<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match *self {
+            Grapheme::Newline => write!(f, " "),
+            Grapheme::Tab { width } => {
+                for _ in 0..width {
+                    write!(f, " ")?;
+                }
+                Ok(())
+            }
+            Grapheme::Other { ref g } => {
+                write!(f, "{g}")
+            }
+        }
+    }
+}
 
 #[must_use]
 pub fn grapheme_width(g: &str) -> usize {
@@ -27,6 +108,8 @@ pub fn grapheme_width(g: &str) -> usize {
         // We use max(1) here because all grapeheme clusters--even illformed
         // ones--should have at least some width so they can be edited
         // properly.
+        // TODO properly handle unicode width for all codepoints
+        // example of where unicode width is currently wrong: 🤦🏼‍♂️ (taken from https://hsivonen.fi/string-length/)
         UnicodeWidthStr::width(g).max(1)
     }
 }
@@ -341,3 +424,101 @@ impl<'a> Iterator for RopeGraphemes<'a> {
         }
     }
 }
+
+/// A highly compressed Cow<'a, str> that holds
+/// atmost u31::MAX bytes and is readonly
+pub struct GraphemeStr<'a> {
+    ptr: NonNull<u8>,
+    len: u32,
+    phantom: PhantomData<&'a str>,
+}
+
+impl GraphemeStr<'_> {
+    const MASK_OWNED: u32 = 1 << 31;
+
+    fn compute_len(&self) -> usize {
+        (self.len & !Self::MASK_OWNED) as usize
+    }
+}
+
+impl Deref for GraphemeStr<'_> {
+    type Target = str;
+    fn deref(&self) -> &Self::Target {
+        unsafe {
+            let bytes = slice::from_raw_parts(self.ptr.as_ptr(), self.compute_len());
+            str::from_utf8_unchecked(bytes)
+        }
+    }
+}
+
+impl Drop for GraphemeStr<'_> {
+    fn drop(&mut self) {
+        if self.len & Self::MASK_OWNED != 0 {
+            // free allocation
+            unsafe {
+                drop(Box::from_raw(slice::from_raw_parts_mut(
+                    self.ptr.as_ptr(),
+                    self.compute_len(),
+                )));
+            }
+        }
+    }
+}
+
+impl<'a> From<&'a str> for GraphemeStr<'a> {
+    fn from(g: &'a str) -> Self {
+        GraphemeStr {
+            ptr: unsafe { NonNull::new_unchecked(g.as_bytes().as_ptr() as *mut u8) },
+            len: i32::try_from(g.len()).unwrap() as u32,
+            phantom: PhantomData,
+        }
+    }
+}
+
+impl<'a> From<String> for GraphemeStr<'a> {
+    fn from(g: String) -> Self {
+        let len = g.len();
+        let ptr = Box::into_raw(g.into_bytes().into_boxed_slice()) as *mut u8;
+        GraphemeStr {
+            ptr: unsafe { NonNull::new_unchecked(ptr) },
+            len: i32::try_from(len).unwrap() as u32,
+            phantom: PhantomData,
+        }
+    }
+}
+
+impl<'a> From<Cow<'a, str>> for GraphemeStr<'a> {
+    fn from(g: Cow<'a, str>) -> Self {
+        match g {
+            Cow::Borrowed(g) => g.into(),
+            Cow::Owned(g) => g.into(),
+        }
+    }
+}
+
+impl<T: Deref<Target = str>> PartialEq<T> for GraphemeStr<'_> {
+    fn eq(&self, other: &T) -> bool {
+        self.deref() == other.deref()
+    }
+}
+impl PartialEq<str> for GraphemeStr<'_> {
+    fn eq(&self, other: &str) -> bool {
+        self.deref() == other
+    }
+}
+impl Eq for GraphemeStr<'_> {}
+impl Debug for GraphemeStr<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        Debug::fmt(self.deref(), f)
+    }
+}
+impl Display for GraphemeStr<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        Display::fmt(self.deref(), f)
+    }
+}
+impl Clone for GraphemeStr<'_> {
+    fn clone(&self) -> Self {
+        self.deref().to_owned().into()
+    }
+}
diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index ee174e69..e3f862a6 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -6,6 +6,7 @@ pub mod comment;
 pub mod config;
 pub mod diagnostic;
 pub mod diff;
+pub mod doc_formatter;
 pub mod graphemes;
 pub mod history;
 pub mod increment;
@@ -24,6 +25,7 @@ pub mod shellwords;
 pub mod surround;
 pub mod syntax;
 pub mod test;
+pub mod text_annotations;
 pub mod textobject;
 mod transaction;
 pub mod wrap;
@@ -95,8 +97,12 @@ pub use {regex, tree_sitter};
 
 pub use graphemes::RopeGraphemes;
 pub use position::{
-    coords_at_pos, pos_at_coords, pos_at_visual_coords, visual_coords_at_pos, Position,
+    char_idx_at_visual_offset, coords_at_pos, pos_at_coords, visual_offset_from_anchor,
+    visual_offset_from_block, Position,
 };
+#[allow(deprecated)]
+pub use position::{pos_at_visual_coords, visual_coords_at_pos};
+
 pub use selection::{Range, Selection};
 pub use smallvec::{smallvec, SmallVec};
 pub use syntax::Syntax;
diff --git a/helix-core/src/movement.rs b/helix-core/src/movement.rs
index 278375e8..11c12a6f 100644
--- a/helix-core/src/movement.rs
+++ b/helix-core/src/movement.rs
@@ -4,16 +4,19 @@ use ropey::iter::Chars;
 use tree_sitter::{Node, QueryCursor};
 
 use crate::{
+    char_idx_at_visual_offset,
     chars::{categorize_char, char_is_line_ending, CharCategory},
+    doc_formatter::TextFormat,
     graphemes::{
         next_grapheme_boundary, nth_next_grapheme_boundary, nth_prev_grapheme_boundary,
         prev_grapheme_boundary,
     },
     line_ending::rope_is_line_ending,
-    pos_at_visual_coords,
+    position::char_idx_at_visual_block_offset,
     syntax::LanguageConfiguration,
+    text_annotations::TextAnnotations,
     textobject::TextObject,
-    visual_coords_at_pos, Position, Range, RopeSlice,
+    visual_offset_from_block, Range, RopeSlice,
 };
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
@@ -34,7 +37,8 @@ pub fn move_horizontally(
     dir: Direction,
     count: usize,
     behaviour: Movement,
-    _: usize,
+    _: &TextFormat,
+    _: &mut TextAnnotations,
 ) -> Range {
     let pos = range.cursor(slice);
 
@@ -48,35 +52,116 @@ pub fn move_horizontally(
     range.put_cursor(slice, new_pos, behaviour == Movement::Extend)
 }
 
+pub fn move_vertically_visual(
+    slice: RopeSlice,
+    range: Range,
+    dir: Direction,
+    count: usize,
+    behaviour: Movement,
+    text_fmt: &TextFormat,
+    annotations: &mut TextAnnotations,
+) -> Range {
+    if !text_fmt.soft_wrap {
+        move_vertically(slice, range, dir, count, behaviour, text_fmt, annotations);
+    }
+    annotations.clear_line_annotations();
+    let pos = range.cursor(slice);
+
+    // Compute the current position's 2d coordinates.
+    let (visual_pos, block_off) = visual_offset_from_block(slice, pos, pos, text_fmt, annotations);
+    let new_col = range
+        .old_visual_position
+        .map_or(visual_pos.col as u32, |(_, col)| col);
+
+    // Compute the new position.
+    let mut row_off = match dir {
+        Direction::Forward => count as isize,
+        Direction::Backward => -(count as isize),
+    };
+
+    // TODO how to handle inline annotations that span an entire visual line (very unlikely).
+
+    // Compute visual offset relative to block start to avoid trasversing the block twice
+    row_off += visual_pos.row as isize;
+    let new_pos = char_idx_at_visual_offset(
+        slice,
+        block_off,
+        row_off,
+        new_col as usize,
+        text_fmt,
+        annotations,
+    )
+    .0;
+
+    // Special-case to avoid moving to the end of the last non-empty line.
+    if behaviour == Movement::Extend && slice.line(slice.char_to_line(new_pos)).len_chars() == 0 {
+        return range;
+    }
+
+    let mut new_range = range.put_cursor(slice, new_pos, behaviour == Movement::Extend);
+    new_range.old_visual_position = Some((0, new_col));
+    new_range
+}
+
 pub fn move_vertically(
     slice: RopeSlice,
     range: Range,
     dir: Direction,
     count: usize,
     behaviour: Movement,
-    tab_width: usize,
+    text_fmt: &TextFormat,
+    annotations: &mut TextAnnotations,
 ) -> Range {
+    annotations.clear_line_annotations();
     let pos = range.cursor(slice);
+    let line_idx = slice.char_to_line(pos);
+    let line_start = slice.line_to_char(line_idx);
 
     // Compute the current position's 2d coordinates.
-    let Position { row, col } = visual_coords_at_pos(slice, pos, tab_width);
-    let horiz = range.horiz.unwrap_or(col as u32);
+    let visual_pos = visual_offset_from_block(slice, line_start, pos, text_fmt, annotations).0;
+    let (mut new_row, new_col) = range
+        .old_visual_position
+        .map_or((visual_pos.row as u32, visual_pos.col as u32), |pos| pos);
+    new_row = new_row.max(visual_pos.row as u32);
+    let line_idx = slice.char_to_line(pos);
 
     // Compute the new position.
-    let new_row = match dir {
-        Direction::Forward => (row + count).min(slice.len_lines().saturating_sub(1)),
-        Direction::Backward => row.saturating_sub(count),
+    let mut new_line_idx = match dir {
+        Direction::Forward => line_idx.saturating_add(count),
+        Direction::Backward => line_idx.saturating_sub(count),
     };
-    let new_col = col.max(horiz as usize);
-    let new_pos = pos_at_visual_coords(slice, Position::new(new_row, new_col), tab_width);
+
+    let line = if new_line_idx >= slice.len_lines() - 1 {
+        // there is no line terminator for the last line
+        // so the logic below is not necessary here
+        new_line_idx = slice.len_lines() - 1;
+        slice
+    } else {
+        // char_idx_at_visual_block_offset returns a one-past-the-end index
+        // in case it reaches the end of the slice
+        // to avoid moving to the nextline in that case the line terminator is removed from the line
+        let new_line_end = prev_grapheme_boundary(slice, slice.line_to_char(new_line_idx + 1));
+        slice.slice(..new_line_end)
+    };
+
+    let new_line_start = line.line_to_char(new_line_idx);
+
+    let (new_pos, _) = char_idx_at_visual_block_offset(
+        line,
+        new_line_start,
+        new_row as usize,
+        new_col as usize,
+        text_fmt,
+        annotations,
+    );
 
     // Special-case to avoid moving to the end of the last non-empty line.
-    if behaviour == Movement::Extend && slice.line(new_row).len_chars() == 0 {
+    if behaviour == Movement::Extend && slice.line(new_line_idx).len_chars() == 0 {
         return range;
     }
 
     let mut new_range = range.put_cursor(slice, new_pos, behaviour == Movement::Extend);
-    new_range.horiz = Some(horiz);
+    new_range.old_visual_position = Some((new_row, new_col));
     new_range
 }
 
@@ -473,7 +558,16 @@ mod test {
         assert_eq!(
             coords_at_pos(
                 slice,
-                move_vertically(slice, range, Direction::Forward, 1, Movement::Move, 4).head
+                move_vertically_visual(
+                    slice,
+                    range,
+                    Direction::Forward,
+                    1,
+                    Movement::Move,
+                    &TextFormat::default(),
+                    &mut TextAnnotations::default(),
+                )
+                .head
             ),
             (1, 3).into()
         );
@@ -497,7 +591,15 @@ mod test {
         ];
 
         for ((direction, amount), coordinates) in moves_and_expected_coordinates {
-            range = move_horizontally(slice, range, direction, amount, Movement::Move, 0);
+            range = move_horizontally(
+                slice,
+                range,
+                direction,
+                amount,
+                Movement::Move,
+                &TextFormat::default(),
+                &mut TextAnnotations::default(),
+            );
             assert_eq!(coords_at_pos(slice, range.head), coordinates.into())
         }
     }
@@ -523,7 +625,15 @@ mod test {
         ];
 
         for ((direction, amount), coordinates) in moves_and_expected_coordinates {
-            range = move_horizontally(slice, range, direction, amount, Movement::Move, 0);
+            range = move_horizontally(
+                slice,
+                range,
+                direction,
+                amount,
+                Movement::Move,
+                &TextFormat::default(),
+                &mut TextAnnotations::default(),
+            );
             assert_eq!(coords_at_pos(slice, range.head), coordinates.into());
             assert_eq!(range.head, range.anchor);
         }
@@ -545,7 +655,15 @@ mod test {
         ];
 
         for (direction, amount) in moves {
-            range = move_horizontally(slice, range, direction, amount, Movement::Extend, 0);
+            range = move_horizontally(
+                slice,
+                range,
+                direction,
+                amount,
+                Movement::Extend,
+                &TextFormat::default(),
+                &mut TextAnnotations::default(),
+            );
             assert_eq!(range.anchor, original_anchor);
         }
     }
@@ -569,7 +687,15 @@ mod test {
         ];
 
         for ((direction, amount), coordinates) in moves_and_expected_coordinates {
-            range = move_vertically(slice, range, direction, amount, Movement::Move, 4);
+            range = move_vertically_visual(
+                slice,
+                range,
+                direction,
+                amount,
+                Movement::Move,
+                &TextFormat::default(),
+                &mut TextAnnotations::default(),
+            );
             assert_eq!(coords_at_pos(slice, range.head), coordinates.into());
             assert_eq!(range.head, range.anchor);
         }
@@ -603,8 +729,24 @@ mod test {
 
         for ((axis, direction, amount), coordinates) in moves_and_expected_coordinates {
             range = match axis {
-                Axis::H => move_horizontally(slice, range, direction, amount, Movement::Move, 0),
-                Axis::V => move_vertically(slice, range, direction, amount, Movement::Move, 4),
+                Axis::H => move_horizontally(
+                    slice,
+                    range,
+                    direction,
+                    amount,
+                    Movement::Move,
+                    &TextFormat::default(),
+                    &mut TextAnnotations::default(),
+                ),
+                Axis::V => move_vertically_visual(
+                    slice,
+                    range,
+                    direction,
+                    amount,
+                    Movement::Move,
+                    &TextFormat::default(),
+                    &mut TextAnnotations::default(),
+                ),
             };
             assert_eq!(coords_at_pos(slice, range.head), coordinates.into());
             assert_eq!(range.head, range.anchor);
@@ -638,8 +780,24 @@ mod test {
 
         for ((axis, direction, amount), coordinates) in moves_and_expected_coordinates {
             range = match axis {
-                Axis::H => move_horizontally(slice, range, direction, amount, Movement::Move, 0),
-                Axis::V => move_vertically(slice, range, direction, amount, Movement::Move, 4),
+                Axis::H => move_horizontally(
+                    slice,
+                    range,
+                    direction,
+                    amount,
+                    Movement::Move,
+                    &TextFormat::default(),
+                    &mut TextAnnotations::default(),
+                ),
+                Axis::V => move_vertically_visual(
+                    slice,
+                    range,
+                    direction,
+                    amount,
+                    Movement::Move,
+                    &TextFormat::default(),
+                    &mut TextAnnotations::default(),
+                ),
             };
             assert_eq!(coords_at_pos(slice, range.head), coordinates.into());
             assert_eq!(range.head, range.anchor);
diff --git a/helix-core/src/position.rs b/helix-core/src/position.rs
index f456eb98..7b8dc326 100644
--- a/helix-core/src/position.rs
+++ b/helix-core/src/position.rs
@@ -1,9 +1,11 @@
-use std::borrow::Cow;
+use std::{borrow::Cow, cmp::Ordering};
 
 use crate::{
     chars::char_is_line_ending,
+    doc_formatter::{DocumentFormatter, TextFormat},
     graphemes::{ensure_grapheme_boundary_prev, grapheme_width, RopeGraphemes},
     line_ending::line_end_char_index,
+    text_annotations::TextAnnotations,
     RopeSlice,
 };
 
@@ -73,6 +75,13 @@ pub fn coords_at_pos(text: RopeSlice, pos: usize) -> Position {
 /// Takes \t, double-width characters (CJK) into account as well as text
 /// not in the document in the future.
 /// See [`coords_at_pos`] for an "objective" one.
+///
+/// This function should be used very rarely. Usually `visual_offset_from_anchor`
+/// or `visual_offset_from_block` is preferable. However when you want to compute the
+/// actual visual row/column in the text (not what is actually shown on screen)
+/// then you should use this function. For example aligning text should ignore virtual
+/// text and softwrap.
+#[deprecated = "Doesn't account for softwrap or decorations, use visual_offset_from_anchor instead"]
 pub fn visual_coords_at_pos(text: RopeSlice, pos: usize, tab_width: usize) -> Position {
     let line = text.char_to_line(pos);
 
@@ -93,6 +102,82 @@ pub fn visual_coords_at_pos(text: RopeSlice, pos: usize, tab_width: usize) -> Po
     Position::new(line, col)
 }
 
+/// Returns the visual offset from the start of the first visual line
+/// in the block that contains anchor.
+/// Text is always wrapped at blocks, they usually correspond to
+/// actual line breaks but for very long lines
+/// softwrapping positions are estimated with an O(1) algorithm
+/// to ensure consistent performance for large lines (currently unimplemented)
+///
+/// Usualy you want to use `visual_offset_from_anchor` instead but this function
+/// can be useful (and faster) if
+/// * You already know the visual position of the block
+/// * You only care about the horizontal offset (column) and not the vertical offset (row)
+pub fn visual_offset_from_block(
+    text: RopeSlice,
+    anchor: usize,
+    pos: usize,
+    text_fmt: &TextFormat,
+    annotations: &TextAnnotations,
+) -> (Position, usize) {
+    let mut last_pos = Position::default();
+    let (formatter, block_start) =
+        DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, annotations, anchor);
+    let mut char_pos = block_start;
+
+    for (grapheme, vpos) in formatter {
+        last_pos = vpos;
+        char_pos += grapheme.doc_chars();
+
+        if char_pos > pos {
+            return (last_pos, block_start);
+        }
+    }
+
+    (last_pos, block_start)
+}
+
+/// Returns the visual offset from the start of the visual line
+/// that contains anchor.
+pub fn visual_offset_from_anchor(
+    text: RopeSlice,
+    anchor: usize,
+    pos: usize,
+    text_fmt: &TextFormat,
+    annotations: &TextAnnotations,
+    max_rows: usize,
+) -> Option<(Position, usize)> {
+    let (formatter, block_start) =
+        DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, annotations, anchor);
+    let mut char_pos = block_start;
+    let mut anchor_line = None;
+    let mut last_pos = Position::default();
+
+    for (grapheme, vpos) in formatter {
+        last_pos = vpos;
+        char_pos += grapheme.doc_chars();
+
+        if char_pos > anchor && anchor_line.is_none() {
+            anchor_line = Some(last_pos.row);
+        }
+        if char_pos > pos {
+            last_pos.row -= anchor_line.unwrap();
+            return Some((last_pos, block_start));
+        }
+
+        if let Some(anchor_line) = anchor_line {
+            if vpos.row >= anchor_line + max_rows {
+                return None;
+            }
+        }
+    }
+
+    let anchor_line = anchor_line.unwrap_or(last_pos.row);
+    last_pos.row -= anchor_line;
+
+    Some((last_pos, block_start))
+}
+
 /// Convert (line, column) coordinates to a character index.
 ///
 /// If the `line` coordinate is beyond the end of the file, the EOF
@@ -140,6 +225,11 @@ pub fn pos_at_coords(text: RopeSlice, coords: Position, limit_before_line_ending
 /// If the `column` coordinate is past the end of the given line, the
 /// line-end position (in this case, just before the line ending
 /// character) will be returned.
+/// This function should be used very rarely. Usually `char_idx_at_visual_offset` is preferable.
+/// However when you want to compute a char position from the visual row/column in the text
+/// (not what is actually shown on screen) then you should use this function.
+/// For example aligning text should ignore virtual text and softwrap.
+#[deprecated = "Doesn't account for softwrap or decorations, use char_idx_at_visual_offset instead"]
 pub fn pos_at_visual_coords(text: RopeSlice, coords: Position, tab_width: usize) -> usize {
     let Position { mut row, col } = coords;
     row = row.min(text.len_lines() - 1);
@@ -169,6 +259,120 @@ pub fn pos_at_visual_coords(text: RopeSlice, coords: Position, tab_width: usize)
     line_start + col_char_offset
 }
 
+/// Returns the char index on the visual line `row_offset` below the visual line of
+/// the provided char index `anchor` that is closest to the supplied visual `column`.
+///
+/// If the targeted visual line is entirely covered by virtual text the last
+/// char position before the virtual text and a virtual offset is returned instead.
+///
+/// If no (text) grapheme starts at exactly at the specified column the
+/// start of the grapheme to the left is returned. If there is no grapheme
+/// to the left (for example if the line starts with virtual text) then the positiong
+/// of the next grapheme to the right is returned.
+///
+/// If the `line` coordinate is beyond the end of the file, the EOF
+/// position will be returned.
+///
+/// If the `column` coordinate is past the end of the given line, the
+/// line-end position (in this case, just before the line ending
+/// character) will be returned.
+///
+/// # Returns
+///
+/// `(real_char_idx, virtual_lines)`
+///
+/// The nearest character idx "closest" (see above) to the specified visual offset
+/// on the visual line is returned if the visual line contains any text:
+/// If the visual line at the specified offset is a virtual line generated by a `LineAnnotation`
+/// the previous char_index is returned, together with the remaining vertical offset (`virtual_lines`)
+pub fn char_idx_at_visual_offset<'a>(
+    text: RopeSlice<'a>,
+    mut anchor: usize,
+    mut row_offset: isize,
+    column: usize,
+    text_fmt: &TextFormat,
+    annotations: &TextAnnotations,
+) -> (usize, usize) {
+    // convert row relative to visual line containing anchor to row relative to a block containing anchor (anchor may change)
+    loop {
+        let (visual_pos_in_block, block_char_offset) =
+            visual_offset_from_block(text, anchor, anchor, text_fmt, annotations);
+        row_offset += visual_pos_in_block.row as isize;
+        anchor = block_char_offset;
+        if row_offset >= 0 {
+            break;
+        }
+
+        if block_char_offset == 0 {
+            row_offset = 0;
+            break;
+        }
+        // the row_offset is negative so we need to look at the previous block
+        // set the anchor to the last char before the current block
+        // this char index is also always a line earlier so increase the row_offset by 1
+        anchor -= 1;
+        row_offset += 1;
+    }
+
+    char_idx_at_visual_block_offset(
+        text,
+        anchor,
+        row_offset as usize,
+        column,
+        text_fmt,
+        annotations,
+    )
+}
+
+/// This function behaves the same as `char_idx_at_visual_offset`, except that
+/// the vertical offset `row` is always computed relative to the block that contains `anchor`
+/// instead of the visual line that contains `anchor`.
+/// Usually `char_idx_at_visual_offset` is more useful but this function can be
+/// used in some situations as an optimization when `visual_offset_from_block` was used
+///
+/// # Returns
+///
+/// `(real_char_idx, virtual_lines)`
+///
+/// See `char_idx_at_visual_offset` for details
+pub fn char_idx_at_visual_block_offset(
+    text: RopeSlice,
+    anchor: usize,
+    row: usize,
+    column: usize,
+    text_fmt: &TextFormat,
+    annotations: &TextAnnotations,
+) -> (usize, usize) {
+    let (formatter, mut char_idx) =
+        DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, annotations, anchor);
+    let mut last_char_idx = char_idx;
+    let mut last_char_idx_on_line = None;
+    let mut last_row = 0;
+    for (grapheme, grapheme_pos) in formatter {
+        match grapheme_pos.row.cmp(&row) {
+            Ordering::Equal => {
+                if grapheme_pos.col + grapheme.width() > column {
+                    if !grapheme.is_virtual() {
+                        return (char_idx, 0);
+                    } else if let Some(char_idx) = last_char_idx_on_line {
+                        return (char_idx, 0);
+                    }
+                } else if !grapheme.is_virtual() {
+                    last_char_idx_on_line = Some(char_idx)
+                }
+            }
+            Ordering::Greater => return (last_char_idx, row - last_row),
+            _ => (),
+        }
+
+        last_char_idx = char_idx;
+        last_row = grapheme_pos.row;
+        char_idx += grapheme.doc_chars();
+    }
+
+    (char_idx, 0)
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
@@ -228,6 +432,7 @@ mod test {
     }
 
     #[test]
+    #[allow(deprecated)]
     fn test_visual_coords_at_pos() {
         let text = Rope::from("ḧëḷḷö\nẅöṛḷḋ");
         let slice = text.slice(..);
@@ -275,6 +480,130 @@ mod test {
         assert_eq!(visual_coords_at_pos(slice, 2, 8), (0, 9).into());
     }
 
+    #[test]
+    fn test_visual_off_from_block() {
+        let text = Rope::from("ḧëḷḷö\nẅöṛḷḋ");
+        let slice = text.slice(..);
+        let annot = TextAnnotations::default();
+        let text_fmt = TextFormat::default();
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 0, &text_fmt, &annot).0,
+            (0, 0).into()
+        );
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 5, &text_fmt, &annot).0,
+            (0, 5).into()
+        ); // position on \n
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 6, &text_fmt, &annot).0,
+            (1, 0).into()
+        ); // position on w
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 7, &text_fmt, &annot).0,
+            (1, 1).into()
+        ); // position on o
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 10, &text_fmt, &annot).0,
+            (1, 4).into()
+        ); // position on d
+
+        // Test with wide characters.
+        let text = Rope::from("今日はいい\n");
+        let slice = text.slice(..);
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 0, &text_fmt, &annot).0,
+            (0, 0).into()
+        );
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 1, &text_fmt, &annot).0,
+            (0, 2).into()
+        );
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 2, &text_fmt, &annot).0,
+            (0, 4).into()
+        );
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 3, &text_fmt, &annot).0,
+            (0, 6).into()
+        );
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 4, &text_fmt, &annot).0,
+            (0, 8).into()
+        );
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 5, &text_fmt, &annot).0,
+            (0, 10).into()
+        );
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 6, &text_fmt, &annot).0,
+            (1, 0).into()
+        );
+
+        // Test with grapheme clusters.
+        let text = Rope::from("a̐éö̲\r\n");
+        let slice = text.slice(..);
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 0, &text_fmt, &annot).0,
+            (0, 0).into()
+        );
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 2, &text_fmt, &annot).0,
+            (0, 1).into()
+        );
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 4, &text_fmt, &annot).0,
+            (0, 2).into()
+        );
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 7, &text_fmt, &annot).0,
+            (0, 3).into()
+        );
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 9, &text_fmt, &annot).0,
+            (1, 0).into()
+        );
+
+        // Test with wide-character grapheme clusters.
+        // TODO: account for cluster.
+        let text = Rope::from("किमपि\n");
+        let slice = text.slice(..);
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 0, &text_fmt, &annot).0,
+            (0, 0).into()
+        );
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 2, &text_fmt, &annot).0,
+            (0, 2).into()
+        );
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 3, &text_fmt, &annot).0,
+            (0, 3).into()
+        );
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 5, &text_fmt, &annot).0,
+            (0, 5).into()
+        );
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 6, &text_fmt, &annot).0,
+            (1, 0).into()
+        );
+
+        // Test with tabs.
+        let text = Rope::from("\tHello\n");
+        let slice = text.slice(..);
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 0, &text_fmt, &annot).0,
+            (0, 0).into()
+        );
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 1, &text_fmt, &annot).0,
+            (0, 4).into()
+        );
+        assert_eq!(
+            visual_offset_from_block(slice, 0, 2, &text_fmt, &annot).0,
+            (0, 5).into()
+        );
+    }
     #[test]
     fn test_pos_at_coords() {
         let text = Rope::from("ḧëḷḷö\nẅöṛḷḋ");
@@ -341,6 +670,7 @@ mod test {
     }
 
     #[test]
+    #[allow(deprecated)]
     fn test_pos_at_visual_coords() {
         let text = Rope::from("ḧëḷḷö\nẅöṛḷḋ");
         let slice = text.slice(..);
@@ -405,4 +735,100 @@ mod test {
         assert_eq!(pos_at_visual_coords(slice, (0, 10).into(), 4), 0);
         assert_eq!(pos_at_visual_coords(slice, (10, 10).into(), 4), 0);
     }
+
+    #[test]
+    fn test_char_idx_at_visual_row_offset() {
+        let text = Rope::from("ḧëḷḷö\nẅöṛḷḋ\nfoo");
+        let slice = text.slice(..);
+        let mut text_fmt = TextFormat::default();
+        for i in 0isize..3isize {
+            for j in -2isize..=2isize {
+                if !(0..3).contains(&(i + j)) {
+                    continue;
+                }
+                println!("{i} {j}");
+                assert_eq!(
+                    char_idx_at_visual_offset(
+                        slice,
+                        slice.line_to_char(i as usize),
+                        j,
+                        3,
+                        &text_fmt,
+                        &TextAnnotations::default(),
+                    )
+                    .0,
+                    slice.line_to_char((i + j) as usize) + 3
+                );
+            }
+        }
+
+        text_fmt.soft_wrap = true;
+        let mut softwrapped_text = "foo ".repeat(10);
+        softwrapped_text.push('\n');
+        let last_char = softwrapped_text.len() - 1;
+
+        let text = Rope::from(softwrapped_text.repeat(3));
+        let slice = text.slice(..);
+        assert_eq!(
+            char_idx_at_visual_offset(
+                slice,
+                last_char,
+                0,
+                0,
+                &text_fmt,
+                &TextAnnotations::default(),
+            )
+            .0,
+            32
+        );
+        assert_eq!(
+            char_idx_at_visual_offset(
+                slice,
+                last_char,
+                -1,
+                0,
+                &text_fmt,
+                &TextAnnotations::default(),
+            )
+            .0,
+            16
+        );
+        assert_eq!(
+            char_idx_at_visual_offset(
+                slice,
+                last_char,
+                -2,
+                0,
+                &text_fmt,
+                &TextAnnotations::default(),
+            )
+            .0,
+            0
+        );
+        assert_eq!(
+            char_idx_at_visual_offset(
+                slice,
+                softwrapped_text.len() + last_char,
+                -2,
+                0,
+                &text_fmt,
+                &TextAnnotations::default(),
+            )
+            .0,
+            softwrapped_text.len()
+        );
+
+        assert_eq!(
+            char_idx_at_visual_offset(
+                slice,
+                softwrapped_text.len() + last_char,
+                -5,
+                0,
+                &text_fmt,
+                &TextAnnotations::default(),
+            )
+            .0,
+            0
+        );
+    }
 }
diff --git a/helix-core/src/selection.rs b/helix-core/src/selection.rs
index ffba46ab..7817618f 100644
--- a/helix-core/src/selection.rs
+++ b/helix-core/src/selection.rs
@@ -53,7 +53,9 @@ pub struct Range {
     pub anchor: usize,
     /// The head of the range, moved when extending.
     pub head: usize,
-    pub horiz: Option<u32>,
+    /// The previous visual offset (softwrapped lines and columns) from
+    /// the start of the line
+    pub old_visual_position: Option<(u32, u32)>,
 }
 
 impl Range {
@@ -61,7 +63,7 @@ impl Range {
         Self {
             anchor,
             head,
-            horiz: None,
+            old_visual_position: None,
         }
     }
 
@@ -127,7 +129,7 @@ impl Range {
         Self {
             anchor: self.head,
             head: self.anchor,
-            horiz: self.horiz,
+            old_visual_position: self.old_visual_position,
         }
     }
 
@@ -185,7 +187,7 @@ impl Range {
         Self {
             anchor,
             head,
-            horiz: None,
+            old_visual_position: None,
         }
     }
 
@@ -198,13 +200,13 @@ impl Range {
             Self {
                 anchor: self.anchor.min(from),
                 head: self.head.max(to),
-                horiz: None,
+                old_visual_position: None,
             }
         } else {
             Self {
                 anchor: self.anchor.max(to),
                 head: self.head.min(from),
-                horiz: None,
+                old_visual_position: None,
             }
         }
     }
@@ -219,13 +221,13 @@ impl Range {
             Range {
                 anchor: self.anchor.max(other.anchor),
                 head: self.head.min(other.head),
-                horiz: None,
+                old_visual_position: None,
             }
         } else {
             Range {
                 anchor: self.from().min(other.from()),
                 head: self.to().max(other.to()),
-                horiz: None,
+                old_visual_position: None,
             }
         }
     }
@@ -279,8 +281,8 @@ impl Range {
         Range {
             anchor: new_anchor,
             head: new_head,
-            horiz: if new_anchor == self.anchor {
-                self.horiz
+            old_visual_position: if new_anchor == self.anchor {
+                self.old_visual_position
             } else {
                 None
             },
@@ -306,7 +308,7 @@ impl Range {
             Range {
                 anchor: self.anchor,
                 head: next_grapheme_boundary(slice, self.head),
-                horiz: self.horiz,
+                old_visual_position: self.old_visual_position,
             }
         } else {
             *self
@@ -378,7 +380,7 @@ impl From<(usize, usize)> for Range {
         Self {
             anchor,
             head,
-            horiz: None,
+            old_visual_position: None,
         }
     }
 }
@@ -482,7 +484,7 @@ impl Selection {
             ranges: smallvec![Range {
                 anchor,
                 head,
-                horiz: None
+                old_visual_position: None
             }],
             primary_index: 0,
         }
@@ -566,9 +568,9 @@ impl Selection {
     }
 
     /// Takes a closure and maps each `Range` over the closure.
-    pub fn transform<F>(mut self, f: F) -> Self
+    pub fn transform<F>(mut self, mut f: F) -> Self
     where
-        F: Fn(Range) -> Range,
+        F: FnMut(Range) -> Range,
     {
         for range in self.ranges.iter_mut() {
             *range = f(*range)
diff --git a/helix-core/src/text_annotations.rs b/helix-core/src/text_annotations.rs
new file mode 100644
index 00000000..1956f6b5
--- /dev/null
+++ b/helix-core/src/text_annotations.rs
@@ -0,0 +1,271 @@
+use std::cell::Cell;
+use std::convert::identity;
+use std::ops::Range;
+use std::rc::Rc;
+
+use crate::syntax::Highlight;
+use crate::Tendril;
+
+/// An inline annotation is continuous text shown
+/// on the screen before the grapheme that starts at
+/// `char_idx`
+#[derive(Debug, Clone)]
+pub struct InlineAnnotation {
+    pub text: Tendril,
+    pub char_idx: usize,
+}
+
+/// Represents a **single Grapheme** that is part of the document
+/// that start at `char_idx` that will be replaced with
+/// a different `grapheme`.
+/// If `grapheme` contains multiple graphemes the text
+/// will render incorrectly.
+/// If you want to overlay multiple graphemes simply
+/// use multiple `Overlays`.
+///
+/// # Examples
+///
+/// The following examples are valid overlays for the following text:
+///
+/// `aX͎̊͢͜͝͡bc`
+///
+/// ```
+/// use helix_core::text_annotations::Overlay;
+///
+/// // replaces a
+/// Overlay {
+///   char_idx: 0,
+///   grapheme: "X".into(),
+/// };
+///
+/// // replaces X͎̊͢͜͝͡
+/// Overlay{
+///   char_idx: 1,
+///   grapheme: "\t".into(),
+/// };
+///
+/// // replaces b
+/// Overlay{
+///   char_idx: 6,
+///   grapheme: "X̢̢̟͖̲͌̋̇͑͝".into(),
+/// };
+/// ```
+///
+/// The following examples are invalid uses
+///
+/// ```
+/// use helix_core::text_annotations::Overlay;
+///
+/// // overlay is not aligned at grapheme boundary
+/// Overlay{
+///   char_idx: 3,
+///   grapheme: "x".into(),
+/// };
+///
+/// // overlay contains multiple graphemes
+/// Overlay{
+///   char_idx: 0,
+///   grapheme: "xy".into(),
+/// };
+/// ```
+#[derive(Debug, Clone)]
+pub struct Overlay {
+    pub char_idx: usize,
+    pub grapheme: Tendril,
+}
+
+/// Line annotations allow for virtual text between normal
+/// text lines. They cause `height` empty lines to be inserted
+/// below the document line that contains `anchor_char_idx`.
+///
+/// These lines can be filled with text in the rendering code
+/// as their contents have no effect beyond visual appearance.
+///
+/// To insert a line after a document line simply set
+/// `anchor_char_idx` to `doc.line_to_char(line_idx)`
+#[derive(Debug, Clone)]
+pub struct LineAnnotation {
+    pub anchor_char_idx: usize,
+    pub height: usize,
+}
+
+#[derive(Debug)]
+struct Layer<A, M> {
+    annotations: Rc<[A]>,
+    current_index: Cell<usize>,
+    metadata: M,
+}
+
+impl<A, M: Clone> Clone for Layer<A, M> {
+    fn clone(&self) -> Self {
+        Layer {
+            annotations: self.annotations.clone(),
+            current_index: self.current_index.clone(),
+            metadata: self.metadata.clone(),
+        }
+    }
+}
+
+impl<A, M> Layer<A, M> {
+    pub fn reset_pos(&self, char_idx: usize, get_char_idx: impl Fn(&A) -> usize) {
+        let new_index = self
+            .annotations
+            .binary_search_by_key(&char_idx, get_char_idx)
+            .unwrap_or_else(identity);
+
+        self.current_index.set(new_index);
+    }
+
+    pub fn consume(&self, char_idx: usize, get_char_idx: impl Fn(&A) -> usize) -> Option<&A> {
+        let annot = self.annotations.get(self.current_index.get())?;
+        debug_assert!(get_char_idx(annot) >= char_idx);
+        if get_char_idx(annot) == char_idx {
+            self.current_index.set(self.current_index.get() + 1);
+            Some(annot)
+        } else {
+            None
+        }
+    }
+}
+
+impl<A, M> From<(Rc<[A]>, M)> for Layer<A, M> {
+    fn from((annotations, metadata): (Rc<[A]>, M)) -> Layer<A, M> {
+        Layer {
+            annotations,
+            current_index: Cell::new(0),
+            metadata,
+        }
+    }
+}
+
+fn reset_pos<A, M>(layers: &[Layer<A, M>], pos: usize, get_pos: impl Fn(&A) -> usize) {
+    for layer in layers {
+        layer.reset_pos(pos, &get_pos)
+    }
+}
+
+/// Annotations that change that is displayed when the document is render.
+/// Also commonly called virtual text.
+#[derive(Default, Debug, Clone)]
+pub struct TextAnnotations {
+    inline_annotations: Vec<Layer<InlineAnnotation, Option<Highlight>>>,
+    overlays: Vec<Layer<Overlay, Option<Highlight>>>,
+    line_annotations: Vec<Layer<LineAnnotation, ()>>,
+}
+
+impl TextAnnotations {
+    /// Prepare the TextAnnotations for iteration starting at char_idx
+    pub fn reset_pos(&self, char_idx: usize) {
+        reset_pos(&self.inline_annotations, char_idx, |annot| annot.char_idx);
+        reset_pos(&self.overlays, char_idx, |annot| annot.char_idx);
+        reset_pos(&self.line_annotations, char_idx, |annot| {
+            annot.anchor_char_idx
+        });
+    }
+
+    pub fn collect_overlay_highlights(
+        &self,
+        char_range: Range<usize>,
+    ) -> Vec<(usize, Range<usize>)> {
+        let mut highlights = Vec::new();
+        self.reset_pos(char_range.start);
+        for char_idx in char_range {
+            if let Some((_, Some(highlight))) = self.overlay_at(char_idx) {
+                // we don't know the number of chars the original grapheme takes
+                // however it doesn't matter as highlight bounderies are automatically
+                // aligned to grapheme boundaries in the rendering code
+                highlights.push((highlight.0, char_idx..char_idx + 1))
+            }
+        }
+
+        highlights
+    }
+
+    /// Add new inline annotations.
+    ///
+    /// The annotations grapheme will be rendered with `highlight`
+    /// patched on top of `ui.text`.
+    ///
+    /// The annotations **must be sorted** by their `char_idx`.
+    /// Multiple annotations with the same `char_idx` are allowed,
+    /// they will be display in the order that they are present in the layer.
+    ///
+    /// If multiple layers contain annotations at the same position
+    /// the annotations that belong to the layers added first will be shown first.
+    pub fn add_inline_annotations(
+        &mut self,
+        layer: Rc<[InlineAnnotation]>,
+        highlight: Option<Highlight>,
+    ) -> &mut Self {
+        self.inline_annotations.push((layer, highlight).into());
+        self
+    }
+
+    /// Add new grapheme overlays.
+    ///
+    /// The overlayed grapheme will be rendered with `highlight`
+    /// patched on top of `ui.text`.
+    ///
+    /// The overlays **must be sorted** by their `char_idx`.
+    /// Multiple overlays with the same `char_idx` **are allowed**.
+    ///
+    /// If multiple layers contain overlay at the same position
+    /// the overlay from the layer added last will be show.
+    pub fn add_overlay(&mut self, layer: Rc<[Overlay]>, highlight: Option<Highlight>) -> &mut Self {
+        self.overlays.push((layer, highlight).into());
+        self
+    }
+
+    /// Add new annotation lines.
+    ///
+    /// The line annotations **must be sorted** by their `char_idx`.
+    /// Multiple line annotations with the same `char_idx` **are not allowed**.
+    pub fn add_line_annotation(&mut self, layer: Rc<[LineAnnotation]>) -> &mut Self {
+        self.line_annotations.push((layer, ()).into());
+        self
+    }
+
+    /// Removes all line annotations, useful for vertical motions
+    /// so that virtual text lines are automatically skipped.
+    pub fn clear_line_annotations(&mut self) {
+        self.line_annotations.clear();
+    }
+
+    pub(crate) fn next_inline_annotation_at(
+        &self,
+        char_idx: usize,
+    ) -> Option<(&InlineAnnotation, Option<Highlight>)> {
+        self.inline_annotations.iter().find_map(|layer| {
+            let annotation = layer.consume(char_idx, |annot| annot.char_idx)?;
+            Some((annotation, layer.metadata))
+        })
+    }
+
+    pub(crate) fn overlay_at(&self, char_idx: usize) -> Option<(&Overlay, Option<Highlight>)> {
+        let mut overlay = None;
+        for layer in &self.overlays {
+            while let Some(new_overlay) = layer.consume(char_idx, |annot| annot.char_idx) {
+                overlay = Some((new_overlay, layer.metadata));
+            }
+        }
+        overlay
+    }
+
+    pub(crate) fn annotation_lines_at(&self, char_idx: usize) -> usize {
+        self.line_annotations
+            .iter()
+            .map(|layer| {
+                let mut lines = 0;
+                while let Some(annot) = layer.annotations.get(layer.current_index.get()) {
+                    if annot.anchor_char_idx == char_idx {
+                        layer.current_index.set(layer.current_index.get() + 1);
+                        lines += annot.height
+                    } else {
+                        break;
+                    }
+                }
+                lines
+            })
+            .sum()
+    }
+}
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index c0cbc245..05ceb874 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -172,7 +172,7 @@ impl Application {
             area,
             theme_loader.clone(),
             syn_loader.clone(),
-            Box::new(Map::new(Arc::clone(&config), |config: &Config| {
+            Arc::new(Map::new(Arc::clone(&config), |config: &Config| {
                 &config.editor
             })),
         );
@@ -309,8 +309,10 @@ impl Application {
         let surface = self.terminal.current_buffer_mut();
 
         self.compositor.render(area, surface, &mut cx);
-
         let (pos, kind) = self.compositor.cursor(area, &self.editor);
+        // reset cursor cache
+        self.editor.cursor_cache.set(None);
+
         let pos = pos.map(|pos| (pos.col as u16, pos.row as u16));
         self.terminal.draw(pos, kind).unwrap();
     }
@@ -395,6 +397,13 @@ impl Application {
         // Update all the relevant members in the editor after updating
         // the configuration.
         self.editor.refresh_config();
+
+        // reset view position in case softwrap was enabled/disabled
+        let scrolloff = self.editor.config().scrolloff;
+        for (view, _) in self.editor.tree.views_mut() {
+            let doc = &self.editor.documents[&view.doc];
+            view.ensure_cursor_in_view(doc, scrolloff)
+        }
     }
 
     /// refresh language config after config change
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 47ef1ff1..1cbdd0fb 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -9,21 +9,25 @@ use tui::widgets::Row;
 pub use typed::*;
 
 use helix_core::{
-    comment, coords_at_pos, encoding, find_first_non_whitespace_char, find_root, graphemes,
+    char_idx_at_visual_offset, comment,
+    doc_formatter::TextFormat,
+    encoding, find_first_non_whitespace_char, find_root, graphemes,
     history::UndoKind,
     increment, indent,
     indent::IndentStyle,
     line_ending::{get_line_ending_of_str, line_end_char_index, str_is_line_ending},
     match_brackets,
-    movement::{self, Direction},
-    object, pos_at_coords, pos_at_visual_coords,
+    movement::{self, move_vertically_visual, Direction},
+    object, pos_at_coords,
     regex::{self, Regex, RegexBuilder},
     search::{self, CharMatcher},
-    selection, shellwords, surround, textobject,
+    selection, shellwords, surround,
+    text_annotations::TextAnnotations,
+    textobject,
     tree_sitter::Node,
     unicode::width::UnicodeWidthChar,
-    visual_coords_at_pos, LineEnding, Position, Range, Rope, RopeGraphemes, RopeSlice, Selection,
-    SmallVec, Tendril, Transaction,
+    visual_offset_from_block, LineEnding, Position, Range, Rope, RopeGraphemes, RopeSlice,
+    Selection, SmallVec, Tendril, Transaction,
 };
 use helix_view::{
     clipboard::ClipboardType,
@@ -200,10 +204,14 @@ impl MappableCommand {
         move_char_right, "Move right",
         move_line_up, "Move up",
         move_line_down, "Move down",
+        move_visual_line_up, "Move up",
+        move_visual_line_down, "Move down",
         extend_char_left, "Extend left",
         extend_char_right, "Extend right",
         extend_line_up, "Extend up",
         extend_line_down, "Extend down",
+        extend_visual_line_up, "Extend up",
+        extend_visual_line_down, "Extend down",
         copy_selection_on_next_line, "Copy selection on next line",
         copy_selection_on_prev_line, "Copy selection on previous line",
         move_next_word_start, "Move to start of next word",
@@ -538,18 +546,27 @@ impl PartialEq for MappableCommand {
 
 fn no_op(_cx: &mut Context) {}
 
-fn move_impl<F>(cx: &mut Context, move_fn: F, dir: Direction, behaviour: Movement)
-where
-    F: Fn(RopeSlice, Range, Direction, usize, Movement, usize) -> Range,
-{
+type MoveFn =
+    fn(RopeSlice, Range, Direction, usize, Movement, &TextFormat, &mut TextAnnotations) -> Range;
+
+fn move_impl(cx: &mut Context, move_fn: MoveFn, dir: Direction, behaviour: Movement) {
     let count = cx.count();
     let (view, doc) = current!(cx.editor);
     let text = doc.text().slice(..);
+    let text_fmt = doc.text_format(view.inner_area(doc).width, None);
+    let mut annotations = view.text_annotations(doc, None);
 
-    let selection = doc
-        .selection(view.id)
-        .clone()
-        .transform(|range| move_fn(text, range, dir, count, behaviour, doc.tab_width()));
+    let selection = doc.selection(view.id).clone().transform(|range| {
+        move_fn(
+            text,
+            range,
+            dir,
+            count,
+            behaviour,
+            &text_fmt,
+            &mut annotations,
+        )
+    });
     doc.set_selection(view.id, selection);
 }
 
@@ -571,6 +588,24 @@ fn move_line_down(cx: &mut Context) {
     move_impl(cx, move_vertically, Direction::Forward, Movement::Move)
 }
 
+fn move_visual_line_up(cx: &mut Context) {
+    move_impl(
+        cx,
+        move_vertically_visual,
+        Direction::Backward,
+        Movement::Move,
+    )
+}
+
+fn move_visual_line_down(cx: &mut Context) {
+    move_impl(
+        cx,
+        move_vertically_visual,
+        Direction::Forward,
+        Movement::Move,
+    )
+}
+
 fn extend_char_left(cx: &mut Context) {
     move_impl(cx, move_horizontally, Direction::Backward, Movement::Extend)
 }
@@ -587,6 +622,24 @@ fn extend_line_down(cx: &mut Context) {
     move_impl(cx, move_vertically, Direction::Forward, Movement::Extend)
 }
 
+fn extend_visual_line_up(cx: &mut Context) {
+    move_impl(
+        cx,
+        move_vertically_visual,
+        Direction::Backward,
+        Movement::Extend,
+    )
+}
+
+fn extend_visual_line_down(cx: &mut Context) {
+    move_impl(
+        cx,
+        move_vertically_visual,
+        Direction::Forward,
+        Movement::Extend,
+    )
+}
+
 fn goto_line_end_impl(view: &mut View, doc: &mut Document, movement: Movement) {
     let text = doc.text().slice(..);
 
@@ -814,7 +867,10 @@ fn trim_selections(cx: &mut Context) {
 }
 
 // align text in selection
+#[allow(deprecated)]
 fn align_selections(cx: &mut Context) {
+    use helix_core::visual_coords_at_pos;
+
     let (view, doc) = current!(cx.editor);
     let text = doc.text().slice(..);
     let selection = doc.selection(view.id);
@@ -891,17 +947,22 @@ fn goto_window(cx: &mut Context, align: Align) {
     // as we type
     let scrolloff = config.scrolloff.min(height.saturating_sub(1) / 2);
 
-    let last_line = view.last_line(doc);
+    let last_visual_line = view.last_visual_line(doc);
 
-    let line = match align {
-        Align::Top => view.offset.row + scrolloff + count,
-        Align::Center => view.offset.row + ((last_line - view.offset.row) / 2),
-        Align::Bottom => last_line.saturating_sub(scrolloff + count),
+    let visual_line = match align {
+        Align::Top => view.offset.vertical_offset + scrolloff + count,
+        Align::Center => view.offset.vertical_offset + (last_visual_line / 2),
+        Align::Bottom => {
+            view.offset.vertical_offset + last_visual_line.saturating_sub(scrolloff + count)
+        }
     }
-    .max(view.offset.row + scrolloff)
-    .min(last_line.saturating_sub(scrolloff));
+    .max(view.offset.vertical_offset + scrolloff)
+    .min(view.offset.vertical_offset + last_visual_line.saturating_sub(scrolloff));
+
+    let pos = view
+        .pos_at_visual_coords(doc, visual_line as u16, 0, false)
+        .expect("visual_line was constrained to the view area");
 
-    let pos = doc.text().line_to_char(line);
     let text = doc.text().slice(..);
     let selection = doc
         .selection(view.id)
@@ -1385,53 +1446,72 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction) {
     let range = doc.selection(view.id).primary();
     let text = doc.text().slice(..);
 
-    let cursor = visual_coords_at_pos(text, range.cursor(text), doc.tab_width());
-    let doc_last_line = doc.text().len_lines().saturating_sub(1);
-
-    let last_line = view.last_line(doc);
-
-    if direction == Backward && view.offset.row == 0
-        || direction == Forward && last_line == doc_last_line
-    {
-        return;
-    }
-
+    let cursor = range.cursor(text);
     let height = view.inner_height();
 
     let scrolloff = config.scrolloff.min(height / 2);
+    let offset = match direction {
+        Forward => offset as isize,
+        Backward => -(offset as isize),
+    };
 
-    view.offset.row = match direction {
-        Forward => view.offset.row + offset,
-        Backward => view.offset.row.saturating_sub(offset),
-    }
-    .min(doc_last_line);
-
-    // recalculate last line
-    let last_line = view.last_line(doc);
-
-    // clamp into viewport
-    let line = cursor
-        .row
-        .max(view.offset.row + scrolloff)
-        .min(last_line.saturating_sub(scrolloff));
+    let doc_text = doc.text().slice(..);
+    let viewport = view.inner_area(doc);
+    let text_fmt = doc.text_format(viewport.width, None);
+    let annotations = view.text_annotations(doc, None);
+    (view.offset.anchor, view.offset.vertical_offset) = char_idx_at_visual_offset(
+        doc_text,
+        view.offset.anchor,
+        view.offset.vertical_offset as isize + offset,
+        0,
+        &text_fmt,
+        &annotations,
+    );
 
-    // If cursor needs moving, replace primary selection
-    if line != cursor.row {
-        let head = pos_at_visual_coords(text, Position::new(line, cursor.col), doc.tab_width()); // this func will properly truncate to line end
+    let head;
+    match direction {
+        Forward => {
+            head = char_idx_at_visual_offset(
+                doc_text,
+                view.offset.anchor,
+                (view.offset.vertical_offset + scrolloff) as isize,
+                0,
+                &text_fmt,
+                &annotations,
+            )
+            .0;
+            if head <= cursor {
+                return;
+            }
+        }
+        Backward => {
+            head = char_idx_at_visual_offset(
+                doc_text,
+                view.offset.anchor,
+                (view.offset.vertical_offset + height - scrolloff) as isize,
+                0,
+                &text_fmt,
+                &annotations,
+            )
+            .0;
+            if head >= cursor {
+                return;
+            }
+        }
+    }
 
-        let anchor = if cx.editor.mode == Mode::Select {
-            range.anchor
-        } else {
-            head
-        };
+    let anchor = if cx.editor.mode == Mode::Select {
+        range.anchor
+    } else {
+        head
+    };
 
-        // replace primary selection with an empty selection at cursor pos
-        let prim_sel = Range::new(anchor, head);
-        let mut sel = doc.selection(view.id).clone();
-        let idx = sel.primary_index();
-        sel = sel.replace(idx, prim_sel);
-        doc.set_selection(view.id, sel);
-    }
+    // replace primary selection with an empty selection at cursor pos
+    let prim_sel = Range::new(anchor, head);
+    let mut sel = doc.selection(view.id).clone();
+    let idx = sel.primary_index();
+    sel = sel.replace(idx, prim_sel);
+    doc.set_selection(view.id, sel);
 }
 
 fn page_up(cx: &mut Context) {
@@ -1458,7 +1538,15 @@ fn half_page_down(cx: &mut Context) {
     scroll(cx, offset, Direction::Forward);
 }
 
+#[allow(deprecated)]
+// currently uses the deprected `visual_coords_at_pos`/`pos_at_visual_coords` functions
+// as this function ignores softwrapping (and virtual text) and instead only cares
+// about "text visual position"
+//
+// TODO: implement a variant of that uses visual lines and respects virtual text
 fn copy_selection_on_line(cx: &mut Context, direction: Direction) {
+    use helix_core::{pos_at_visual_coords, visual_coords_at_pos};
+
     let count = cx.count();
     let (view, doc) = current!(cx.editor);
     let text = doc.text().slice(..);
@@ -4475,11 +4563,19 @@ fn align_view_bottom(cx: &mut Context) {
 
 fn align_view_middle(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
-    let text = doc.text().slice(..);
-    let pos = doc.selection(view.id).primary().cursor(text);
-    let pos = coords_at_pos(text, pos);
+    let inner_width = view.inner_width(doc);
+    let text_fmt = doc.text_format(inner_width, None);
+    // there is no horizontal position when softwrap is enabled
+    if text_fmt.soft_wrap {
+        return;
+    }
+    let doc_text = doc.text().slice(..);
+    let annotations = view.text_annotations(doc, None);
+    let pos = doc.selection(view.id).primary().cursor(doc_text);
+    let pos =
+        visual_offset_from_block(doc_text, view.offset.anchor, pos, &text_fmt, &annotations).0;
 
-    view.offset.col = pos
+    view.offset.horizontal_offset = pos
         .col
         .saturating_sub((view.inner_area(doc).width as usize) / 2);
 }
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index d48e6935..01184f80 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -7,8 +7,8 @@ use helix_core::hashmap;
 pub fn default() -> HashMap<Mode, Keymap> {
     let normal = keymap!({ "Normal mode"
         "h" | "left" => move_char_left,
-        "j" | "down" => move_line_down,
-        "k" | "up" => move_line_up,
+        "j" | "down" => move_visual_line_down,
+        "k" | "up" => move_visual_line_up,
         "l" | "right" => move_char_right,
 
         "t" => find_till_char,
@@ -55,6 +55,8 @@ pub fn default() -> HashMap<Mode, Keymap> {
             "m" => goto_last_modified_file,
             "n" => goto_next_buffer,
             "p" => goto_previous_buffer,
+            "k" => move_line_up,
+            "j" => move_line_down,
             "." => goto_last_modification,
         },
         ":" => command_mode,
@@ -321,8 +323,8 @@ pub fn default() -> HashMap<Mode, Keymap> {
     let mut select = normal.clone();
     select.merge_nodes(keymap!({ "Select mode"
         "h" | "left" => extend_char_left,
-        "j" | "down" => extend_line_down,
-        "k" | "up" => extend_line_up,
+        "j" | "down" => extend_visual_line_down,
+        "k" | "up" => extend_visual_line_up,
         "l" | "right" => extend_char_right,
 
         "w" => extend_next_word_start,
@@ -345,6 +347,10 @@ pub fn default() -> HashMap<Mode, Keymap> {
         "esc" => exit_select_mode,
 
         "v" => normal_mode,
+        "g" => { "Goto"
+            "k" => extend_line_up,
+            "j" => extend_line_down,
+        },
     }));
     let insert = keymap!({ "Insert mode"
         "esc" => normal_mode,
@@ -362,8 +368,8 @@ pub fn default() -> HashMap<Mode, Keymap> {
         "C-j" | "ret" => insert_newline,
         "tab" => insert_tab,
 
-        "up" => move_line_up,
-        "down" => move_line_down,
+        "up" => move_visual_line_up,
+        "down" => move_visual_line_down,
         "left" => move_char_left,
         "right" => move_char_right,
         "pageup" => page_up,
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 2eca709d..90e2fed0 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -391,8 +391,10 @@ impl Component for Completion {
             let language = doc.language_name().unwrap_or("");
             let text = doc.text().slice(..);
             let cursor_pos = doc.selection(view.id).primary().cursor(text);
-            let coords = helix_core::visual_coords_at_pos(text, cursor_pos, doc.tab_width());
-            let cursor_pos = (coords.row - view.offset.row) as u16;
+            let coords = view
+                .screen_coords_at_pos(doc, text, cursor_pos)
+                .expect("cursor must be in view");
+            let cursor_pos = coords.row as u16;
 
             let mut markdown_doc = match &option.documentation {
                 Some(lsp::Documentation::String(contents))
diff --git a/helix-term/src/ui/document.rs b/helix-term/src/ui/document.rs
new file mode 100644
index 00000000..66332410
--- /dev/null
+++ b/helix-term/src/ui/document.rs
@@ -0,0 +1,475 @@
+use std::cmp::min;
+
+use helix_core::doc_formatter::{DocumentFormatter, GraphemeSource, TextFormat};
+use helix_core::graphemes::Grapheme;
+use helix_core::str_utils::char_to_byte_idx;
+use helix_core::syntax::Highlight;
+use helix_core::syntax::HighlightEvent;
+use helix_core::text_annotations::TextAnnotations;
+use helix_core::{visual_offset_from_block, Position, RopeSlice};
+use helix_view::editor::{WhitespaceConfig, WhitespaceRenderValue};
+use helix_view::graphics::Rect;
+use helix_view::theme::Style;
+use helix_view::view::ViewPosition;
+use helix_view::Document;
+use helix_view::Theme;
+use tui::buffer::Buffer as Surface;
+
+pub trait LineDecoration {
+    fn render_background(&mut self, _renderer: &mut TextRenderer, _pos: LinePos) {}
+    fn render_foreground(
+        &mut self,
+        _renderer: &mut TextRenderer,
+        _pos: LinePos,
+        _end_char_idx: usize,
+    ) {
+    }
+}
+
+impl<F: FnMut(&mut TextRenderer, LinePos)> LineDecoration for F {
+    fn render_background(&mut self, renderer: &mut TextRenderer, pos: LinePos) {
+        self(renderer, pos)
+    }
+}
+
+/// A wrapper around a HighlightIterator
+/// that merges the layered highlights to create the final text style
+/// and yields the active text style and the char_idx where the active
+/// style will have to be recomputed.
+struct StyleIter<'a, H: Iterator<Item = HighlightEvent>> {
+    text_style: Style,
+    active_highlights: Vec<Highlight>,
+    highlight_iter: H,
+    theme: &'a Theme,
+}
+
+impl<H: Iterator<Item = HighlightEvent>> Iterator for StyleIter<'_, H> {
+    type Item = (Style, usize);
+    fn next(&mut self) -> Option<(Style, usize)> {
+        while let Some(event) = self.highlight_iter.next() {
+            match event {
+                HighlightEvent::HighlightStart(highlights) => {
+                    self.active_highlights.push(highlights)
+                }
+                HighlightEvent::HighlightEnd => {
+                    self.active_highlights.pop();
+                }
+                HighlightEvent::Source { start, end } => {
+                    if start == end {
+                        continue;
+                    }
+                    let style = self
+                        .active_highlights
+                        .iter()
+                        .fold(self.text_style, |acc, span| {
+                            acc.patch(self.theme.highlight(span.0))
+                        });
+                    return Some((style, end));
+                }
+            }
+        }
+        None
+    }
+}
+
+#[derive(Debug, PartialEq, Eq, Copy, Clone)]
+pub struct LinePos {
+    /// Indicates whether the given visual line
+    /// is the first visual line of the given document line
+    pub first_visual_line: bool,
+    /// The line index of the document line that contains the given visual line
+    pub doc_line: usize,
+    /// Vertical offset from the top of the inner view area
+    pub visual_line: u16,
+    /// The first char index of this visual line.
+    /// Note that if the visual line is entirely filled by
+    /// a very long inline virtual text then this index will point
+    /// at the next (non-virtual) char after this visual line
+    pub start_char_idx: usize,
+}
+
+pub type TranslatedPosition<'a> = (usize, Box<dyn FnMut(&mut TextRenderer, Position) + 'a>);
+
+#[allow(clippy::too_many_arguments)]
+pub fn render_document(
+    surface: &mut Surface,
+    viewport: Rect,
+    doc: &Document,
+    offset: ViewPosition,
+    doc_annotations: &TextAnnotations,
+    highlight_iter: impl Iterator<Item = HighlightEvent>,
+    theme: &Theme,
+    line_decoration: &mut [Box<dyn LineDecoration + '_>],
+    translated_positions: &mut [TranslatedPosition],
+) {
+    let mut renderer = TextRenderer::new(surface, doc, theme, offset.horizontal_offset, viewport);
+    render_text(
+        &mut renderer,
+        doc.text().slice(..),
+        offset,
+        &doc.text_format(viewport.width, Some(theme)),
+        doc_annotations,
+        highlight_iter,
+        theme,
+        line_decoration,
+        translated_positions,
+    )
+}
+
+fn translate_positions(
+    char_pos: usize,
+    first_visisble_char_idx: usize,
+    translated_positions: &mut [TranslatedPosition],
+    text_fmt: &TextFormat,
+    renderer: &mut TextRenderer,
+    pos: Position,
+) {
+    // check if any positions translated on the fly (like cursor) has been reached
+    for (char_idx, callback) in &mut *translated_positions {
+        if *char_idx < char_pos && *char_idx >= first_visisble_char_idx {
+            // by replacing the char_index with usize::MAX large number we ensure
+            // that the same position is only translated once
+            // text will never reach usize::MAX as rust memory allocations are limited
+            // to isize::MAX
+            *char_idx = usize::MAX;
+
+            if text_fmt.soft_wrap {
+                callback(renderer, pos)
+            } else if pos.col >= renderer.col_offset
+                && pos.col - renderer.col_offset < renderer.viewport.width as usize
+            {
+                callback(
+                    renderer,
+                    Position {
+                        row: pos.row,
+                        col: pos.col - renderer.col_offset,
+                    },
+                )
+            }
+        }
+    }
+}
+
+#[allow(clippy::too_many_arguments)]
+pub fn render_text<'t>(
+    renderer: &mut TextRenderer,
+    text: RopeSlice<'t>,
+    offset: ViewPosition,
+    text_fmt: &TextFormat,
+    text_annotations: &TextAnnotations,
+    highlight_iter: impl Iterator<Item = HighlightEvent>,
+    theme: &Theme,
+    line_decorations: &mut [Box<dyn LineDecoration + '_>],
+    translated_positions: &mut [TranslatedPosition],
+) {
+    let (
+        Position {
+            row: mut row_off, ..
+        },
+        mut char_pos,
+    ) = visual_offset_from_block(
+        text,
+        offset.anchor,
+        offset.anchor,
+        text_fmt,
+        text_annotations,
+    );
+    row_off += offset.vertical_offset;
+    assert_eq!(0, offset.vertical_offset);
+
+    let (mut formatter, mut first_visible_char_idx) =
+        DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, text_annotations, offset.anchor);
+    let mut styles = StyleIter {
+        text_style: renderer.text_style,
+        active_highlights: Vec::with_capacity(64),
+        highlight_iter,
+        theme,
+    };
+
+    let mut last_line_pos = LinePos {
+        first_visual_line: false,
+        doc_line: usize::MAX,
+        visual_line: u16::MAX,
+        start_char_idx: usize::MAX,
+    };
+    let mut is_in_indent_area = true;
+    let mut last_line_indent_level = 0;
+    let mut style_span = styles
+        .next()
+        .unwrap_or_else(|| (Style::default(), usize::MAX));
+
+    loop {
+        // formattter.line_pos returns to line index of the next grapheme
+        // so it must be called before formatter.next
+        let doc_line = formatter.line_pos();
+        // TODO refactor with let .. else once MSRV reaches 1.65
+        let (grapheme, mut pos) = if let Some(it) = formatter.next() {
+            it
+        } else {
+            let mut last_pos = formatter.visual_pos();
+            last_pos.col -= 1;
+            // check if any positions translated on the fly (like cursor) are at the EOF
+            translate_positions(
+                char_pos + 1,
+                first_visible_char_idx,
+                translated_positions,
+                text_fmt,
+                renderer,
+                last_pos,
+            );
+            break;
+        };
+
+        // skip any graphemes on visual lines before the block start
+        if pos.row < row_off {
+            if char_pos >= style_span.1 {
+                // TODO refactor using let..else once MSRV reaches 1.65
+                style_span = if let Some(style_span) = styles.next() {
+                    style_span
+                } else {
+                    break;
+                }
+            }
+            char_pos += grapheme.doc_chars();
+            first_visible_char_idx = char_pos + 1;
+            continue;
+        }
+        pos.row -= row_off;
+
+        // if the end of the viewport is reached stop rendering
+        if pos.row as u16 >= renderer.viewport.height {
+            break;
+        }
+
+        // apply decorations before rendering a new line
+        if pos.row as u16 != last_line_pos.visual_line {
+            if pos.row > 0 {
+                renderer.draw_indent_guides(last_line_indent_level, last_line_pos.visual_line);
+                is_in_indent_area = true;
+                for line_decoration in &mut *line_decorations {
+                    line_decoration.render_foreground(renderer, last_line_pos, char_pos);
+                }
+            }
+            last_line_pos = LinePos {
+                first_visual_line: doc_line != last_line_pos.doc_line,
+                doc_line,
+                visual_line: pos.row as u16,
+                start_char_idx: char_pos,
+            };
+            for line_decoration in &mut *line_decorations {
+                line_decoration.render_background(renderer, last_line_pos);
+            }
+        }
+
+        // aquire the correct grapheme style
+        if char_pos >= style_span.1 {
+            // TODO refactor using let..else once MSRV reaches 1.65
+            style_span = if let Some(style_span) = styles.next() {
+                style_span
+            } else {
+                (Style::default(), usize::MAX)
+            }
+        }
+        char_pos += grapheme.doc_chars();
+
+        // check if any positions translated on the fly (like cursor) has been reached
+        translate_positions(
+            char_pos,
+            first_visible_char_idx,
+            translated_positions,
+            text_fmt,
+            renderer,
+            pos,
+        );
+
+        let grapheme_style = if let GraphemeSource::VirtualText { highlight } = grapheme.source {
+            let style = renderer.text_style;
+            if let Some(highlight) = highlight {
+                style.patch(theme.highlight(highlight.0))
+            } else {
+                style
+            }
+        } else {
+            style_span.0
+        };
+
+        renderer.draw_grapheme(
+            grapheme.grapheme,
+            grapheme_style,
+            &mut last_line_indent_level,
+            &mut is_in_indent_area,
+            pos,
+        );
+    }
+
+    renderer.draw_indent_guides(last_line_indent_level, last_line_pos.visual_line);
+    for line_decoration in &mut *line_decorations {
+        line_decoration.render_foreground(renderer, last_line_pos, char_pos);
+    }
+}
+
+#[derive(Debug)]
+pub struct TextRenderer<'a> {
+    pub surface: &'a mut Surface,
+    pub text_style: Style,
+    pub whitespace_style: Style,
+    pub indent_guide_char: String,
+    pub indent_guide_style: Style,
+    pub newline: String,
+    pub nbsp: String,
+    pub space: String,
+    pub tab: String,
+    pub tab_width: u16,
+    pub starting_indent: usize,
+    pub draw_indent_guides: bool,
+    pub col_offset: usize,
+    pub viewport: Rect,
+}
+
+impl<'a> TextRenderer<'a> {
+    pub fn new(
+        surface: &'a mut Surface,
+        doc: &Document,
+        theme: &Theme,
+        col_offset: usize,
+        viewport: Rect,
+    ) -> TextRenderer<'a> {
+        let editor_config = doc.config.load();
+        let WhitespaceConfig {
+            render: ws_render,
+            characters: ws_chars,
+        } = &editor_config.whitespace;
+
+        let tab_width = doc.tab_width();
+        let tab = if ws_render.tab() == WhitespaceRenderValue::All {
+            std::iter::once(ws_chars.tab)
+                .chain(std::iter::repeat(ws_chars.tabpad).take(tab_width - 1))
+                .collect()
+        } else {
+            " ".repeat(tab_width)
+        };
+        let newline = if ws_render.newline() == WhitespaceRenderValue::All {
+            ws_chars.newline.into()
+        } else {
+            " ".to_owned()
+        };
+
+        let space = if ws_render.space() == WhitespaceRenderValue::All {
+            ws_chars.space.into()
+        } else {
+            " ".to_owned()
+        };
+        let nbsp = if ws_render.nbsp() == WhitespaceRenderValue::All {
+            ws_chars.nbsp.into()
+        } else {
+            " ".to_owned()
+        };
+
+        let text_style = theme.get("ui.text");
+
+        TextRenderer {
+            surface,
+            indent_guide_char: editor_config.indent_guides.character.into(),
+            newline,
+            nbsp,
+            space,
+            tab_width: tab_width as u16,
+            tab,
+            whitespace_style: theme.get("ui.virtual.whitespace"),
+            starting_indent: (col_offset / tab_width)
+                + editor_config.indent_guides.skip_levels as usize,
+            indent_guide_style: text_style.patch(
+                theme
+                    .try_get("ui.virtual.indent-guide")
+                    .unwrap_or_else(|| theme.get("ui.virtual.whitespace")),
+            ),
+            text_style,
+            draw_indent_guides: editor_config.indent_guides.render,
+            viewport,
+            col_offset,
+        }
+    }
+
+    /// Draws a single `grapheme` at the current render position with a specified `style`.
+    pub fn draw_grapheme(
+        &mut self,
+        grapheme: Grapheme,
+        mut style: Style,
+        last_indent_level: &mut usize,
+        is_in_indent_area: &mut bool,
+        position: Position,
+    ) {
+        let cut_off_start = self.col_offset.saturating_sub(position.col as usize);
+        let is_whitespace = grapheme.is_whitespace();
+
+        // TODO is it correct to apply the whitspace style to all unicode white spaces?
+        if is_whitespace {
+            style = style.patch(self.whitespace_style);
+        }
+
+        let width = grapheme.width();
+        let grapheme = match grapheme {
+            Grapheme::Tab { width } => {
+                let grapheme_tab_width = char_to_byte_idx(&self.tab, width as usize);
+                &self.tab[..grapheme_tab_width]
+            }
+            // TODO special rendering for other whitespaces?
+            Grapheme::Other { ref g } if g == " " => &self.space,
+            Grapheme::Other { ref g } if g == "\u{00A0}" => &self.nbsp,
+            Grapheme::Other { ref g } => &*g,
+            Grapheme::Newline => &self.newline,
+        };
+
+        let in_bounds = self.col_offset <= (position.col as usize)
+            && (position.col as usize) < self.viewport.width as usize + self.col_offset;
+
+        if in_bounds {
+            self.surface.set_string(
+                self.viewport.x + (position.col - self.col_offset) as u16,
+                self.viewport.y + position.row as u16,
+                grapheme,
+                style,
+            );
+        } else if cut_off_start != 0 && cut_off_start < width as usize {
+            // partially on screen
+            let rect = Rect::new(
+                self.viewport.x as u16,
+                self.viewport.y + position.row as u16,
+                (width - cut_off_start) as u16,
+                1,
+            );
+            self.surface.set_style(rect, style);
+        }
+
+        if *is_in_indent_area && !is_whitespace {
+            *last_indent_level = position.col;
+            *is_in_indent_area = false;
+        }
+    }
+
+    /// Overlay indentation guides ontop of a rendered line
+    /// The indentation level is computed in `draw_lines`.
+    /// Therefore this function must always be called afterwards.
+    pub fn draw_indent_guides(&mut self, indent_level: usize, row: u16) {
+        if !self.draw_indent_guides {
+            return;
+        }
+
+        // Don't draw indent guides outside of view
+        let end_indent = min(
+            indent_level,
+            // Add tab_width - 1 to round up, since the first visible
+            // indent might be a bit after offset.col
+            self.col_offset + self.viewport.width as usize + (self.tab_width - 1) as usize,
+        ) / self.tab_width as usize;
+
+        for i in self.starting_indent..end_indent {
+            let x =
+                (self.viewport.x as usize + (i * self.tab_width as usize) - self.col_offset) as u16;
+            let y = self.viewport.y + row;
+            debug_assert!(self.surface.in_bounds(x, y));
+            self.surface
+                .set_string(x, y, &self.indent_guide_char, self.indent_guide_style);
+        }
+    }
+}
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index a0518964..f297b44e 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -4,7 +4,10 @@ use crate::{
     job::{self, Callback},
     key,
     keymap::{KeymapResult, Keymaps},
-    ui::{Completion, ProgressSpinners},
+    ui::{
+        document::{render_document, LinePos, TextRenderer, TranslatedPosition},
+        Completion, ProgressSpinners,
+    },
 };
 
 use helix_core::{
@@ -13,8 +16,9 @@ use helix_core::{
     },
     movement::Direction,
     syntax::{self, HighlightEvent},
+    text_annotations::TextAnnotations,
     unicode::width::UnicodeWidthStr,
-    visual_coords_at_pos, LineEnding, Position, Range, Selection, Transaction,
+    visual_offset_from_block, Position, Range, Selection, Transaction,
 };
 use helix_view::{
     document::{Mode, SCRATCH_BUFFER_NAME},
@@ -24,12 +28,12 @@ use helix_view::{
     keyboard::{KeyCode, KeyModifiers},
     Document, Editor, Theme, View,
 };
-use std::{borrow::Cow, cmp::min, num::NonZeroUsize, path::PathBuf};
+use std::{num::NonZeroUsize, path::PathBuf, rc::Rc};
 
 use tui::buffer::Buffer as Surface;
 
-use super::lsp::SignatureHelp;
 use super::statusline;
+use super::{document::LineDecoration, lsp::SignatureHelp};
 
 pub struct EditorView {
     pub keymaps: Keymaps,
@@ -83,6 +87,10 @@ impl EditorView {
         let theme = &editor.theme;
         let config = editor.config();
 
+        let text_annotations = view.text_annotations(doc, Some(theme));
+        let mut line_decorations: Vec<Box<dyn LineDecoration>> = Vec::new();
+        let mut translated_positions: Vec<TranslatedPosition> = Vec::new();
+
         // DAP: Highlight current stack frame position
         let stack_frame = editor.debugger.as_ref().and_then(|debugger| {
             if let (Some(frame), Some(thread_id)) = (debugger.active_frame, debugger.thread_id) {
@@ -103,28 +111,40 @@ impl EditorView {
                     == doc.path()
             {
                 let line = frame.line - 1; // convert to 0-indexing
-                if line >= view.offset.row && line < view.offset.row + area.height as usize {
-                    surface.set_style(
-                        Rect::new(
-                            area.x,
-                            area.y + (line - view.offset.row) as u16,
-                            area.width,
-                            1,
-                        ),
-                        theme.get("ui.highlight"),
-                    );
-                }
+                let style = theme.get("ui.highlight");
+                let line_decoration = move |renderer: &mut TextRenderer, pos: LinePos| {
+                    if pos.doc_line != line {
+                        return;
+                    }
+                    renderer
+                        .surface
+                        .set_style(Rect::new(area.x, pos.visual_line, area.width, 1), style);
+                };
+
+                line_decorations.push(Box::new(line_decoration));
             }
         }
 
         if is_focused && config.cursorline {
-            Self::highlight_cursorline(doc, view, surface, theme);
+            line_decorations.push(Self::cursorline_decorator(doc, view, theme))
         }
+
         if is_focused && config.cursorcolumn {
-            Self::highlight_cursorcolumn(doc, view, surface, theme);
+            Self::highlight_cursorcolumn(doc, view, surface, theme, inner, &text_annotations);
+        }
+
+        let mut highlights =
+            Self::doc_syntax_highlights(doc, view.offset.anchor, inner.height, theme);
+        let overlay_highlights = Self::overlay_syntax_highlights(
+            doc,
+            view.offset.anchor,
+            inner.height,
+            &text_annotations,
+        );
+        if !overlay_highlights.is_empty() {
+            highlights = Box::new(syntax::merge(highlights, overlay_highlights));
         }
 
-        let mut highlights = Self::doc_syntax_highlights(doc, view.offset, inner.height, theme);
         for diagnostic in Self::doc_diagnostics_highlights(doc, theme) {
             // Most of the `diagnostic` Vecs are empty most of the time. Skipping
             // a merge for any empty Vec saves a significant amount of work.
@@ -133,8 +153,9 @@ impl EditorView {
             }
             highlights = Box::new(syntax::merge(highlights, diagnostic));
         }
+
         let highlights: Box<dyn Iterator<Item = HighlightEvent>> = if is_focused {
-            Box::new(syntax::merge(
+            let highlights = syntax::merge(
                 highlights,
                 Self::doc_selection_highlights(
                     editor.mode(),
@@ -143,19 +164,52 @@ impl EditorView {
                     theme,
                     &config.cursor_shape,
                 ),
-            ))
+            );
+            let focused_view_elements = Self::highlight_focused_view_elements(view, doc, theme);
+            if focused_view_elements.is_empty() {
+                Box::new(highlights)
+            } else {
+                Box::new(syntax::merge(highlights, focused_view_elements))
+            }
         } else {
             Box::new(highlights)
         };
 
-        Self::render_text_highlights(doc, view.offset, inner, surface, theme, highlights, &config);
-        Self::render_gutter(editor, doc, view, view.area, surface, theme, is_focused);
-        Self::render_rulers(editor, doc, view, inner, surface, theme);
+        Self::render_gutter(
+            editor,
+            doc,
+            view,
+            view.area,
+            theme,
+            is_focused,
+            &mut line_decorations,
+        );
 
         if is_focused {
-            Self::render_focused_view_elements(view, doc, inner, theme, surface);
+            let cursor = doc
+                .selection(view.id)
+                .primary()
+                .cursor(doc.text().slice(..));
+            // set the cursor_cache to out of view in case the position is not found
+            editor.cursor_cache.set(Some(None));
+            let update_cursor_cache =
+                |_: &mut TextRenderer, pos| editor.cursor_cache.set(Some(Some(pos)));
+            translated_positions.push((cursor, Box::new(update_cursor_cache)));
         }
 
+        render_document(
+            surface,
+            inner,
+            doc,
+            view.offset,
+            &text_annotations,
+            highlights,
+            theme,
+            &mut line_decorations,
+            &mut *translated_positions,
+        );
+        Self::render_rulers(editor, doc, view, inner, surface, theme);
+
         // if we're not at the edge of the screen, draw a right border
         if viewport.right() != view.area.right() {
             let x = area.right();
@@ -203,31 +257,53 @@ impl EditorView {
             .iter()
             // View might be horizontally scrolled, convert from absolute distance
             // from the 1st column to relative distance from left of viewport
-            .filter_map(|ruler| ruler.checked_sub(1 + view.offset.col as u16))
+            .filter_map(|ruler| ruler.checked_sub(1 + view.offset.horizontal_offset as u16))
             .filter(|ruler| ruler < &viewport.width)
             .map(|ruler| viewport.clip_left(ruler).with_width(1))
             .for_each(|area| surface.set_style(area, ruler_theme))
     }
 
+    pub fn overlay_syntax_highlights(
+        doc: &Document,
+        anchor: usize,
+        height: u16,
+        text_annotations: &TextAnnotations,
+    ) -> Vec<(usize, std::ops::Range<usize>)> {
+        let text = doc.text().slice(..);
+        let row = text.char_to_line(anchor.min(text.len_chars()));
+
+        let range = {
+            // Calculate viewport byte ranges:
+            // Saturating subs to make it inclusive zero indexing.
+            let last_line = text.len_lines().saturating_sub(1);
+            let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
+            let start = text.line_to_byte(row.min(last_line));
+            let end = text.line_to_byte(last_visible_line + 1);
+
+            start..end
+        };
+
+        text_annotations.collect_overlay_highlights(range)
+    }
+
     /// Get syntax highlights for a document in a view represented by the first line
     /// and column (`offset`) and the last line. This is done instead of using a view
     /// directly to enable rendering syntax highlighted docs anywhere (eg. picker preview)
     pub fn doc_syntax_highlights<'doc>(
         doc: &'doc Document,
-        offset: Position,
+        anchor: usize,
         height: u16,
         _theme: &Theme,
     ) -> Box<dyn Iterator<Item = HighlightEvent> + 'doc> {
         let text = doc.text().slice(..);
+        let row = text.char_to_line(anchor.min(text.len_chars()));
 
         let range = {
             // Calculate viewport byte ranges:
             // Saturating subs to make it inclusive zero indexing.
-            let last_line = doc.text().len_lines().saturating_sub(1);
-            let last_visible_line = (offset.row + height as usize)
-                .saturating_sub(1)
-                .min(last_line);
-            let start = text.line_to_byte(offset.row.min(last_line));
+            let last_line = text.len_lines().saturating_sub(1);
+            let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
+            let start = text.line_to_byte(row.min(last_line));
             let end = text.line_to_byte(last_visible_line + 1);
 
             start..end
@@ -272,11 +348,11 @@ impl EditorView {
         use helix_core::diagnostic::Severity;
         let get_scope_of = |scope| {
             theme
-            .find_scope_index(scope)
+            .find_scope_index_exact(scope)
             // get one of the themes below as fallback values
-            .or_else(|| theme.find_scope_index("diagnostic"))
-            .or_else(|| theme.find_scope_index("ui.cursor"))
-            .or_else(|| theme.find_scope_index("ui.selection"))
+            .or_else(|| theme.find_scope_index_exact("diagnostic"))
+            .or_else(|| theme.find_scope_index_exact("ui.cursor"))
+            .or_else(|| theme.find_scope_index_exact("ui.selection"))
             .expect(
                 "at least one of the following scopes must be defined in the theme: `diagnostic`, `ui.cursor`, or `ui.selection`",
             )
@@ -339,29 +415,29 @@ impl EditorView {
         let cursor_is_block = cursorkind == CursorKind::Block;
 
         let selection_scope = theme
-            .find_scope_index("ui.selection")
+            .find_scope_index_exact("ui.selection")
             .expect("could not find `ui.selection` scope in the theme!");
         let primary_selection_scope = theme
-            .find_scope_index("ui.selection.primary")
+            .find_scope_index_exact("ui.selection.primary")
             .unwrap_or(selection_scope);
         let base_cursor_scope = theme
-            .find_scope_index("ui.cursor")
+            .find_scope_index_exact("ui.cursor")
             .unwrap_or(selection_scope);
         let base_primary_cursor_scope = theme
             .find_scope_index("ui.cursor.primary")
             .unwrap_or(base_cursor_scope);
 
         let cursor_scope = match mode {
-            Mode::Insert => theme.find_scope_index("ui.cursor.insert"),
-            Mode::Select => theme.find_scope_index("ui.cursor.select"),
-            Mode::Normal => theme.find_scope_index("ui.cursor.normal"),
+            Mode::Insert => theme.find_scope_index_exact("ui.cursor.insert"),
+            Mode::Select => theme.find_scope_index_exact("ui.cursor.select"),
+            Mode::Normal => theme.find_scope_index_exact("ui.cursor.normal"),
         }
         .unwrap_or(base_cursor_scope);
 
         let primary_cursor_scope = match mode {
-            Mode::Insert => theme.find_scope_index("ui.cursor.primary.insert"),
-            Mode::Select => theme.find_scope_index("ui.cursor.primary.select"),
-            Mode::Normal => theme.find_scope_index("ui.cursor.primary.normal"),
+            Mode::Insert => theme.find_scope_index_exact("ui.cursor.primary.insert"),
+            Mode::Select => theme.find_scope_index_exact("ui.cursor.primary.select"),
+            Mode::Normal => theme.find_scope_index_exact("ui.cursor.primary.normal"),
         }
         .unwrap_or(base_primary_cursor_scope);
 
@@ -424,248 +500,26 @@ impl EditorView {
         spans
     }
 
-    pub fn render_text_highlights<H: Iterator<Item = HighlightEvent>>(
-        doc: &Document,
-        offset: Position,
-        viewport: Rect,
-        surface: &mut Surface,
-        theme: &Theme,
-        highlights: H,
-        config: &helix_view::editor::Config,
-    ) {
-        let whitespace = &config.whitespace;
-        use helix_view::editor::WhitespaceRenderValue;
-
-        // It's slightly more efficient to produce a full RopeSlice from the Rope, then slice that a bunch
-        // of times than it is to always call Rope::slice/get_slice (it will internally always hit RSEnum::Light).
-        let text = doc.text().slice(..);
-
-        let characters = &whitespace.characters;
-
-        let mut spans = Vec::new();
-        let mut visual_x = 0usize;
-        let mut line = 0u16;
-        let tab_width = doc.tab_width();
-        let tab = if whitespace.render.tab() == WhitespaceRenderValue::All {
-            std::iter::once(characters.tab)
-                .chain(std::iter::repeat(characters.tabpad).take(tab_width - 1))
-                .collect()
-        } else {
-            " ".repeat(tab_width)
-        };
-        let space = characters.space.to_string();
-        let nbsp = characters.nbsp.to_string();
-        let newline = if whitespace.render.newline() == WhitespaceRenderValue::All {
-            characters.newline.to_string()
-        } else {
-            " ".to_string()
-        };
-        let indent_guide_char = config.indent_guides.character.to_string();
-
-        let text_style = theme.get("ui.text");
-        let whitespace_style = theme.get("ui.virtual.whitespace");
-
-        let mut is_in_indent_area = true;
-        let mut last_line_indent_level = 0;
-
-        // use whitespace style as fallback for indent-guide
-        let indent_guide_style = text_style.patch(
-            theme
-                .try_get("ui.virtual.indent-guide")
-                .unwrap_or_else(|| theme.get("ui.virtual.whitespace")),
-        );
-
-        let draw_indent_guides = |indent_level, line, surface: &mut Surface| {
-            if !config.indent_guides.render {
-                return;
-            }
-
-            let starting_indent =
-                (offset.col / tab_width) + config.indent_guides.skip_levels as usize;
-
-            // Don't draw indent guides outside of view
-            let end_indent = min(
-                indent_level,
-                // Add tab_width - 1 to round up, since the first visible
-                // indent might be a bit after offset.col
-                offset.col + viewport.width as usize + (tab_width - 1),
-            ) / tab_width;
-
-            for i in starting_indent..end_indent {
-                let x = (viewport.x as usize + (i * tab_width) - offset.col) as u16;
-                let y = viewport.y + line;
-                debug_assert!(surface.in_bounds(x, y));
-                surface.set_string(x, y, &indent_guide_char, indent_guide_style);
-            }
-        };
-
-        'outer: for event in highlights {
-            match event {
-                HighlightEvent::HighlightStart(span) => {
-                    spans.push(span);
-                }
-                HighlightEvent::HighlightEnd => {
-                    spans.pop();
-                }
-                HighlightEvent::Source { start, end } => {
-                    let is_trailing_cursor = text.len_chars() < end;
-
-                    // `unwrap_or_else` part is for off-the-end indices of
-                    // the rope, to allow cursor highlighting at the end
-                    // of the rope.
-                    let text = text.get_slice(start..end).unwrap_or_else(|| " ".into());
-                    let style = spans
-                        .iter()
-                        .fold(text_style, |acc, span| acc.patch(theme.highlight(span.0)));
-
-                    let space = if whitespace.render.space() == WhitespaceRenderValue::All
-                        && !is_trailing_cursor
-                    {
-                        &space
-                    } else {
-                        " "
-                    };
-
-                    let nbsp = if whitespace.render.nbsp() == WhitespaceRenderValue::All
-                        && text.len_chars() < end
-                    {
-                        &nbsp
-                    } else {
-                        " "
-                    };
-
-                    use helix_core::graphemes::{grapheme_width, RopeGraphemes};
-
-                    for grapheme in RopeGraphemes::new(text) {
-                        let out_of_bounds = offset.col > visual_x
-                            || visual_x >= viewport.width as usize + offset.col;
-
-                        if LineEnding::from_rope_slice(&grapheme).is_some() {
-                            if !out_of_bounds {
-                                // we still want to render an empty cell with the style
-                                surface.set_string(
-                                    (viewport.x as usize + visual_x - offset.col) as u16,
-                                    viewport.y + line,
-                                    &newline,
-                                    style.patch(whitespace_style),
-                                );
-                            }
-
-                            draw_indent_guides(last_line_indent_level, line, surface);
-
-                            visual_x = 0;
-                            line += 1;
-                            is_in_indent_area = true;
-
-                            // TODO: with proper iter this shouldn't be necessary
-                            if line >= viewport.height {
-                                break 'outer;
-                            }
-                        } else {
-                            let grapheme = Cow::from(grapheme);
-                            let is_whitespace;
-
-                            let (display_grapheme, width) = if grapheme == "\t" {
-                                is_whitespace = true;
-                                // make sure we display tab as appropriate amount of spaces
-                                let visual_tab_width = tab_width - (visual_x % tab_width);
-                                let grapheme_tab_width =
-                                    helix_core::str_utils::char_to_byte_idx(&tab, visual_tab_width);
-
-                                (&tab[..grapheme_tab_width], visual_tab_width)
-                            } else if grapheme == " " {
-                                is_whitespace = true;
-                                (space, 1)
-                            } else if grapheme == "\u{00A0}" {
-                                is_whitespace = true;
-                                (nbsp, 1)
-                            } else {
-                                is_whitespace = false;
-                                // Cow will prevent allocations if span contained in a single slice
-                                // which should really be the majority case
-                                let width = grapheme_width(&grapheme);
-                                (grapheme.as_ref(), width)
-                            };
-
-                            let cut_off_start = offset.col.saturating_sub(visual_x);
-
-                            if !out_of_bounds {
-                                // if we're offscreen just keep going until we hit a new line
-                                surface.set_string(
-                                    (viewport.x as usize + visual_x - offset.col) as u16,
-                                    viewport.y + line,
-                                    display_grapheme,
-                                    if is_whitespace {
-                                        style.patch(whitespace_style)
-                                    } else {
-                                        style
-                                    },
-                                );
-                            } else if cut_off_start != 0 && cut_off_start < width {
-                                // partially on screen
-                                let rect = Rect::new(
-                                    viewport.x,
-                                    viewport.y + line,
-                                    (width - cut_off_start) as u16,
-                                    1,
-                                );
-                                surface.set_style(
-                                    rect,
-                                    if is_whitespace {
-                                        style.patch(whitespace_style)
-                                    } else {
-                                        style
-                                    },
-                                );
-                            }
-
-                            if is_in_indent_area && !(grapheme == " " || grapheme == "\t") {
-                                draw_indent_guides(visual_x, line, surface);
-                                is_in_indent_area = false;
-                                last_line_indent_level = visual_x;
-                            }
-
-                            visual_x = visual_x.saturating_add(width);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     /// Render brace match, etc (meant for the focused view only)
-    pub fn render_focused_view_elements(
+    pub fn highlight_focused_view_elements(
         view: &View,
         doc: &Document,
-        viewport: Rect,
         theme: &Theme,
-        surface: &mut Surface,
-    ) {
+    ) -> Vec<(usize, std::ops::Range<usize>)> {
         // Highlight matching braces
         if let Some(syntax) = doc.syntax() {
             let text = doc.text().slice(..);
             use helix_core::match_brackets;
             let pos = doc.selection(view.id).primary().cursor(text);
 
-            let pos = match_brackets::find_matching_bracket(syntax, doc.text(), pos)
-                .and_then(|pos| view.screen_coords_at_pos(doc, text, pos));
-
-            if let Some(pos) = pos {
+            if let Some(pos) = match_brackets::find_matching_bracket(syntax, doc.text(), pos) {
                 // ensure col is on screen
-                if (pos.col as u16) < viewport.width + view.offset.col as u16
-                    && pos.col >= view.offset.col
-                {
-                    let style = theme.try_get("ui.cursor.match").unwrap_or_else(|| {
-                        Style::default()
-                            .add_modifier(Modifier::REVERSED)
-                            .add_modifier(Modifier::DIM)
-                    });
-
-                    surface[(viewport.x + pos.col as u16, viewport.y + pos.row as u16)]
-                        .set_style(style);
+                if let Some(highlight) = theme.find_scope_index_exact("ui.cursor.match") {
+                    return vec![(highlight, pos..pos + 1)];
                 }
             }
         }
+        Vec::new()
     }
 
     /// Render bufferline at the top
@@ -721,22 +575,17 @@ impl EditorView {
         }
     }
 
-    pub fn render_gutter(
-        editor: &Editor,
-        doc: &Document,
+    pub fn render_gutter<'d>(
+        editor: &'d Editor,
+        doc: &'d Document,
         view: &View,
         viewport: Rect,
-        surface: &mut Surface,
         theme: &Theme,
         is_focused: bool,
+        line_decorations: &mut Vec<Box<(dyn LineDecoration + 'd)>>,
     ) {
         let text = doc.text().slice(..);
-        let last_line = view.last_line(doc);
-
-        // it's used inside an iterator so the collect isn't needless:
-        // https://github.com/rust-lang/rust-clippy/issues/6164
-        #[allow(clippy::needless_collect)]
-        let cursors: Vec<_> = doc
+        let cursors: Rc<[_]> = doc
             .selection(view.id)
             .iter()
             .map(|range| range.cursor_line(text))
@@ -746,29 +595,36 @@ impl EditorView {
 
         let gutter_style = theme.get("ui.gutter");
         let gutter_selected_style = theme.get("ui.gutter.selected");
-
-        // avoid lots of small allocations by reusing a text buffer for each line
-        let mut text = String::with_capacity(8);
+        let gutter_style_virtual = theme.get("ui.gutter.virtual");
+        let gutter_selected_style_virtual = theme.get("ui.gutter.selected.virtual");
 
         for gutter_type in view.gutters() {
             let mut gutter = gutter_type.style(editor, doc, view, theme, is_focused);
             let width = gutter_type.width(view, doc);
-            text.reserve(width); // ensure there's enough space for the gutter
-            for (i, line) in (view.offset.row..(last_line + 1)).enumerate() {
-                let selected = cursors.contains(&line);
+            // avoid lots of small allocations by reusing a text buffer for each line
+            let mut text = String::with_capacity(width);
+            let cursors = cursors.clone();
+            let gutter_decoration = move |renderer: &mut TextRenderer, pos: LinePos| {
+                // TODO handle softwrap in gutters
+                let selected = cursors.contains(&pos.doc_line);
                 let x = viewport.x + offset;
-                let y = viewport.y + i as u16;
+                let y = viewport.y + pos.visual_line;
 
-                let gutter_style = if selected {
-                    gutter_selected_style
-                } else {
-                    gutter_style
+                let gutter_style = match (selected, pos.first_visual_line) {
+                    (false, true) => gutter_style,
+                    (true, true) => gutter_selected_style,
+                    (false, false) => gutter_style_virtual,
+                    (true, false) => gutter_selected_style_virtual,
                 };
 
-                if let Some(style) = gutter(line, selected, &mut text) {
-                    surface.set_stringn(x, y, &text, width, gutter_style.patch(style));
+                if let Some(style) =
+                    gutter(pos.doc_line, selected, pos.first_visual_line, &mut text)
+                {
+                    renderer
+                        .surface
+                        .set_stringn(x, y, &text, width, gutter_style.patch(style));
                 } else {
-                    surface.set_style(
+                    renderer.surface.set_style(
                         Rect {
                             x,
                             y,
@@ -779,7 +635,8 @@ impl EditorView {
                     );
                 }
                 text.clear();
-            }
+            };
+            line_decorations.push(Box::new(gutter_decoration));
 
             offset += width as u16;
         }
@@ -840,10 +697,13 @@ impl EditorView {
     }
 
     /// Apply the highlighting on the lines where a cursor is active
-    pub fn highlight_cursorline(doc: &Document, view: &View, surface: &mut Surface, theme: &Theme) {
+    pub fn cursorline_decorator(
+        doc: &Document,
+        view: &View,
+        theme: &Theme,
+    ) -> Box<dyn LineDecoration> {
         let text = doc.text().slice(..);
-        let last_line = view.last_line(doc);
-
+        // TODO only highlight the visual line that contains the cursor instead of the full visual line
         let primary_line = doc.selection(view.id).primary().cursor_line(text);
 
         // The secondary_lines do contain the primary_line, it doesn't matter
@@ -860,20 +720,23 @@ impl EditorView {
 
         let primary_style = theme.get("ui.cursorline.primary");
         let secondary_style = theme.get("ui.cursorline.secondary");
+        let viewport = view.area;
 
-        for line in view.offset.row..(last_line + 1) {
+        let line_decoration = move |renderer: &mut TextRenderer, pos: LinePos| {
             let area = Rect::new(
-                view.area.x,
-                view.area.y + (line - view.offset.row) as u16,
-                view.area.width,
+                viewport.x,
+                viewport.y + pos.visual_line as u16,
+                viewport.width,
                 1,
             );
-            if primary_line == line {
-                surface.set_style(area, primary_style);
-            } else if secondary_lines.binary_search(&line).is_ok() {
-                surface.set_style(area, secondary_style);
+            if primary_line == pos.doc_line {
+                renderer.surface.set_style(area, primary_style);
+            } else if secondary_lines.binary_search(&pos.doc_line).is_ok() {
+                renderer.surface.set_style(area, secondary_style);
             }
-        }
+        };
+
+        Box::new(line_decoration)
     }
 
     /// Apply the highlighting on the columns where a cursor is active
@@ -882,6 +745,8 @@ impl EditorView {
         view: &View,
         surface: &mut Surface,
         theme: &Theme,
+        viewport: Rect,
+        text_annotations: &TextAnnotations,
     ) {
         let text = doc.text().slice(..);
 
@@ -897,19 +762,23 @@ impl EditorView {
             .unwrap_or_else(|| theme.get("ui.cursorline.secondary"));
 
         let inner_area = view.inner_area(doc);
-        let offset = view.offset.col;
 
         let selection = doc.selection(view.id);
         let primary = selection.primary();
+        let text_format = doc.text_format(viewport.width, None);
         for range in selection.iter() {
             let is_primary = primary == *range;
+            let cursor = range.cursor(text);
+
+            let Position { col, .. } =
+                visual_offset_from_block(text, cursor, cursor, &text_format, text_annotations).0;
 
-            let Position { row: _, col } =
-                visual_coords_at_pos(text, range.cursor(text), doc.tab_width());
             // if the cursor is horizontally in the view
-            if col >= offset && inner_area.width > (col - offset) as u16 {
+            if col >= view.offset.horizontal_offset
+                && inner_area.width > (col - view.offset.horizontal_offset) as u16
+            {
                 let area = Rect::new(
-                    inner_area.x + (col - offset) as u16,
+                    inner_area.x + (col - view.offset.horizontal_offset) as u16,
                     view.area.y,
                     1,
                     view.area.height,
@@ -1149,7 +1018,7 @@ impl EditorView {
 
         let pos_and_view = |editor: &Editor, row, column| {
             editor.tree.views().find_map(|(view, _focus)| {
-                view.pos_at_screen_coords(&editor.documents[&view.doc], row, column)
+                view.pos_at_screen_coords(&editor.documents[&view.doc], row, column, true)
                     .map(|pos| (pos, view.id))
             })
         };
@@ -1191,8 +1060,10 @@ impl EditorView {
                         None => return EventResult::Ignored(None),
                     };
 
-                    let line = coords.row + view.offset.row;
-                    if line < doc.text().len_lines() {
+                    if let Some(char_idx) =
+                        view.pos_at_visual_coords(doc, coords.row as u16, coords.col as u16, true)
+                    {
+                        let line = doc.text().char_to_line(char_idx);
                         commands::dap_toggle_breakpoint_impl(cxt, path, line);
                         return EventResult::Consumed(None);
                     }
@@ -1204,7 +1075,7 @@ impl EditorView {
             MouseEventKind::Drag(MouseButton::Left) => {
                 let (view, doc) = current!(cxt.editor);
 
-                let pos = match view.pos_at_screen_coords(doc, row, column) {
+                let pos = match view.pos_at_screen_coords(doc, row, column, true) {
                     Some(pos) => pos,
                     None => return EventResult::Ignored(None),
                 };
@@ -1268,8 +1139,9 @@ impl EditorView {
                     cxt.editor.focus(view_id);
 
                     let (view, doc) = current!(cxt.editor);
-                    let line = coords.row + view.offset.row;
-                    if let Ok(pos) = doc.text().try_line_to_char(line) {
+                    if let Some(pos) =
+                        view.pos_at_visual_coords(doc, coords.row as u16, coords.col as u16, true)
+                    {
                         doc.set_selection(view_id, Selection::point(pos));
                         if modifiers == KeyModifiers::ALT {
                             commands::MappableCommand::dap_edit_log.execute(cxt);
diff --git a/helix-term/src/ui/lsp.rs b/helix-term/src/ui/lsp.rs
index 393d24c4..44050aa1 100644
--- a/helix-term/src/ui/lsp.rs
+++ b/helix-term/src/ui/lsp.rs
@@ -53,7 +53,10 @@ impl Component for SignatureHelp {
 
         let active_param_span = self.active_param_range.map(|(start, end)| {
             vec![(
-                cx.editor.theme.find_scope_index("ui.selection").unwrap(),
+                cx.editor
+                    .theme
+                    .find_scope_index_exact("ui.selection")
+                    .unwrap(),
                 start..end,
             )]
         });
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index eb480758..5e7f8c36 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -1,4 +1,5 @@
 mod completion;
+mod document;
 pub(crate) mod editor;
 mod fuzzy_match;
 mod info;
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 6bd64251..5fa75136 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -2,7 +2,12 @@ use crate::{
     alt,
     compositor::{Component, Compositor, Context, Event, EventResult},
     ctrl, key, shift,
-    ui::{self, fuzzy_match::FuzzyQuery, EditorView},
+    ui::{
+        self,
+        document::{render_document, LineDecoration, LinePos, TextRenderer},
+        fuzzy_match::FuzzyQuery,
+        EditorView,
+    },
 };
 use futures_util::future::BoxFuture;
 use tui::{
@@ -19,11 +24,15 @@ use std::cmp::{self, Ordering};
 use std::{collections::HashMap, io::Read, path::PathBuf};
 
 use crate::ui::{Prompt, PromptEvent};
-use helix_core::{movement::Direction, unicode::segmentation::UnicodeSegmentation, Position};
+use helix_core::{
+    movement::Direction, text_annotations::TextAnnotations,
+    unicode::segmentation::UnicodeSegmentation, Position,
+};
 use helix_view::{
     editor::Action,
     graphics::{CursorKind, Margin, Modifier, Rect},
     theme::Style,
+    view::ViewPosition,
     Document, DocumentId, Editor,
 };
 
@@ -179,7 +188,7 @@ impl<T: Item> FilePicker<T> {
                             }
                             _ => {
                                 // TODO: enable syntax highlighting; blocked by async rendering
-                                Document::open(path, None, None)
+                                Document::open(path, None, None, editor.config.clone())
                                     .map(|doc| CachedPreview::Document(Box::new(doc)))
                                     .unwrap_or(CachedPreview::NotFound)
                             }
@@ -283,43 +292,57 @@ impl<T: Item + 'static> Component for FilePicker<T> {
                 })
                 .unwrap_or(0);
 
-            let offset = Position::new(first_line, 0);
+            let offset = ViewPosition {
+                anchor: doc.text().line_to_char(first_line),
+                horizontal_offset: 0,
+                vertical_offset: 0,
+            };
 
-            let mut highlights =
-                EditorView::doc_syntax_highlights(doc, offset, area.height, &cx.editor.theme);
+            let mut highlights = EditorView::doc_syntax_highlights(
+                doc,
+                offset.anchor,
+                area.height,
+                &cx.editor.theme,
+            );
             for spans in EditorView::doc_diagnostics_highlights(doc, &cx.editor.theme) {
                 if spans.is_empty() {
                     continue;
                 }
                 highlights = Box::new(helix_core::syntax::merge(highlights, spans));
             }
-            EditorView::render_text_highlights(
+            let mut decorations: Vec<Box<dyn LineDecoration>> = Vec::new();
+
+            if let Some((start, end)) = range {
+                let style = cx
+                    .editor
+                    .theme
+                    .try_get("ui.highlight")
+                    .unwrap_or_else(|| cx.editor.theme.get("ui.selection"));
+                let draw_highlight = move |renderer: &mut TextRenderer, pos: LinePos| {
+                    if (start..=end).contains(&pos.doc_line) {
+                        let area = Rect::new(
+                            renderer.viewport.x,
+                            renderer.viewport.y + pos.visual_line,
+                            renderer.viewport.width,
+                            1,
+                        );
+                        renderer.surface.set_style(area, style)
+                    }
+                };
+                decorations.push(Box::new(draw_highlight))
+            }
+
+            render_document(
+                surface,
+                inner,
                 doc,
                 offset,
-                inner,
-                surface,
-                &cx.editor.theme,
+                &TextAnnotations::default(),
                 highlights,
-                &cx.editor.config(),
+                &cx.editor.theme,
+                &mut decorations,
+                &mut [],
             );
-
-            // highlight the line
-            if let Some((start, end)) = range {
-                let offset = start.saturating_sub(first_line) as u16;
-                surface.set_style(
-                    Rect::new(
-                        inner.x,
-                        inner.y + offset,
-                        inner.width,
-                        (end.saturating_sub(start) as u16 + 1)
-                            .min(inner.height.saturating_sub(offset)),
-                    ),
-                    cx.editor
-                        .theme
-                        .try_get("ui.highlight")
-                        .unwrap_or_else(|| cx.editor.theme.get("ui.selection")),
-                );
-            }
         }
     }
 
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 6b33ea6a..798b5400 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -1,7 +1,11 @@
 use anyhow::{anyhow, bail, Context, Error};
+use arc_swap::access::DynAccess;
 use futures_util::future::BoxFuture;
 use futures_util::FutureExt;
 use helix_core::auto_pairs::AutoPairs;
+use helix_core::doc_formatter::TextFormat;
+use helix_core::syntax::Highlight;
+use helix_core::text_annotations::TextAnnotations;
 use helix_core::Range;
 use helix_vcs::{DiffHandle, DiffProviderRegistry};
 
@@ -26,8 +30,8 @@ use helix_core::{
     DEFAULT_LINE_ENDING,
 };
 
-use crate::editor::RedrawHandle;
-use crate::{DocumentId, Editor, View, ViewId};
+use crate::editor::{Config, RedrawHandle};
+use crate::{DocumentId, Editor, Theme, View, ViewId};
 
 /// 8kB of buffer space for encoding and decoding `Rope`s.
 const BUF_SIZE: usize = 8192;
@@ -127,6 +131,7 @@ pub struct Document {
     // it back as it separated from the edits. We could split out the parts manually but that will
     // be more troublesome.
     pub history: Cell<History>,
+    pub config: Arc<dyn DynAccess<Config>>,
 
     pub savepoint: Option<Transaction>,
 
@@ -351,7 +356,11 @@ use helix_lsp::lsp;
 use url::Url;
 
 impl Document {
-    pub fn from(text: Rope, encoding: Option<&'static encoding::Encoding>) -> Self {
+    pub fn from(
+        text: Rope,
+        encoding: Option<&'static encoding::Encoding>,
+        config: Arc<dyn DynAccess<Config>>,
+    ) -> Self {
         let encoding = encoding.unwrap_or(encoding::UTF_8);
         let changes = ChangeSet::new(&text);
         let old_state = None;
@@ -377,9 +386,13 @@ impl Document {
             modified_since_accessed: false,
             language_server: None,
             diff_handle: None,
+            config,
         }
     }
-
+    pub fn default(config: Arc<dyn DynAccess<Config>>) -> Self {
+        let text = Rope::from(DEFAULT_LINE_ENDING.as_str());
+        Self::from(text, None, config)
+    }
     // TODO: async fn?
     /// Create a new document from `path`. Encoding is auto-detected, but it can be manually
     /// overwritten with the `encoding` parameter.
@@ -387,6 +400,7 @@ impl Document {
         path: &Path,
         encoding: Option<&'static encoding::Encoding>,
         config_loader: Option<Arc<syntax::Loader>>,
+        config: Arc<dyn DynAccess<Config>>,
     ) -> Result<Self, Error> {
         // Open the file if it exists, otherwise assume it is a new file (and thus empty).
         let (rope, encoding) = if path.exists() {
@@ -398,7 +412,7 @@ impl Document {
             (Rope::from(DEFAULT_LINE_ENDING.as_str()), encoding)
         };
 
-        let mut doc = Self::from(rope, Some(encoding));
+        let mut doc = Self::from(rope, Some(encoding), config);
 
         // set the path and try detecting the language
         doc.set_path(Some(path))?;
@@ -1192,12 +1206,34 @@ impl Document {
             None => global_config,
         }
     }
-}
 
-impl Default for Document {
-    fn default() -> Self {
-        let text = Rope::from(DEFAULT_LINE_ENDING.as_str());
-        Self::from(text, None)
+    pub fn text_format(&self, mut viewport_width: u16, theme: Option<&Theme>) -> TextFormat {
+        if let Some(max_line_len) = self
+            .language_config()
+            .and_then(|config| config.max_line_length)
+        {
+            viewport_width = viewport_width.min(max_line_len as u16)
+        }
+        let config = self.config.load();
+        let soft_wrap = &config.soft_wrap;
+        let tab_width = self.tab_width() as u16;
+        TextFormat {
+            soft_wrap: soft_wrap.enable && viewport_width > 10,
+            tab_width,
+            max_wrap: soft_wrap.max_wrap.min(viewport_width / 4),
+            max_indent_retain: soft_wrap.max_indent_retain.min(viewport_width * 2 / 5),
+            // avoid spinning forever when the window manager
+            // sets the size to something tiny
+            viewport_width,
+            wrap_indicator: soft_wrap.wrap_indicator.clone().into_boxed_str(),
+            wrap_indicator_highlight: theme
+                .and_then(|theme| theme.find_scope_index("ui.virtual.wrap"))
+                .map(Highlight),
+        }
+    }
+
+    pub fn text_annotations(&self, _theme: Option<&Theme>) -> TextAnnotations {
+        TextAnnotations::default()
     }
 }
 
@@ -1236,13 +1272,19 @@ impl Display for FormatterError {
 
 #[cfg(test)]
 mod test {
+    use arc_swap::ArcSwap;
+
     use super::*;
 
     #[test]
     fn changeset_to_changes_ignore_line_endings() {
         use helix_lsp::{lsp, Client, OffsetEncoding};
         let text = Rope::from("hello\r\nworld");
-        let mut doc = Document::from(text, None);
+        let mut doc = Document::from(
+            text,
+            None,
+            Arc::new(ArcSwap::new(Arc::new(Config::default()))),
+        );
         let view = ViewId::default();
         doc.set_selection(view, Selection::single(0, 0));
 
@@ -1276,7 +1318,11 @@ mod test {
     fn changeset_to_changes() {
         use helix_lsp::{lsp, Client, OffsetEncoding};
         let text = Rope::from("hello");
-        let mut doc = Document::from(text, None);
+        let mut doc = Document::from(
+            text,
+            None,
+            Arc::new(ArcSwap::new(Arc::new(Config::default()))),
+        );
         let view = ViewId::default();
         doc.set_selection(view, Selection::single(5, 5));
 
@@ -1389,7 +1435,9 @@ mod test {
     #[test]
     fn test_line_ending() {
         assert_eq!(
-            Document::default().text().to_string(),
+            Document::default(Arc::new(ArcSwap::new(Arc::new(Config::default()))))
+                .text()
+                .to_string(),
             DEFAULT_LINE_ENDING.as_str()
         );
     }
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 1029c14f..46511c62 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -7,6 +7,7 @@ use crate::{
     input::KeyEvent,
     theme::{self, Theme},
     tree::{self, Tree},
+    view::ViewPosition,
     Align, Document, DocumentId, View, ViewId,
 };
 use helix_vcs::DiffProviderRegistry;
@@ -18,6 +19,7 @@ use tokio_stream::wrappers::UnboundedReceiverStream;
 
 use std::{
     borrow::Cow,
+    cell::Cell,
     collections::{BTreeMap, HashMap},
     io::stdin,
     num::NonZeroUsize,
@@ -268,6 +270,44 @@ pub struct Config {
     pub indent_guides: IndentGuidesConfig,
     /// Whether to color modes with different colors. Defaults to `false`.
     pub color_modes: bool,
+    pub soft_wrap: SoftWrap,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(default, rename_all = "kebab-case", deny_unknown_fields)]
+pub struct SoftWrap {
+    /// Soft wrap lines that exceed viewport width. Default to off
+    pub enable: bool,
+    /// Maximum space left free at the end of the line.
+    /// This space is used to wrap text at word boundaries. If that is not possible within this limit
+    /// the word is simply split at the end of the line.
+    ///
+    /// This is automatically hard-limited to a quarter of the viewport to ensure correct display on small views.
+    ///
+    /// Default to 20
+    pub max_wrap: u16,
+    /// Maximum number of indentation that can be carried over from the previous line when softwrapping.
+    /// If a line is indented further then this limit it is rendered at the start of the viewport instead.
+    ///
+    /// This is automatically hard-limited to a quarter of the viewport to ensure correct display on small views.
+    ///
+    /// Default to 40
+    pub max_indent_retain: u16,
+    /// Indicator placed at the beginning of softwrapped lines
+    ///
+    /// Defaults to ↪
+    pub wrap_indicator: String,
+}
+
+impl Default for SoftWrap {
+    fn default() -> Self {
+        SoftWrap {
+            enable: false,
+            max_wrap: 20,
+            max_indent_retain: 40,
+            wrap_indicator: "↪ ".into(),
+        }
+    }
 }
 
 #[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize)]
@@ -717,6 +757,7 @@ impl Default for Config {
             bufferline: BufferLine::default(),
             indent_guides: IndentGuidesConfig::default(),
             color_modes: false,
+            soft_wrap: SoftWrap::default(),
         }
     }
 }
@@ -797,7 +838,7 @@ pub struct Editor {
     pub status_msg: Option<(Cow<'static, str>, Severity)>,
     pub autoinfo: Option<Info>,
 
-    pub config: Box<dyn DynAccess<Config>>,
+    pub config: Arc<dyn DynAccess<Config>>,
     pub auto_pairs: Option<AutoPairs>,
 
     pub idle_timer: Pin<Box<Sleep>>,
@@ -813,6 +854,19 @@ pub struct Editor {
     /// The `RwLock` blocks the editor from performing the render until an exclusive lock can be aquired
     pub redraw_handle: RedrawHandle,
     pub needs_redraw: bool,
+    /// Cached position of the cursor calculated during rendering.
+    /// The content of `cursor_cache` is returned by `Editor::cursor` if
+    /// set to `Some(_)`. The value will be cleared after it's used.
+    /// If `cursor_cache` is `None` then the `Editor::cursor` function will
+    /// calculate the cursor position.
+    ///
+    /// `Some(None)` represents a cursor position outside of the visible area.
+    /// This will just cause `Editor::cursor` to return `None`.
+    ///
+    /// This cache is only a performance optimization to
+    /// avoid calculating the cursor position multiple
+    /// times during rendering and should not be set by other functions.
+    pub cursor_cache: Cell<Option<Option<Position>>>,
 }
 
 pub type RedrawHandle = (Arc<Notify>, Arc<RwLock<()>>);
@@ -866,7 +920,7 @@ impl Editor {
         mut area: Rect,
         theme_loader: Arc<theme::Loader>,
         syn_loader: Arc<syntax::Loader>,
-        config: Box<dyn DynAccess<Config>>,
+        config: Arc<dyn DynAccess<Config>>,
     ) -> Self {
         let conf = config.load();
         let auto_pairs = (&conf.auto_pairs).into();
@@ -910,6 +964,7 @@ impl Editor {
             config_events: unbounded_channel(),
             redraw_handle: Default::default(),
             needs_redraw: false,
+            cursor_cache: Cell::new(None),
         }
     }
 
@@ -994,7 +1049,7 @@ impl Editor {
 
     fn set_theme_impl(&mut self, theme: Theme, preview: ThemeAction) {
         // `ui.selection` is the only scope required to be able to render a theme.
-        if theme.find_scope_index("ui.selection").is_none() {
+        if theme.find_scope_index_exact("ui.selection").is_none() {
             self.set_error("Invalid theme: `ui.selection` required");
             return;
         }
@@ -1077,7 +1132,7 @@ impl Editor {
     fn replace_document_in_view(&mut self, current_view: ViewId, doc_id: DocumentId) {
         let view = self.tree.get_mut(current_view);
         view.doc = doc_id;
-        view.offset = Position::default();
+        view.offset = ViewPosition::default();
 
         let doc = doc_mut!(self, &doc_id);
         doc.ensure_view_init(view.id);
@@ -1204,12 +1259,15 @@ impl Editor {
     }
 
     pub fn new_file(&mut self, action: Action) -> DocumentId {
-        self.new_file_from_document(action, Document::default())
+        self.new_file_from_document(action, Document::default(self.config.clone()))
     }
 
     pub fn new_file_from_stdin(&mut self, action: Action) -> Result<DocumentId, Error> {
         let (rope, encoding) = crate::document::from_reader(&mut stdin(), None)?;
-        Ok(self.new_file_from_document(action, Document::from(rope, Some(encoding))))
+        Ok(self.new_file_from_document(
+            action,
+            Document::from(rope, Some(encoding), self.config.clone()),
+        ))
     }
 
     // ??? possible use for integration tests
@@ -1220,7 +1278,12 @@ impl Editor {
         let id = if let Some(id) = id {
             id
         } else {
-            let mut doc = Document::open(&path, None, Some(self.syn_loader.clone()))?;
+            let mut doc = Document::open(
+                &path,
+                None,
+                Some(self.syn_loader.clone()),
+                self.config.clone(),
+            )?;
 
             let _ = Self::launch_language_server(&mut self.language_servers, &mut doc);
             if let Some(diff_base) = self.diff_providers.get_diff_base(&path) {
@@ -1306,7 +1369,7 @@ impl Editor {
                 .iter()
                 .map(|(&doc_id, _)| doc_id)
                 .next()
-                .unwrap_or_else(|| self.new_document(Document::default()));
+                .unwrap_or_else(|| self.new_document(Document::default(self.config.clone())));
             let view = View::new(doc_id, self.config().gutters.clone());
             let view_id = self.tree.insert(view);
             let doc = doc_mut!(self, &doc_id);
@@ -1440,7 +1503,11 @@ impl Editor {
             .selection(view.id)
             .primary()
             .cursor(doc.text().slice(..));
-        if let Some(mut pos) = view.screen_coords_at_pos(doc, doc.text().slice(..), cursor) {
+        let pos = self
+            .cursor_cache
+            .get()
+            .unwrap_or_else(|| view.screen_coords_at_pos(doc, doc.text().slice(..), cursor));
+        if let Some(mut pos) = pos {
             let inner = view.inner_area(doc);
             pos.col += inner.x as usize;
             pos.row += inner.y as usize;
diff --git a/helix-view/src/gutter.rs b/helix-view/src/gutter.rs
index c1b5e2b1..90c94d55 100644
--- a/helix-view/src/gutter.rs
+++ b/helix-view/src/gutter.rs
@@ -12,7 +12,7 @@ fn count_digits(n: usize) -> usize {
     std::iter::successors(Some(n), |&n| (n >= 10).then(|| n / 10)).count()
 }
 
-pub type GutterFn<'doc> = Box<dyn FnMut(usize, bool, &mut String) -> Option<Style> + 'doc>;
+pub type GutterFn<'doc> = Box<dyn FnMut(usize, bool, bool, &mut String) -> Option<Style> + 'doc>;
 pub type Gutter =
     for<'doc> fn(&'doc Editor, &'doc Document, &View, &Theme, bool, usize) -> GutterFn<'doc>;
 
@@ -58,31 +58,36 @@ pub fn diagnostic<'doc>(
     let hint = theme.get("hint");
     let diagnostics = doc.diagnostics();
 
-    Box::new(move |line: usize, _selected: bool, out: &mut String| {
-        use helix_core::diagnostic::Severity;
-        if let Ok(index) = diagnostics.binary_search_by_key(&line, |d| d.line) {
-            let after = diagnostics[index..].iter().take_while(|d| d.line == line);
-
-            let before = diagnostics[..index]
-                .iter()
-                .rev()
-                .take_while(|d| d.line == line);
-
-            let diagnostics_on_line = after.chain(before);
-
-            // This unwrap is safe because the iterator cannot be empty as it contains at least the item found by the binary search.
-            let diagnostic = diagnostics_on_line.max_by_key(|d| d.severity).unwrap();
-
-            write!(out, "●").unwrap();
-            return Some(match diagnostic.severity {
-                Some(Severity::Error) => error,
-                Some(Severity::Warning) | None => warning,
-                Some(Severity::Info) => info,
-                Some(Severity::Hint) => hint,
-            });
-        }
-        None
-    })
+    Box::new(
+        move |line: usize, _selected: bool, first_visual_line: bool, out: &mut String| {
+            if !first_visual_line {
+                return None;
+            }
+            use helix_core::diagnostic::Severity;
+            if let Ok(index) = diagnostics.binary_search_by_key(&line, |d| d.line) {
+                let after = diagnostics[index..].iter().take_while(|d| d.line == line);
+
+                let before = diagnostics[..index]
+                    .iter()
+                    .rev()
+                    .take_while(|d| d.line == line);
+
+                let diagnostics_on_line = after.chain(before);
+
+                // This unwrap is safe because the iterator cannot be empty as it contains at least the item found by the binary search.
+                let diagnostic = diagnostics_on_line.max_by_key(|d| d.severity).unwrap();
+
+                write!(out, "●").unwrap();
+                return Some(match diagnostic.severity {
+                    Some(Severity::Error) => error,
+                    Some(Severity::Warning) | None => warning,
+                    Some(Severity::Info) => info,
+                    Some(Severity::Hint) => hint,
+                });
+            }
+            None
+        },
+    )
 }
 
 pub fn diff<'doc>(
@@ -99,36 +104,41 @@ pub fn diff<'doc>(
         let hunks = diff_handle.hunks();
         let mut hunk_i = 0;
         let mut hunk = hunks.nth_hunk(hunk_i);
-        Box::new(move |line: usize, _selected: bool, out: &mut String| {
-            // truncating the line is fine here because we don't compute diffs
-            // for files with more lines than i32::MAX anyways
-            // we need to special case removals here
-            // these technically do not have a range of lines to highlight (`hunk.after.start == hunk.after.end`).
-            // However we still want to display these hunks correctly we must not yet skip to the next hunk here
-            while hunk.after.end < line as u32
-                || !hunk.is_pure_removal() && line as u32 == hunk.after.end
-            {
-                hunk_i += 1;
-                hunk = hunks.nth_hunk(hunk_i);
-            }
-
-            if hunk.after.start > line as u32 {
-                return None;
-            }
-
-            let (icon, style) = if hunk.is_pure_insertion() {
-                ("▍", added)
-            } else if hunk.is_pure_removal() {
-                ("▔", deleted)
-            } else {
-                ("▍", modified)
-            };
-
-            write!(out, "{}", icon).unwrap();
-            Some(style)
-        })
+        Box::new(
+            move |line: usize, _selected: bool, first_visual_line: bool, out: &mut String| {
+                // truncating the line is fine here because we don't compute diffs
+                // for files with more lines than i32::MAX anyways
+                // we need to special case removals here
+                // these technically do not have a range of lines to highlight (`hunk.after.start == hunk.after.end`).
+                // However we still want to display these hunks correctly we must not yet skip to the next hunk here
+                while hunk.after.end < line as u32
+                    || !hunk.is_pure_removal() && line as u32 == hunk.after.end
+                {
+                    hunk_i += 1;
+                    hunk = hunks.nth_hunk(hunk_i);
+                }
+
+                if hunk.after.start > line as u32 {
+                    return None;
+                }
+
+                let (icon, style) = if hunk.is_pure_insertion() {
+                    ("▍", added)
+                } else if hunk.is_pure_removal() {
+                    if !first_visual_line {
+                        return None;
+                    }
+                    ("▔", deleted)
+                } else {
+                    ("▍", modified)
+                };
+
+                write!(out, "{}", icon).unwrap();
+                Some(style)
+            },
+        )
     } else {
-        Box::new(move |_, _, _| None)
+        Box::new(move |_, _, _, _| None)
     }
 }
 
@@ -142,7 +152,7 @@ pub fn line_numbers<'doc>(
     let text = doc.text().slice(..);
     let width = line_numbers_width(view, doc);
 
-    let last_line_in_view = view.last_line(doc);
+    let last_line_in_view = view.estimate_last_doc_line(doc);
 
     // Whether to draw the line number for the last line of the
     // document or not.  We only draw it if it's not an empty line.
@@ -158,34 +168,42 @@ pub fn line_numbers<'doc>(
     let line_number = editor.config().line_number;
     let mode = editor.mode;
 
-    Box::new(move |line: usize, selected: bool, out: &mut String| {
-        if line == last_line_in_view && !draw_last {
-            write!(out, "{:>1$}", '~', width).unwrap();
-            Some(linenr)
-        } else {
-            use crate::{document::Mode, editor::LineNumber};
-
-            let relative = line_number == LineNumber::Relative
-                && mode != Mode::Insert
-                && is_focused
-                && current_line != line;
-
-            let display_num = if relative {
-                abs_diff(current_line, line)
+    Box::new(
+        move |line: usize, selected: bool, first_visual_line: bool, out: &mut String| {
+            if line == last_line_in_view && !draw_last {
+                write!(out, "{:>1$}", '~', width).unwrap();
+                Some(linenr)
             } else {
-                line + 1
-            };
-
-            let style = if selected && is_focused {
-                linenr_select
-            } else {
-                linenr
-            };
-
-            write!(out, "{:>1$}", display_num, width).unwrap();
-            Some(style)
-        }
-    })
+                use crate::{document::Mode, editor::LineNumber};
+
+                let relative = line_number == LineNumber::Relative
+                    && mode != Mode::Insert
+                    && is_focused
+                    && current_line != line;
+
+                let display_num = if relative {
+                    abs_diff(current_line, line)
+                } else {
+                    line + 1
+                };
+
+                let style = if selected && is_focused {
+                    linenr_select
+                } else {
+                    linenr
+                };
+
+                if first_visual_line {
+                    write!(out, "{:>1$}", display_num, width).unwrap();
+                } else {
+                    write!(out, "{:>1$}", " ", width).unwrap();
+                }
+
+                // TODO: Use then_some when MSRV reaches 1.62
+                first_visual_line.then(|| style)
+            }
+        },
+    )
 }
 
 /// The width of a "line-numbers" gutter
@@ -210,7 +228,7 @@ pub fn padding<'doc>(
     _theme: &Theme,
     _is_focused: bool,
 ) -> GutterFn<'doc> {
-    Box::new(|_line: usize, _selected: bool, _out: &mut String| None)
+    Box::new(|_line: usize, _selected: bool, _first_visual_line: bool, _out: &mut String| None)
 }
 
 #[inline(always)]
@@ -237,41 +255,46 @@ pub fn breakpoints<'doc>(
 
     let breakpoints = match breakpoints {
         Some(breakpoints) => breakpoints,
-        None => return Box::new(move |_, _, _| None),
+        None => return Box::new(move |_, _, _, _| None),
     };
 
-    Box::new(move |line: usize, _selected: bool, out: &mut String| {
-        let breakpoint = breakpoints
-            .iter()
-            .find(|breakpoint| breakpoint.line == line)?;
-
-        let mut style = if breakpoint.condition.is_some() && breakpoint.log_message.is_some() {
-            error.underline_style(UnderlineStyle::Line)
-        } else if breakpoint.condition.is_some() {
-            error
-        } else if breakpoint.log_message.is_some() {
-            info
-        } else {
-            warning
-        };
-
-        if !breakpoint.verified {
-            // Faded colors
-            style = if let Some(Color::Rgb(r, g, b)) = style.fg {
-                style.fg(Color::Rgb(
-                    ((r as f32) * 0.4).floor() as u8,
-                    ((g as f32) * 0.4).floor() as u8,
-                    ((b as f32) * 0.4).floor() as u8,
-                ))
-            } else {
-                style.fg(Color::Gray)
+    Box::new(
+        move |line: usize, _selected: bool, first_visual_line: bool, out: &mut String| {
+            if !first_visual_line {
+                return None;
             }
-        };
+            let breakpoint = breakpoints
+                .iter()
+                .find(|breakpoint| breakpoint.line == line)?;
+
+            let mut style = if breakpoint.condition.is_some() && breakpoint.log_message.is_some() {
+                error.underline_style(UnderlineStyle::Line)
+            } else if breakpoint.condition.is_some() {
+                error
+            } else if breakpoint.log_message.is_some() {
+                info
+            } else {
+                warning
+            };
 
-        let sym = if breakpoint.verified { "▲" } else { "⊚" };
-        write!(out, "{}", sym).unwrap();
-        Some(style)
-    })
+            if !breakpoint.verified {
+                // Faded colors
+                style = if let Some(Color::Rgb(r, g, b)) = style.fg {
+                    style.fg(Color::Rgb(
+                        ((r as f32) * 0.4).floor() as u8,
+                        ((g as f32) * 0.4).floor() as u8,
+                        ((b as f32) * 0.4).floor() as u8,
+                    ))
+                } else {
+                    style.fg(Color::Gray)
+                }
+            };
+
+            let sym = if breakpoint.verified { "▲" } else { "⊚" };
+            write!(out, "{}", sym).unwrap();
+            Some(style)
+        },
+    )
 }
 
 pub fn diagnostics_or_breakpoints<'doc>(
@@ -284,18 +307,22 @@ pub fn diagnostics_or_breakpoints<'doc>(
     let mut diagnostics = diagnostic(editor, doc, view, theme, is_focused);
     let mut breakpoints = breakpoints(editor, doc, view, theme, is_focused);
 
-    Box::new(move |line, selected, out| {
-        breakpoints(line, selected, out).or_else(|| diagnostics(line, selected, out))
+    Box::new(move |line, selected, first_visual_line: bool, out| {
+        breakpoints(line, selected, first_visual_line, out)
+            .or_else(|| diagnostics(line, selected, first_visual_line, out))
     })
 }
 
 #[cfg(test)]
 mod tests {
+    use std::sync::Arc;
+
     use super::*;
     use crate::document::Document;
-    use crate::editor::{GutterConfig, GutterLineNumbersConfig};
+    use crate::editor::{Config, GutterConfig, GutterLineNumbersConfig};
     use crate::graphics::Rect;
     use crate::DocumentId;
+    use arc_swap::ArcSwap;
     use helix_core::Rope;
 
     #[test]
@@ -304,7 +331,11 @@ mod tests {
         view.area = Rect::new(40, 40, 40, 40);
 
         let rope = Rope::from_str("abc\n\tdef");
-        let doc = Document::from(rope, None);
+        let doc = Document::from(
+            rope,
+            None,
+            Arc::new(ArcSwap::new(Arc::new(Config::default()))),
+        );
 
         assert_eq!(view.gutters.layout.len(), 5);
         assert_eq!(view.gutters.layout[0].width(&view, &doc), 1);
@@ -325,7 +356,11 @@ mod tests {
         view.area = Rect::new(40, 40, 40, 40);
 
         let rope = Rope::from_str("abc\n\tdef");
-        let doc = Document::from(rope, None);
+        let doc = Document::from(
+            rope,
+            None,
+            Arc::new(ArcSwap::new(Arc::new(Config::default()))),
+        );
 
         assert_eq!(view.gutters.layout.len(), 1);
         assert_eq!(view.gutters.layout[0].width(&view, &doc), 1);
@@ -339,7 +374,11 @@ mod tests {
         view.area = Rect::new(40, 40, 40, 40);
 
         let rope = Rope::from_str("abc\n\tdef");
-        let doc = Document::from(rope, None);
+        let doc = Document::from(
+            rope,
+            None,
+            Arc::new(ArcSwap::new(Arc::new(Config::default()))),
+        );
 
         assert_eq!(view.gutters.layout.len(), 2);
         assert_eq!(view.gutters.layout[0].width(&view, &doc), 1);
@@ -357,10 +396,18 @@ mod tests {
         view.area = Rect::new(40, 40, 40, 40);
 
         let rope = Rope::from_str("a\nb");
-        let doc_short = Document::from(rope, None);
+        let doc_short = Document::from(
+            rope,
+            None,
+            Arc::new(ArcSwap::new(Arc::new(Config::default()))),
+        );
 
         let rope = Rope::from_str("a\nb\nc\nd\ne\nf\ng\nh\ni\nj\nk\nl\nm\nn\no\np");
-        let doc_long = Document::from(rope, None);
+        let doc_long = Document::from(
+            rope,
+            None,
+            Arc::new(ArcSwap::new(Arc::new(Config::default()))),
+        );
 
         assert_eq!(view.gutters.layout.len(), 2);
         assert_eq!(view.gutters.layout[1].width(&view, &doc_short), 1);
diff --git a/helix-view/src/lib.rs b/helix-view/src/lib.rs
index 9a980446..c3f67345 100644
--- a/helix-view/src/lib.rs
+++ b/helix-view/src/lib.rs
@@ -49,13 +49,10 @@ pub enum Align {
 }
 
 pub fn align_view(doc: &Document, view: &mut View, align: Align) {
-    let pos = doc
-        .selection(view.id)
-        .primary()
-        .cursor(doc.text().slice(..));
-    let line = doc.text().char_to_line(pos);
-
-    let last_line_height = view.inner_height().saturating_sub(1);
+    let doc_text = doc.text().slice(..);
+    let cursor = doc.selection(view.id).primary().cursor(doc_text);
+    let viewport = view.inner_area(doc);
+    let last_line_height = viewport.height.saturating_sub(1);
 
     let relative = match align {
         Align::Center => last_line_height / 2,
@@ -63,10 +60,20 @@ pub fn align_view(doc: &Document, view: &mut View, align: Align) {
         Align::Bottom => last_line_height,
     };
 
-    view.offset.row = line.saturating_sub(relative);
+    let text_fmt = doc.text_format(viewport.width, None);
+    let annotations = view.text_annotations(doc, None);
+    (view.offset.anchor, view.offset.vertical_offset) = char_idx_at_visual_offset(
+        doc_text,
+        cursor,
+        -(relative as isize),
+        0,
+        &text_fmt,
+        &annotations,
+    );
 }
 
 pub use document::Document;
 pub use editor::Editor;
+use helix_core::char_idx_at_visual_offset;
 pub use theme::Theme;
 pub use view::View;
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index 125725e0..ce061bab 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -314,10 +314,23 @@ impl Theme {
         &self.scopes
     }
 
-    pub fn find_scope_index(&self, scope: &str) -> Option<usize> {
+    pub fn find_scope_index_exact(&self, scope: &str) -> Option<usize> {
         self.scopes().iter().position(|s| s == scope)
     }
 
+    pub fn find_scope_index(&self, mut scope: &str) -> Option<usize> {
+        loop {
+            if let Some(highlight) = self.find_scope_index_exact(scope) {
+                return Some(highlight);
+            }
+            if let Some(new_end) = scope.rfind('.') {
+                scope = &scope[..new_end];
+            } else {
+                return None;
+            }
+        }
+    }
+
     pub fn is_16_color(&self) -> bool {
         self.styles.iter().all(|(_, style)| {
             [style.fg, style.bg]
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index abcf9a16..660cce65 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -2,11 +2,13 @@ use crate::{
     align_view,
     editor::{GutterConfig, GutterType},
     graphics::Rect,
-    Align, Document, DocumentId, ViewId,
+    Align, Document, DocumentId, Theme, ViewId,
 };
 
 use helix_core::{
-    pos_at_visual_coords, visual_coords_at_pos, Position, RopeSlice, Selection, Transaction,
+    char_idx_at_visual_offset, doc_formatter::TextFormat, text_annotations::TextAnnotations,
+    visual_offset_from_anchor, visual_offset_from_block, Position, RopeSlice, Selection,
+    Transaction,
 };
 
 use std::{
@@ -93,10 +95,17 @@ impl JumpList {
     }
 }
 
+#[derive(Clone, Debug, PartialEq, Eq, Copy, Default)]
+pub struct ViewPosition {
+    pub anchor: usize,
+    pub horizontal_offset: usize,
+    pub vertical_offset: usize,
+}
+
 #[derive(Clone)]
 pub struct View {
     pub id: ViewId,
-    pub offset: Position,
+    pub offset: ViewPosition,
     pub area: Rect,
     pub doc: DocumentId,
     pub jumps: JumpList,
@@ -133,7 +142,11 @@ impl View {
         Self {
             id: ViewId::default(),
             doc,
-            offset: Position::new(0, 0),
+            offset: ViewPosition {
+                anchor: 0,
+                horizontal_offset: 0,
+                vertical_offset: 0,
+            },
             area: Rect::default(), // will get calculated upon inserting into tree
             jumps: JumpList::new((doc, Selection::point(0))), // TODO: use actual sel
             docs_access_history: Vec::new(),
@@ -159,6 +172,10 @@ impl View {
         self.area.clip_bottom(1).height.into() // -1 for statusline
     }
 
+    pub fn inner_width(&self, doc: &Document) -> u16 {
+        self.area.clip_left(self.gutter_offset(doc)).width
+    }
+
     pub fn gutters(&self) -> &[GutterType] {
         &self.gutters.layout
     }
@@ -176,84 +193,120 @@ impl View {
         &self,
         doc: &Document,
         scrolloff: usize,
-    ) -> Option<(usize, usize)> {
-        self.offset_coords_to_in_view_center(doc, scrolloff, false)
+    ) -> Option<ViewPosition> {
+        self.offset_coords_to_in_view_center::<false>(doc, scrolloff)
     }
 
-    pub fn offset_coords_to_in_view_center(
+    pub fn offset_coords_to_in_view_center<const CENTERING: bool>(
         &self,
         doc: &Document,
         scrolloff: usize,
-        centering: bool,
-    ) -> Option<(usize, usize)> {
-        let cursor = doc
-            .selection(self.id)
-            .primary()
-            .cursor(doc.text().slice(..));
-
-        let Position { col, row: line } =
-            visual_coords_at_pos(doc.text().slice(..), cursor, doc.tab_width());
-
-        let inner_area = self.inner_area(doc);
-        let last_line = (self.offset.row + inner_area.height as usize).saturating_sub(1);
-        let last_col = self.offset.col + inner_area.width.saturating_sub(1) as usize;
-
-        let new_offset = |scrolloff: usize| {
-            // - 1 so we have at least one gap in the middle.
-            // a height of 6 with padding of 3 on each side will keep shifting the view back and forth
-            // as we type
-            let scrolloff = scrolloff.min(inner_area.height.saturating_sub(1) as usize / 2);
-
-            let row = if line > last_line.saturating_sub(scrolloff) {
-                // scroll down
-                self.offset.row + line - (last_line.saturating_sub(scrolloff))
-            } else if line < self.offset.row + scrolloff {
-                // scroll up
-                line.saturating_sub(scrolloff)
+    ) -> Option<ViewPosition> {
+        let doc_text = doc.text().slice(..);
+        let viewport = self.inner_area(doc);
+        let vertical_viewport_end = self.offset.vertical_offset + viewport.height as usize;
+        let text_fmt = doc.text_format(viewport.width, None);
+        let annotations = self.text_annotations(doc, None);
+
+        // - 1 so we have at least one gap in the middle.
+        // a height of 6 with padding of 3 on each side will keep shifting the view back and forth
+        // as we type
+        let scrolloff = scrolloff.min(viewport.height.saturating_sub(1) as usize / 2);
+
+        let cursor = doc.selection(self.id).primary().cursor(doc_text);
+        let mut offset = self.offset;
+
+        let (visual_off, mut at_top) = if cursor >= offset.anchor {
+            let off = visual_offset_from_anchor(
+                doc_text,
+                offset.anchor,
+                cursor,
+                &text_fmt,
+                &annotations,
+                vertical_viewport_end,
+            );
+            (off, false)
+        } else if CENTERING {
+            // cursor out of view
+            return None;
+        } else {
+            (None, true)
+        };
+
+        let new_anchor = match visual_off {
+            Some((visual_pos, _)) if visual_pos.row < scrolloff + offset.vertical_offset => {
+                if CENTERING && visual_pos.row < offset.vertical_offset {
+                    // cursor out of view
+                    return None;
+                }
+                at_top = true;
+                true
+            }
+            Some((visual_pos, _)) if visual_pos.row >= vertical_viewport_end - scrolloff => {
+                if CENTERING && visual_pos.row >= vertical_viewport_end as usize {
+                    // cursor out of view
+                    return None;
+                }
+                true
+            }
+            Some(_) => false,
+            None => true,
+        };
+
+        if new_anchor {
+            let v_off = if at_top {
+                scrolloff as isize
             } else {
-                self.offset.row
+                viewport.height as isize - scrolloff as isize
             };
+            (offset.anchor, offset.vertical_offset) =
+                char_idx_at_visual_offset(doc_text, cursor, -v_off, 0, &text_fmt, &annotations);
+        }
 
-            let col = if col > last_col.saturating_sub(scrolloff) {
+        if text_fmt.soft_wrap {
+            offset.horizontal_offset = 0;
+        } else {
+            // determine the current visual column of the text
+            let col = visual_off
+                .unwrap_or_else(|| {
+                    visual_offset_from_block(
+                        doc_text,
+                        offset.anchor,
+                        cursor,
+                        &text_fmt,
+                        &annotations,
+                    )
+                })
+                .0
+                .col;
+
+            let last_col = offset.horizontal_offset + viewport.width.saturating_sub(1) as usize;
+            if col > last_col.saturating_sub(scrolloff) {
                 // scroll right
-                self.offset.col + col - (last_col.saturating_sub(scrolloff))
-            } else if col < self.offset.col + scrolloff {
+                offset.horizontal_offset += col - (last_col.saturating_sub(scrolloff))
+            } else if col < offset.horizontal_offset + scrolloff {
                 // scroll left
-                col.saturating_sub(scrolloff)
-            } else {
-                self.offset.col
+                offset.horizontal_offset = col.saturating_sub(scrolloff)
             };
-            (row, col)
-        };
-        let current_offset = (self.offset.row, self.offset.col);
-        if centering {
-            // return None if cursor is out of view
-            let offset = new_offset(0);
-            (offset == current_offset).then(|| {
-                if scrolloff == 0 {
-                    offset
-                } else {
-                    new_offset(scrolloff)
-                }
-            })
-        } else {
-            // return None if cursor is in (view - scrolloff)
-            let offset = new_offset(scrolloff);
-            (offset != current_offset).then(|| offset) // TODO: use 'then_some' when 1.62 <= MSRV
         }
+
+        // if we are not centering return None if view position is unchanged
+        if !CENTERING && offset == self.offset {
+            return None;
+        }
+
+        Some(offset)
     }
 
     pub fn ensure_cursor_in_view(&mut self, doc: &Document, scrolloff: usize) {
-        if let Some((row, col)) = self.offset_coords_to_in_view_center(doc, scrolloff, false) {
-            self.offset.row = row;
-            self.offset.col = col;
+        if let Some(offset) = self.offset_coords_to_in_view_center::<false>(doc, scrolloff) {
+            self.offset = offset;
         }
     }
 
     pub fn ensure_cursor_in_view_center(&mut self, doc: &Document, scrolloff: usize) {
-        if let Some((row, col)) = self.offset_coords_to_in_view_center(doc, scrolloff, true) {
-            self.offset.row = row;
-            self.offset.col = col;
+        if let Some(offset) = self.offset_coords_to_in_view_center::<true>(doc, scrolloff) {
+            self.offset = offset;
         } else {
             align_view(doc, self, Align::Center);
         }
@@ -263,14 +316,51 @@ impl View {
         self.offset_coords_to_in_view(doc, scrolloff).is_none()
     }
 
-    /// Calculates the last visible line on screen
+    /// Estimates the last visible document line on screen.
+    /// This estimate is an upper bound obtained by calculating the first
+    /// visible line and adding the viewport height.
+    /// The actual last visible line may be smaller if softwrapping occurs
+    /// or virtual text lines are visible
     #[inline]
-    pub fn last_line(&self, doc: &Document) -> usize {
-        std::cmp::min(
-            // Saturating subs to make it inclusive zero indexing.
-            (self.offset.row + self.inner_height()).saturating_sub(1),
-            doc.text().len_lines().saturating_sub(1),
-        )
+    pub fn estimate_last_doc_line(&self, doc: &Document) -> usize {
+        let doc_text = doc.text().slice(..);
+        let line = doc_text.char_to_line(self.offset.anchor.min(doc_text.len_chars()));
+        // Saturating subs to make it inclusive zero indexing.
+        (line + self.inner_height())
+            .min(doc_text.len_lines())
+            .saturating_sub(1)
+    }
+
+    /// Calculates the last non-empty visual line on screen
+    #[inline]
+    pub fn last_visual_line(&self, doc: &Document) -> usize {
+        let doc_text = doc.text().slice(..);
+        let viewport = self.inner_area(doc);
+        let text_fmt = doc.text_format(viewport.width, None);
+        let annotations = self.text_annotations(doc, None);
+
+        // last visual line in view is trivial to compute
+        let visual_height = self.offset.vertical_offset + viewport.height as usize;
+
+        // fast path when the EOF is not visible on the screen,
+        if self.estimate_last_doc_line(doc) < doc_text.len_lines() - 1 {
+            return visual_height.saturating_sub(1);
+        }
+
+        // translate to document line
+        let pos = visual_offset_from_anchor(
+            doc_text,
+            self.offset.anchor,
+            usize::MAX,
+            &text_fmt,
+            &annotations,
+            visual_height,
+        );
+
+        match pos {
+            Some((Position { row, .. }, _)) => row.saturating_sub(self.offset.vertical_offset),
+            None => visual_height.saturating_sub(1),
+        }
     }
 
     /// Translates a document position to an absolute position in the terminal.
@@ -282,22 +372,39 @@ impl View {
         text: RopeSlice,
         pos: usize,
     ) -> Option<Position> {
-        let line = text.char_to_line(pos);
-
-        if line < self.offset.row || line > self.last_line(doc) {
+        if pos < self.offset.anchor {
             // Line is not visible on screen
             return None;
         }
 
-        let tab_width = doc.tab_width();
-        // TODO: visual_coords_at_pos also does char_to_line which we ignore, can we reuse the call?
-        let Position { col, .. } = visual_coords_at_pos(text, pos, tab_width);
+        let viewport = self.inner_area(doc);
+        let text_fmt = doc.text_format(viewport.width, None);
+        let annotations = self.text_annotations(doc, None);
+
+        let mut pos = visual_offset_from_anchor(
+            text,
+            self.offset.anchor,
+            pos,
+            &text_fmt,
+            &annotations,
+            viewport.height as usize,
+        )?
+        .0;
+        if pos.row < self.offset.vertical_offset {
+            return None;
+        }
+        pos.row -= self.offset.vertical_offset;
+        if pos.row >= viewport.height as usize {
+            return None;
+        }
+        pos.col = pos.col.saturating_sub(self.offset.horizontal_offset);
 
-        // It is possible for underflow to occur if the buffer length is larger than the terminal width.
-        let row = line.saturating_sub(self.offset.row);
-        let col = col.saturating_sub(self.offset.col);
+        Some(pos)
+    }
 
-        Some(Position::new(row, col))
+    pub fn text_annotations(&self, doc: &Document, theme: Option<&Theme>) -> TextAnnotations {
+        // TODO custom annotations for custom views like side by side diffs
+        doc.text_annotations(theme)
     }
 
     pub fn text_pos_at_screen_coords(
@@ -305,9 +412,10 @@ impl View {
         doc: &Document,
         row: u16,
         column: u16,
-        tab_width: usize,
+        fmt: TextFormat,
+        annotations: &TextAnnotations,
+        ignore_virtual_text: bool,
     ) -> Option<usize> {
-        let text = doc.text().slice(..);
         let inner = self.inner_area(doc);
         // 1 for status
         if row < inner.top() || row >= inner.bottom() {
@@ -318,27 +426,80 @@ impl View {
             return None;
         }
 
-        let text_row = (row - inner.y) as usize + self.offset.row;
-        if text_row > text.len_lines() - 1 {
-            return Some(text.len_chars());
-        }
+        self.text_pos_at_visual_coords(
+            doc,
+            row - inner.y,
+            column - inner.x,
+            fmt,
+            annotations,
+            ignore_virtual_text,
+        )
+    }
+
+    pub fn text_pos_at_visual_coords(
+        &self,
+        doc: &Document,
+        row: u16,
+        column: u16,
+        text_fmt: TextFormat,
+        annotations: &TextAnnotations,
+        ignore_virtual_text: bool,
+    ) -> Option<usize> {
+        let text = doc.text().slice(..);
 
-        let text_col = (column - inner.x) as usize + self.offset.col;
+        let text_row = row as usize + self.offset.vertical_offset;
+        let text_col = column as usize + self.offset.horizontal_offset;
 
-        Some(pos_at_visual_coords(
+        let (char_idx, virt_lines) = char_idx_at_visual_offset(
             text,
-            Position {
-                row: text_row,
-                col: text_col,
-            },
-            tab_width,
-        ))
+            self.offset.anchor,
+            text_row as isize,
+            text_col,
+            &text_fmt,
+            annotations,
+        );
+
+        // if the cursor is on a line with only virtual text return None
+        if virt_lines != 0 && ignore_virtual_text {
+            return None;
+        }
+        Some(char_idx)
     }
 
     /// Translates a screen position to position in the text document.
     /// Returns a usize typed position in bounds of the text if found in this view, None if out of view.
-    pub fn pos_at_screen_coords(&self, doc: &Document, row: u16, column: u16) -> Option<usize> {
-        self.text_pos_at_screen_coords(doc, row, column, doc.tab_width())
+    pub fn pos_at_screen_coords(
+        &self,
+        doc: &Document,
+        row: u16,
+        column: u16,
+        ignore_virtual_text: bool,
+    ) -> Option<usize> {
+        self.text_pos_at_screen_coords(
+            doc,
+            row,
+            column,
+            doc.text_format(self.inner_width(doc), None),
+            &self.text_annotations(doc, None),
+            ignore_virtual_text,
+        )
+    }
+
+    pub fn pos_at_visual_coords(
+        &self,
+        doc: &Document,
+        row: u16,
+        column: u16,
+        ignore_virtual_text: bool,
+    ) -> Option<usize> {
+        self.text_pos_at_visual_coords(
+            doc,
+            row,
+            column,
+            doc.text_format(self.inner_width(doc), None),
+            &self.text_annotations(doc, None),
+            ignore_virtual_text,
+        )
     }
 
     /// Translates screen coordinates into coordinates on the gutter of the view.
@@ -419,7 +580,10 @@ impl View {
 
 #[cfg(test)]
 mod tests {
+    use std::sync::Arc;
+
     use super::*;
+    use arc_swap::ArcSwap;
     use helix_core::Rope;
 
     // 1 diagnostic + 1 spacer + 3 linenr (< 1000 lines) + 1 spacer + 1 diff
@@ -429,52 +593,174 @@ mod tests {
     const DEFAULT_GUTTER_OFFSET_ONLY_DIAGNOSTICS: u16 = 3;
 
     use crate::document::Document;
-    use crate::editor::{GutterConfig, GutterLineNumbersConfig, GutterType};
+    use crate::editor::{Config, GutterConfig, GutterLineNumbersConfig, GutterType};
 
     #[test]
     fn test_text_pos_at_screen_coords() {
         let mut view = View::new(DocumentId::default(), GutterConfig::default());
         view.area = Rect::new(40, 40, 40, 40);
         let rope = Rope::from_str("abc\n\tdef");
-        let doc = Document::from(rope, None);
+        let doc = Document::from(
+            rope,
+            None,
+            Arc::new(ArcSwap::new(Arc::new(Config::default()))),
+        );
 
-        assert_eq!(view.text_pos_at_screen_coords(&doc, 40, 2, 4), None);
+        assert_eq!(
+            view.text_pos_at_screen_coords(
+                &doc,
+                40,
+                2,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
+            None
+        );
 
-        assert_eq!(view.text_pos_at_screen_coords(&doc, 40, 41, 4), None);
+        assert_eq!(
+            view.text_pos_at_screen_coords(
+                &doc,
+                40,
+                41,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
+            None
+        );
 
-        assert_eq!(view.text_pos_at_screen_coords(&doc, 0, 2, 4), None);
+        assert_eq!(
+            view.text_pos_at_screen_coords(
+                &doc,
+                0,
+                2,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
+            None
+        );
 
-        assert_eq!(view.text_pos_at_screen_coords(&doc, 0, 49, 4), None);
+        assert_eq!(
+            view.text_pos_at_screen_coords(
+                &doc,
+                0,
+                49,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
+            None
+        );
 
-        assert_eq!(view.text_pos_at_screen_coords(&doc, 0, 41, 4), None);
+        assert_eq!(
+            view.text_pos_at_screen_coords(
+                &doc,
+                0,
+                41,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
+            None
+        );
 
-        assert_eq!(view.text_pos_at_screen_coords(&doc, 40, 81, 4), None);
+        assert_eq!(
+            view.text_pos_at_screen_coords(
+                &doc,
+                40,
+                81,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
+            None
+        );
 
-        assert_eq!(view.text_pos_at_screen_coords(&doc, 78, 41, 4), None);
+        assert_eq!(
+            view.text_pos_at_screen_coords(
+                &doc,
+                78,
+                41,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
+            None
+        );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET + 3, 4),
+            view.text_pos_at_screen_coords(
+                &doc,
+                40,
+                40 + DEFAULT_GUTTER_OFFSET + 3,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
             Some(3)
         );
 
-        assert_eq!(view.text_pos_at_screen_coords(&doc, 40, 80, 4), Some(3));
+        assert_eq!(
+            view.text_pos_at_screen_coords(
+                &doc,
+                40,
+                80,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
+            Some(3)
+        );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 41, 40 + DEFAULT_GUTTER_OFFSET + 1, 4),
+            view.text_pos_at_screen_coords(
+                &doc,
+                41,
+                40 + DEFAULT_GUTTER_OFFSET + 1,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
             Some(4)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 41, 40 + DEFAULT_GUTTER_OFFSET + 4, 4),
+            view.text_pos_at_screen_coords(
+                &doc,
+                41,
+                40 + DEFAULT_GUTTER_OFFSET + 4,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
             Some(5)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 41, 40 + DEFAULT_GUTTER_OFFSET + 7, 4),
+            view.text_pos_at_screen_coords(
+                &doc,
+                41,
+                40 + DEFAULT_GUTTER_OFFSET + 7,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
             Some(8)
         );
 
-        assert_eq!(view.text_pos_at_screen_coords(&doc, 41, 80, 4), Some(8));
+        assert_eq!(
+            view.text_pos_at_screen_coords(
+                &doc,
+                41,
+                80,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
+            Some(8)
+        );
     }
 
     #[test]
@@ -488,13 +774,19 @@ mod tests {
         );
         view.area = Rect::new(40, 40, 40, 40);
         let rope = Rope::from_str("abc\n\tdef");
-        let doc = Document::from(rope, None);
+        let doc = Document::from(
+            rope,
+            None,
+            Arc::new(ArcSwap::new(Arc::new(Config::default()))),
+        );
         assert_eq!(
             view.text_pos_at_screen_coords(
                 &doc,
                 41,
                 40 + DEFAULT_GUTTER_OFFSET_ONLY_DIAGNOSTICS + 1,
-                4
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
             ),
             Some(4)
         );
@@ -511,8 +803,22 @@ mod tests {
         );
         view.area = Rect::new(40, 40, 40, 40);
         let rope = Rope::from_str("abc\n\tdef");
-        let doc = Document::from(rope, None);
-        assert_eq!(view.text_pos_at_screen_coords(&doc, 41, 40 + 1, 4), Some(4));
+        let doc = Document::from(
+            rope,
+            None,
+            Arc::new(ArcSwap::new(Arc::new(Config::default()))),
+        );
+        assert_eq!(
+            view.text_pos_at_screen_coords(
+                &doc,
+                41,
+                40 + 1,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
+            Some(4)
+        );
     }
 
     #[test]
@@ -520,34 +826,80 @@ mod tests {
         let mut view = View::new(DocumentId::default(), GutterConfig::default());
         view.area = Rect::new(40, 40, 40, 40);
         let rope = Rope::from_str("Hi! こんにちは皆さん");
-        let doc = Document::from(rope, None);
+        let doc = Document::from(
+            rope,
+            None,
+            Arc::new(ArcSwap::new(Arc::new(Config::default()))),
+        );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET, 4),
+            view.text_pos_at_screen_coords(
+                &doc,
+                40,
+                40 + DEFAULT_GUTTER_OFFSET,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
             Some(0)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET + 4, 4),
+            view.text_pos_at_screen_coords(
+                &doc,
+                40,
+                40 + DEFAULT_GUTTER_OFFSET + 4,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
             Some(4)
         );
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET + 5, 4),
+            view.text_pos_at_screen_coords(
+                &doc,
+                40,
+                40 + DEFAULT_GUTTER_OFFSET + 5,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
             Some(4)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET + 6, 4),
+            view.text_pos_at_screen_coords(
+                &doc,
+                40,
+                40 + DEFAULT_GUTTER_OFFSET + 6,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
             Some(5)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET + 7, 4),
+            view.text_pos_at_screen_coords(
+                &doc,
+                40,
+                40 + DEFAULT_GUTTER_OFFSET + 7,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
             Some(5)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET + 8, 4),
+            view.text_pos_at_screen_coords(
+                &doc,
+                40,
+                40 + DEFAULT_GUTTER_OFFSET + 8,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
             Some(6)
         );
     }
@@ -557,30 +909,69 @@ mod tests {
         let mut view = View::new(DocumentId::default(), GutterConfig::default());
         view.area = Rect::new(40, 40, 40, 40);
         let rope = Rope::from_str("Hèl̀l̀ò world!");
-        let doc = Document::from(rope, None);
+        let doc = Document::from(
+            rope,
+            None,
+            Arc::new(ArcSwap::new(Arc::new(Config::default()))),
+        );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET, 4),
+            view.text_pos_at_screen_coords(
+                &doc,
+                40,
+                40 + DEFAULT_GUTTER_OFFSET,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
             Some(0)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET + 1, 4),
+            view.text_pos_at_screen_coords(
+                &doc,
+                40,
+                40 + DEFAULT_GUTTER_OFFSET + 1,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
             Some(1)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET + 2, 4),
+            view.text_pos_at_screen_coords(
+                &doc,
+                40,
+                40 + DEFAULT_GUTTER_OFFSET + 2,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
             Some(3)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET + 3, 4),
+            view.text_pos_at_screen_coords(
+                &doc,
+                40,
+                40 + DEFAULT_GUTTER_OFFSET + 3,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
             Some(5)
         );
 
         assert_eq!(
-            view.text_pos_at_screen_coords(&doc, 40, 40 + DEFAULT_GUTTER_OFFSET + 4, 4),
+            view.text_pos_at_screen_coords(
+                &doc,
+                40,
+                40 + DEFAULT_GUTTER_OFFSET + 4,
+                TextFormat::default(),
+                &TextAnnotations::default(),
+                true
+            ),
             Some(7)
         );
     }

From 0f562dfeabc7b4abd643de0e1846a612a42145b0 Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Wed, 1 Feb 2023 02:59:07 +0530
Subject: [PATCH 816/884] theme(onedark): Add ui.highlight scope (#5755)

---
 runtime/themes/onedark.toml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/runtime/themes/onedark.toml b/runtime/themes/onedark.toml
index 9cab0901..81ca0463 100644
--- a/runtime/themes/onedark.toml
+++ b/runtime/themes/onedark.toml
@@ -59,10 +59,12 @@
 "ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] }
 "ui.cursor.match" = { fg = "blue", modifiers = ["underlined"]}
 
-"ui.selection" = { bg = "light-gray" }
+"ui.selection" = { bg = "faint-gray" }
 "ui.selection.primary" = { bg = "gray" }
 "ui.cursorline.primary" = { bg = "light-black" }
 
+"ui.highlight" = { bg = "gray" }
+
 "ui.linenr" = { fg = "linenr" }
 "ui.linenr.selected" = { fg = "white" }
 

From b2251870dabd343fe78299b02182e1af0f33c77a Mon Sep 17 00:00:00 2001
From: gibbz00 <gabrielhansson00@gmail.com>
Date: Wed, 1 Feb 2023 22:17:59 +0100
Subject: [PATCH 817/884] Add ayu_evolve theme (#5638)

* Add ayu_evolve theme

* ayu_evolve: fix typo + raw markdown highlight

* Update runtime/themes/ayu_evolve.toml typo

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 runtime/themes/ayu_evolve.toml | 36 ++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 runtime/themes/ayu_evolve.toml

diff --git a/runtime/themes/ayu_evolve.toml b/runtime/themes/ayu_evolve.toml
new file mode 100644
index 00000000..b8abedec
--- /dev/null
+++ b/runtime/themes/ayu_evolve.toml
@@ -0,0 +1,36 @@
+inherits = 'ayu_dark'
+
+"keyword.control" = "orange"
+"keyword.storage" = "yellow"
+"keyword.storage.modifier" = "magenta"
+"variable.other.member" = "gray"
+"variable" = "light_gray"
+"constructor" = "magenta"
+"type.builtin" = { fg = "blue", modifiers = ["italic"] }
+
+# Gutters and editing area
+"error" = "red"
+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
+"warning" = "vibrant_orange"
+"diagnostic.warning" = { underline = { color = "vibrant_orange", style = "curl" } }
+"hint" = "vibrant_yellow"
+"diagnostic.hint" = { underline = { color = "vibrant_yellow", style = "curl" } }
+"info" = "white"
+"diagnostic.info" = { underline = { color = "white", style = "curl" } }
+
+"markup.raw.block" = { bg = "black" }
+"markup.raw.inline" = { bg = "black" }
+
+"ui.cursor" = { fg = "dark_gray", bg = "light_gray" }
+"ui.cursor.primary" = { fg = "dark_gray", bg = "orange" }
+"ui.cursor.primary.select" = { fg = "dark_gray", bg = "magenta" }
+"ui.cursor.primary.insert" = { fg = "dark_gray", bg = "green" }
+"ui.text.inactive" = "gray"
+
+[palette]
+background = '#020202'
+black = "#0D0D0D"
+light_gray = "#dedede"
+red = "#DD3E25"
+vibrant_yellow = "#CFCA0D"
+vibrant_orange = "#FF8732"

From d5f17d3f6947abbfd0684246a440751355e48f9d Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 1 Feb 2023 15:28:56 -0600
Subject: [PATCH 818/884] Fix initial highlight layer sort order (#5196)

The purpose of this change is to remove the mutable self borrow on
`HighlightIterLayer::sort_key` so that we can sort layers with the
correct ordering using the `Vec::sort` function family.
`HighlightIterLayer::sort_key` needs `&mut self` since it calls
`Peekable::peek` which needs `&mut self`. `Vec::sort` functions
only give immutable borrows of the elements to ensure the
correctness of the sort.

We could instead approach this by creating an eager Peekable and using
that instead of `std::iter::Peekable` to wrap `QueryCaptures`:

```rust
struct EagerPeekable<I: Iterator> {
    iter: I,
    peeked: Option<I::Item>,
}

impl<I: Iterator> EagerPeekable<I> {
    fn new(mut iter: I) -> Self {
        let peeked = iter.next();
        Self { iter, peeked }
    }

    fn peek(&self) -> Option<&I::Item> {
        self.peeked.as_ref()
    }
}

impl<I: Iterator> Iterator for EagerPeekable<I> {
    type Item = I::Item;

    fn next(&mut self) -> Option<Self::Item> {
        std::mem::replace(&mut self.peeked, self.iter.next())
    }
}
```

This would be a cleaner approach (notice how `EagerPeekable::peek`
takes `&self` rather than `&mut self`), however this doesn't work in
practice because the Items emitted by the `tree_sitter::QueryCaptures`
Iterator must be consumed before the next Item is returned.
`Iterator::next` on `tree_sitter::QueryCaptures` modifies the
`QueryMatch` returned by the last call of `next`. This behavior is
not currently reflected in the lifetimes/structure of `QueryCaptures`.

This fixes an issue with layers being out of order when using combined
injections since the old code only checked the first range in the
layer. Layers being out of order could cause missing highlights for
combined-injections content.
---
 helix-core/src/syntax.rs | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 41ab23e1..ca4da3dc 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -1092,21 +1092,14 @@ impl Syntax {
                     }],
                     cursor,
                     _tree: None,
-                    captures,
+                    captures: RefCell::new(captures),
                     config: layer.config.as_ref(), // TODO: just reuse `layer`
                     depth: layer.depth,            // TODO: just reuse `layer`
-                    ranges: &layer.ranges,         // TODO: temp
                 })
             })
             .collect::<Vec<_>>();
 
-        // HAXX: arrange layers by byte range, with deeper layers positioned first
-        layers.sort_by_key(|layer| {
-            (
-                layer.ranges.first().cloned(),
-                std::cmp::Reverse(layer.depth),
-            )
-        });
+        layers.sort_unstable_by_key(|layer| layer.sort_key());
 
         let mut result = HighlightIter {
             source,
@@ -1424,12 +1417,11 @@ impl<'a> TextProvider<'a> for RopeProvider<'a> {
 struct HighlightIterLayer<'a> {
     _tree: Option<Tree>,
     cursor: QueryCursor,
-    captures: iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>>>,
+    captures: RefCell<iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>>>>,
     config: &'a HighlightConfiguration,
     highlight_end_stack: Vec<usize>,
     scope_stack: Vec<LocalScope<'a>>,
     depth: u32,
-    ranges: &'a [Range],
 }
 
 impl<'a> fmt::Debug for HighlightIterLayer<'a> {
@@ -1610,10 +1602,11 @@ impl<'a> HighlightIterLayer<'a> {
     // First, sort scope boundaries by their byte offset in the document. At a
     // given position, emit scope endings before scope beginnings. Finally, emit
     // scope boundaries from deeper layers first.
-    fn sort_key(&mut self) -> Option<(usize, bool, isize)> {
+    fn sort_key(&self) -> Option<(usize, bool, isize)> {
         let depth = -(self.depth as isize);
         let next_start = self
             .captures
+            .borrow_mut()
             .peek()
             .map(|(m, i)| m.captures[*i].node.start_byte());
         let next_end = self.highlight_end_stack.last().cloned();
@@ -1838,7 +1831,8 @@ impl<'a> Iterator for HighlightIter<'a> {
             // Get the next capture from whichever layer has the earliest highlight boundary.
             let range;
             let layer = &mut self.layers[0];
-            if let Some((next_match, capture_index)) = layer.captures.peek() {
+            let captures = layer.captures.get_mut();
+            if let Some((next_match, capture_index)) = captures.peek() {
                 let next_capture = next_match.captures[*capture_index];
                 range = next_capture.node.byte_range();
 
@@ -1861,7 +1855,7 @@ impl<'a> Iterator for HighlightIter<'a> {
                 return self.emit_event(self.source.len_bytes(), None);
             };
 
-            let (mut match_, capture_index) = layer.captures.next().unwrap();
+            let (mut match_, capture_index) = captures.next().unwrap();
             let mut capture = match_.captures[capture_index];
 
             // Remove from the local scope stack any local scopes that have already ended.
@@ -1937,11 +1931,11 @@ impl<'a> Iterator for HighlightIter<'a> {
                 }
 
                 // Continue processing any additional matches for the same node.
-                if let Some((next_match, next_capture_index)) = layer.captures.peek() {
+                if let Some((next_match, next_capture_index)) = captures.peek() {
                     let next_capture = next_match.captures[*next_capture_index];
                     if next_capture.node == capture.node {
                         capture = next_capture;
-                        match_ = layer.captures.next().unwrap().0;
+                        match_ = captures.next().unwrap().0;
                         continue;
                     }
                 }
@@ -1964,11 +1958,11 @@ impl<'a> Iterator for HighlightIter<'a> {
             // highlighting patterns that are disabled for local variables.
             if definition_highlight.is_some() || reference_highlight.is_some() {
                 while layer.config.non_local_variable_patterns[match_.pattern_index] {
-                    if let Some((next_match, next_capture_index)) = layer.captures.peek() {
+                    if let Some((next_match, next_capture_index)) = captures.peek() {
                         let next_capture = next_match.captures[*next_capture_index];
                         if next_capture.node == capture.node {
                             capture = next_capture;
-                            match_ = layer.captures.next().unwrap().0;
+                            match_ = captures.next().unwrap().0;
                             continue;
                         }
                     }
@@ -1983,10 +1977,10 @@ impl<'a> Iterator for HighlightIter<'a> {
             // for a given node are ordered by pattern index, so these subsequent
             // captures are guaranteed to be for highlighting, not injections or
             // local variables.
-            while let Some((next_match, next_capture_index)) = layer.captures.peek() {
+            while let Some((next_match, next_capture_index)) = captures.peek() {
                 let next_capture = next_match.captures[*next_capture_index];
                 if next_capture.node == capture.node {
-                    layer.captures.next();
+                    captures.next();
                 } else {
                     break;
                 }

From 685cd383a3a56755b06b4146d5dc14872890a56e Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Wed, 1 Feb 2023 15:29:48 -0600
Subject: [PATCH 819/884] Surround with line-endings on `ms<ret>` (#4571)

This change makes `ms<ret>` work similarly to `t<ret>` and related
find commands: when the next event is a keypress of Enter, surround
the selection with the document's line-endings.
---
 helix-term/src/commands.rs | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 1cbdd0fb..2ee3f6b9 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4775,35 +4775,39 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
 
 fn surround_add(cx: &mut Context) {
     cx.on_next_key(move |cx, event| {
-        let ch = match event.char() {
-            Some(ch) => ch,
+        let (view, doc) = current!(cx.editor);
+        // surround_len is the number of new characters being added.
+        let (open, close, surround_len) = match event.char() {
+            Some(ch) => {
+                let (o, c) = surround::get_pair(ch);
+                let mut open = Tendril::new();
+                open.push(o);
+                let mut close = Tendril::new();
+                close.push(c);
+                (open, close, 2)
+            }
+            None if event.code == KeyCode::Enter => (
+                doc.line_ending.as_str().into(),
+                doc.line_ending.as_str().into(),
+                2 * doc.line_ending.len_chars(),
+            ),
             None => return,
         };
-        let (view, doc) = current!(cx.editor);
-        let selection = doc.selection(view.id);
-        let (open, close) = surround::get_pair(ch);
-        // The number of chars in get_pair
-        let surround_len = 2;
 
+        let selection = doc.selection(view.id);
         let mut changes = Vec::with_capacity(selection.len() * 2);
         let mut ranges = SmallVec::with_capacity(selection.len());
         let mut offs = 0;
 
         for range in selection.iter() {
-            let mut o = Tendril::new();
-            o.push(open);
-            let mut c = Tendril::new();
-            c.push(close);
-            changes.push((range.from(), range.from(), Some(o)));
-            changes.push((range.to(), range.to(), Some(c)));
-
-            // Add 2 characters to the range to select them
+            changes.push((range.from(), range.from(), Some(open.clone())));
+            changes.push((range.to(), range.to(), Some(close.clone())));
+
             ranges.push(
                 Range::new(offs + range.from(), offs + range.to() + surround_len)
                     .with_direction(range.direction()),
             );
 
-            // Add 2 characters to the offset for the next ranges
             offs += surround_len;
         }
 

From 62d046fa219b927c536bf6726fcae1e825346e0e Mon Sep 17 00:00:00 2001
From: Mike Trinkala <trink@acm.org>
Date: Wed, 1 Feb 2023 14:07:42 -0800
Subject: [PATCH 820/884] Fix utf8 length handling for shellwords (#5738)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the last argument to shellwords ends in a multibyte utf8 character
the entire argument will be dropped.
e.g. `:sh echo test1 test2𒀀` will only output `test1`

Add additional tests based on the code review feedback
---
 helix-core/src/shellwords.rs | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/helix-core/src/shellwords.rs b/helix-core/src/shellwords.rs
index 9475f5e5..0883eb91 100644
--- a/helix-core/src/shellwords.rs
+++ b/helix-core/src/shellwords.rs
@@ -129,8 +129,9 @@ impl<'a> From<&'a str> for Shellwords<'a> {
                 DquoteEscaped => Dquoted,
             };
 
-            if i >= input.len() - 1 && end == 0 {
-                end = i + 1;
+            let c_len = c.len_utf8();
+            if i == input.len() - c_len && end == 0 {
+                end = i + c_len;
             }
 
             if end > 0 {
@@ -333,4 +334,17 @@ mod test {
         assert_eq!(Shellwords::from(":o a").parts(), &[":o", "a"]);
         assert_eq!(Shellwords::from(":o a\\ ").parts(), &[":o", "a\\"]);
     }
+
+    #[test]
+    fn test_multibyte_at_end() {
+        assert_eq!(Shellwords::from("𒀀").parts(), &["𒀀"]);
+        assert_eq!(
+            Shellwords::from(":sh echo 𒀀").parts(),
+            &[":sh", "echo", "𒀀"]
+        );
+        assert_eq!(
+            Shellwords::from(":sh echo 𒀀 hello world𒀀").parts(),
+            &[":sh", "echo", "𒀀", "hello", "world𒀀"]
+        );
+    }
 }

From 6ed2348078a331bc2039a313bd7ad9f0bb1a00c2 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Thu, 2 Feb 2023 18:14:02 +0100
Subject: [PATCH 821/884] Hide duplicate symlinks from the picker (#5658)

* hide duplicate symlinks from the picker

* Apply suggestions from code review

Co-authored-by: g-re-g <123515925+g-re-g@users.noreply.github.com>

* minor stylistic fix

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

---------

Co-authored-by: g-re-g <123515925+g-re-g@users.noreply.github.com>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 book/src/configuration.md  |  2 ++
 helix-term/src/commands.rs | 13 +++++++++----
 helix-term/src/lib.rs      | 25 +++++++++++++++++++++++++
 helix-term/src/ui/mod.rs   | 18 ++++++++----------
 helix-view/src/editor.rs   |  3 +++
 5 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 528fafd0..87585ece 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -150,6 +150,8 @@ All git related options are only enabled in a git repository.
 | Key | Description | Default |
 |--|--|---------|
 |`hidden` | Enables ignoring hidden files. | true
+|`follow-links` | Follow symlinks instead of ignoring them | true
+|`deduplicate-links` | Ignore symlinks that point at files already shown in the picker | true
 |`parents` | Enables reading ignore files from parent directories. | true
 |`ignore` | Enables reading `.ignore` files. | true
 |`git-ignore` | Enables reading `.gitignore` files. | true
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 2ee3f6b9..4f27fc80 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -49,6 +49,7 @@ use movement::Movement;
 use crate::{
     args,
     compositor::{self, Component, Compositor},
+    filter_picker_entry,
     job::Callback,
     keymap::ReverseKeymap,
     ui::{self, overlay::overlayed, FilePicker, Picker, Popup, Prompt, PromptEvent},
@@ -2013,6 +2014,11 @@ fn global_search(cx: &mut Context) {
 
                 let search_root = std::env::current_dir()
                     .expect("Global search error: Failed to get current dir");
+                let dedup_symlinks = file_picker_config.deduplicate_links;
+                let absolute_root = search_root
+                    .canonicalize()
+                    .unwrap_or_else(|_| search_root.clone());
+
                 WalkBuilder::new(search_root)
                     .hidden(file_picker_config.hidden)
                     .parents(file_picker_config.parents)
@@ -2022,10 +2028,9 @@ fn global_search(cx: &mut Context) {
                     .git_global(file_picker_config.git_global)
                     .git_exclude(file_picker_config.git_exclude)
                     .max_depth(file_picker_config.max_depth)
-                    // We always want to ignore the .git directory, otherwise if
-                    // `ignore` is turned off above, we end up with a lot of noise
-                    // in our picker.
-                    .filter_entry(|entry| entry.file_name() != ".git")
+                    .filter_entry(move |entry| {
+                        filter_picker_entry(entry, &absolute_root, dedup_symlinks)
+                    })
                     .build_parallel()
                     .run(|| {
                         let mut searcher = searcher.clone();
diff --git a/helix-term/src/lib.rs b/helix-term/src/lib.rs
index a945b20d..f0bc9129 100644
--- a/helix-term/src/lib.rs
+++ b/helix-term/src/lib.rs
@@ -10,6 +10,9 @@ pub mod health;
 pub mod job;
 pub mod keymap;
 pub mod ui;
+use std::path::Path;
+
+use ignore::DirEntry;
 pub use keymap::macros::*;
 
 #[cfg(not(windows))]
@@ -22,3 +25,25 @@ fn true_color() -> bool {
 fn true_color() -> bool {
     true
 }
+
+/// Function used for filtering dir entries in the various file pickers.
+fn filter_picker_entry(entry: &DirEntry, root: &Path, dedup_symlinks: bool) -> bool {
+    // We always want to ignore the .git directory, otherwise if
+    // `ignore` is turned off, we end up with a lot of noise
+    // in our picker.
+    if entry.file_name() == ".git" {
+        return false;
+    }
+
+    // We also ignore symlinks that point inside the current directory
+    // if `dedup_links` is enabled.
+    if dedup_symlinks && entry.path_is_symlink() {
+        return entry
+            .path()
+            .canonicalize()
+            .ok()
+            .map_or(false, |path| !path.starts_with(&root));
+    }
+
+    true
+}
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 5e7f8c36..d7717f8c 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -15,6 +15,7 @@ mod statusline;
 mod text;
 
 use crate::compositor::{Component, Compositor};
+use crate::filter_picker_entry;
 use crate::job::{self, Callback};
 pub use completion::Completion;
 pub use editor::EditorView;
@@ -163,6 +164,9 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
 
     let now = Instant::now();
 
+    let dedup_symlinks = config.file_picker.deduplicate_links;
+    let absolute_root = root.canonicalize().unwrap_or_else(|_| root.clone());
+
     let mut walk_builder = WalkBuilder::new(&root);
     walk_builder
         .hidden(config.file_picker.hidden)
@@ -173,10 +177,7 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
         .git_global(config.file_picker.git_global)
         .git_exclude(config.file_picker.git_exclude)
         .max_depth(config.file_picker.max_depth)
-        // We always want to ignore the .git directory, otherwise if
-        // `ignore` is turned off above, we end up with a lot of noise
-        // in our picker.
-        .filter_entry(|entry| entry.file_name() != ".git");
+        .filter_entry(move |entry| filter_picker_entry(entry, &absolute_root, dedup_symlinks));
 
     // We want to exclude files that the editor can't handle yet
     let mut type_builder = TypesBuilder::new();
@@ -195,14 +196,11 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
     // We want files along with their modification date for sorting
     let files = walk_builder.build().filter_map(|entry| {
         let entry = entry.ok()?;
-
         // This is faster than entry.path().is_dir() since it uses cached fs::Metadata fetched by ignore/walkdir
-        let is_dir = entry.file_type().map_or(false, |ft| ft.is_dir());
-        if is_dir {
-            // Will give a false positive if metadata cannot be read (eg. permission error)
-            None
-        } else {
+        if entry.file_type()?.is_file() {
             Some(entry.into_path())
+        } else {
+            None
         }
     });
 
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 46511c62..aabf9cde 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -173,6 +173,8 @@ pub struct FilePickerConfig {
     /// Enables following symlinks.
     /// Whether to follow symbolic links in file picker and file or directory completions. Defaults to true.
     pub follow_symlinks: bool,
+    /// Hides symlinks that point into the current directory. Defaults to true.
+    pub deduplicate_links: bool,
     /// Enables reading ignore files from parent directories. Defaults to true.
     pub parents: bool,
     /// Enables reading `.ignore` files.
@@ -197,6 +199,7 @@ impl Default for FilePickerConfig {
         Self {
             hidden: true,
             follow_symlinks: true,
+            deduplicate_links: true,
             parents: true,
             ignore: true,
             git_ignore: true,

From 2949bb018c00e21d0465bab6970708407cc29ccd Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Thu, 2 Feb 2023 19:04:41 +0100
Subject: [PATCH 822/884] fix position translation at EOF with softwrap (#5786)

---
 helix-term/src/ui/document.rs | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/helix-term/src/ui/document.rs b/helix-term/src/ui/document.rs
index 66332410..56377d1e 100644
--- a/helix-term/src/ui/document.rs
+++ b/helix-term/src/ui/document.rs
@@ -207,16 +207,19 @@ pub fn render_text<'t>(
             it
         } else {
             let mut last_pos = formatter.visual_pos();
-            last_pos.col -= 1;
-            // check if any positions translated on the fly (like cursor) are at the EOF
-            translate_positions(
-                char_pos + 1,
-                first_visible_char_idx,
-                translated_positions,
-                text_fmt,
-                renderer,
-                last_pos,
-            );
+            if last_pos.row >= row_off {
+                last_pos.col -= 1;
+                last_pos.row -= row_off;
+                // check if any positions translated on the fly (like cursor) are at the EOF
+                translate_positions(
+                    char_pos + 1,
+                    first_visible_char_idx,
+                    translated_positions,
+                    text_fmt,
+                    renderer,
+                    last_pos,
+                );
+            }
             break;
         };
 

From e31943c4c4a996da1fe8704db052c7d44984fcc4 Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Fri, 3 Feb 2023 01:02:05 +0530
Subject: [PATCH 823/884] Tabulate buffer picker contents (#5777)

---
 helix-term/src/commands.rs | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 4f27fc80..d1e28bbe 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2430,20 +2430,15 @@ fn buffer_picker(cx: &mut Context) {
                 None => SCRATCH_BUFFER_NAME,
             };
 
-            let mut flags = Vec::new();
+            let mut flags = String::new();
             if self.is_modified {
-                flags.push("+");
+                flags.push('+');
             }
             if self.is_current {
-                flags.push("*");
+                flags.push('*');
             }
 
-            let flag = if flags.is_empty() {
-                "".into()
-            } else {
-                format!(" ({})", flags.join(""))
-            };
-            format!("{} {}{}", self.id, path, flag).into()
+            Row::new([self.id.to_string(), flags, path.to_string()])
         }
     }
 

From f0c2e898b49b2392d6d1ca02680e88b90e62017e Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Thu, 2 Feb 2023 20:48:16 +0100
Subject: [PATCH 824/884] add substring matching options to picker (#5114)

---
 helix-term/src/ui/fuzzy_match.rs | 237 ++++++++++++++++++++++++++-----
 helix-term/src/ui/picker.rs      |  17 ++-
 2 files changed, 212 insertions(+), 42 deletions(-)

diff --git a/helix-term/src/ui/fuzzy_match.rs b/helix-term/src/ui/fuzzy_match.rs
index e25d7328..e6a3f03a 100644
--- a/helix-term/src/ui/fuzzy_match.rs
+++ b/helix-term/src/ui/fuzzy_match.rs
@@ -4,41 +4,209 @@ use fuzzy_matcher::FuzzyMatcher;
 #[cfg(test)]
 mod test;
 
+struct QueryAtom {
+    kind: QueryAtomKind,
+    atom: String,
+    ignore_case: bool,
+    inverse: bool,
+}
+impl QueryAtom {
+    fn new(atom: &str) -> Option<QueryAtom> {
+        let mut atom = atom.to_string();
+        let inverse = atom.starts_with('!');
+        if inverse {
+            atom.remove(0);
+        }
+
+        let mut kind = match atom.chars().next() {
+            Some('^') => QueryAtomKind::Prefix,
+            Some('\'') => QueryAtomKind::Substring,
+            _ if inverse => QueryAtomKind::Substring,
+            _ => QueryAtomKind::Fuzzy,
+        };
+
+        if atom.starts_with(&['^', '\'']) {
+            atom.remove(0);
+        }
+
+        if atom.is_empty() {
+            return None;
+        }
+
+        if atom.ends_with('$') && !atom.ends_with("\\$") {
+            atom.pop();
+            kind = if kind == QueryAtomKind::Prefix {
+                QueryAtomKind::Exact
+            } else {
+                QueryAtomKind::Postfix
+            }
+        }
+
+        Some(QueryAtom {
+            kind,
+            atom: atom.replace('\\', ""),
+            // not ideal but fuzzy_matches only knows ascii uppercase so more consistent
+            // to behave the same
+            ignore_case: kind != QueryAtomKind::Fuzzy
+                && atom.chars().all(|c| c.is_ascii_lowercase()),
+            inverse,
+        })
+    }
+
+    fn indices(&self, matcher: &Matcher, item: &str, indices: &mut Vec<usize>) -> bool {
+        // for inverse there are no indicies to return
+        // just return whether we matched
+        if self.inverse {
+            return self.matches(matcher, item);
+        }
+        let buf;
+        let item = if self.ignore_case {
+            buf = item.to_ascii_lowercase();
+            &buf
+        } else {
+            item
+        };
+        let off = match self.kind {
+            QueryAtomKind::Fuzzy => {
+                if let Some((_, fuzzy_indices)) = matcher.fuzzy_indices(item, &self.atom) {
+                    indices.extend_from_slice(&fuzzy_indices);
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+            QueryAtomKind::Substring => {
+                if let Some(off) = item.find(&self.atom) {
+                    off
+                } else {
+                    return false;
+                }
+            }
+            QueryAtomKind::Prefix if item.starts_with(&self.atom) => 0,
+            QueryAtomKind::Postfix if item.ends_with(&self.atom) => item.len() - self.atom.len(),
+            QueryAtomKind::Exact if item == self.atom => 0,
+            _ => return false,
+        };
+
+        indices.extend(off..(off + self.atom.len()));
+        true
+    }
+
+    fn matches(&self, matcher: &Matcher, item: &str) -> bool {
+        let buf;
+        let item = if self.ignore_case {
+            buf = item.to_ascii_lowercase();
+            &buf
+        } else {
+            item
+        };
+        let mut res = match self.kind {
+            QueryAtomKind::Fuzzy => matcher.fuzzy_match(item, &self.atom).is_some(),
+            QueryAtomKind::Substring => item.contains(&self.atom),
+            QueryAtomKind::Prefix => item.starts_with(&self.atom),
+            QueryAtomKind::Postfix => item.ends_with(&self.atom),
+            QueryAtomKind::Exact => item == self.atom,
+        };
+        if self.inverse {
+            res = !res;
+        }
+        res
+    }
+}
+
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+enum QueryAtomKind {
+    /// Item is a fuzzy match of this behaviour
+    ///
+    /// Usage: `foo`
+    Fuzzy,
+    /// Item contains query atom as a continous substring
+    ///
+    /// Usage `'foo`
+    Substring,
+    /// Item starts with query atom
+    ///
+    /// Usage: `^foo`
+    Prefix,
+    /// Item ends with query atom
+    ///
+    /// Usage: `foo$`
+    Postfix,
+    /// Item is equal to query atom
+    ///
+    /// Usage `^foo$`
+    Exact,
+}
+
+#[derive(Default)]
 pub struct FuzzyQuery {
-    queries: Vec<String>,
+    first_fuzzy_atom: Option<String>,
+    query_atoms: Vec<QueryAtom>,
+}
+
+fn query_atoms(query: &str) -> impl Iterator<Item = &str> + '_ {
+    let mut saw_backslash = false;
+    query.split(move |c| {
+        saw_backslash = match c {
+            ' ' if !saw_backslash => return true,
+            '\\' => true,
+            _ => false,
+        };
+        false
+    })
 }
 
 impl FuzzyQuery {
+    pub fn refine(&self, query: &str, old_query: &str) -> (FuzzyQuery, bool) {
+        // TODO: we could be a lot smarter about this
+        let new_query = Self::new(query);
+        let mut is_refinement = query.starts_with(old_query);
+
+        // if the last atom is an inverse atom adding more text to it
+        // will actually increase the number of matches and we can not refine
+        // the matches.
+        if is_refinement && !self.query_atoms.is_empty() {
+            let last_idx = self.query_atoms.len() - 1;
+            if self.query_atoms[last_idx].inverse
+                && self.query_atoms[last_idx].atom != new_query.query_atoms[last_idx].atom
+            {
+                is_refinement = false;
+            }
+        }
+
+        (new_query, is_refinement)
+    }
+
     pub fn new(query: &str) -> FuzzyQuery {
-        let mut saw_backslash = false;
-        let queries = query
-            .split(|c| {
-                saw_backslash = match c {
-                    ' ' if !saw_backslash => return true,
-                    '\\' => true,
-                    _ => false,
-                };
-                false
-            })
-            .filter_map(|query| {
-                if query.is_empty() {
+        let mut first_fuzzy_query = None;
+        let query_atoms = query_atoms(query)
+            .filter_map(|atom| {
+                let atom = QueryAtom::new(atom)?;
+                if atom.kind == QueryAtomKind::Fuzzy && first_fuzzy_query.is_none() {
+                    first_fuzzy_query = Some(atom.atom);
                     None
                 } else {
-                    Some(query.replace("\\ ", " "))
+                    Some(atom)
                 }
             })
             .collect();
-        FuzzyQuery { queries }
+        FuzzyQuery {
+            first_fuzzy_atom: first_fuzzy_query,
+            query_atoms,
+        }
     }
 
     pub fn fuzzy_match(&self, item: &str, matcher: &Matcher) -> Option<i64> {
-        // use the rank of the first query for the rank, because merging ranks is not really possible
+        // use the rank of the first fuzzzy query for the rank, because merging ranks is not really possible
         // this behaviour matches fzf and skim
-        let score = matcher.fuzzy_match(item, self.queries.get(0)?)?;
+        let score = self
+            .first_fuzzy_atom
+            .as_ref()
+            .map_or(Some(0), |atom| matcher.fuzzy_match(item, atom))?;
         if self
-            .queries
+            .query_atoms
             .iter()
-            .any(|query| matcher.fuzzy_match(item, query).is_none())
+            .any(|atom| !atom.matches(matcher, item))
         {
             return None;
         }
@@ -46,29 +214,26 @@ impl FuzzyQuery {
     }
 
     pub fn fuzzy_indicies(&self, item: &str, matcher: &Matcher) -> Option<(i64, Vec<usize>)> {
-        if self.queries.len() == 1 {
-            return matcher.fuzzy_indices(item, &self.queries[0]);
-        }
-
-        // use the rank of the first query for the rank, because merging ranks is not really possible
-        // this behaviour matches fzf and skim
-        let (score, mut indicies) = matcher.fuzzy_indices(item, self.queries.get(0)?)?;
+        let (score, mut indices) = self.first_fuzzy_atom.as_ref().map_or_else(
+            || Some((0, Vec::new())),
+            |atom| matcher.fuzzy_indices(item, atom),
+        )?;
 
-        // fast path for the common case of not using a space
-        // during matching this branch should be free thanks to branch prediction
-        if self.queries.len() == 1 {
-            return Some((score, indicies));
+        // fast path for the common case of just a single atom
+        if self.query_atoms.is_empty() {
+            return Some((score, indices));
         }
 
-        for query in &self.queries[1..] {
-            let (_, matched_indicies) = matcher.fuzzy_indices(item, query)?;
-            indicies.extend_from_slice(&matched_indicies);
+        for atom in &self.query_atoms {
+            if !atom.indices(matcher, item, &mut indices) {
+                return None;
+            }
         }
 
         // deadup and remove duplicate matches
-        indicies.sort_unstable();
-        indicies.dedup();
+        indices.sort_unstable();
+        indices.dedup();
 
-        Some((score, indicies))
+        Some((score, indices))
     }
 }
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 5fa75136..5190fc53 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -407,7 +407,7 @@ pub struct Picker<T: Item> {
     cursor: usize,
     // pattern: String,
     prompt: Prompt,
-    previous_pattern: String,
+    previous_pattern: (String, FuzzyQuery),
     /// Whether to truncate the start (default true)
     pub truncate_start: bool,
     /// Whether to show the preview panel (default true)
@@ -458,7 +458,7 @@ impl<T: Item> Picker<T> {
             matches: Vec::new(),
             cursor: 0,
             prompt,
-            previous_pattern: String::new(),
+            previous_pattern: (String::new(), FuzzyQuery::default()),
             truncate_start: true,
             show_preview: true,
             callback_fn: Box::new(callback_fn),
@@ -485,10 +485,15 @@ impl<T: Item> Picker<T> {
     pub fn score(&mut self) {
         let pattern = self.prompt.line();
 
-        if pattern == &self.previous_pattern {
+        if pattern == &self.previous_pattern.0 {
             return;
         }
 
+        let (query, is_refined) = self
+            .previous_pattern
+            .1
+            .refine(pattern, &self.previous_pattern.0);
+
         if pattern.is_empty() {
             // Fast path for no pattern.
             self.matches.clear();
@@ -501,8 +506,7 @@ impl<T: Item> Picker<T> {
                         len: text.chars().count(),
                     }
                 }));
-        } else if pattern.starts_with(&self.previous_pattern) {
-            let query = FuzzyQuery::new(pattern);
+        } else if is_refined {
             // optimization: if the pattern is a more specific version of the previous one
             // then we can score the filtered set.
             self.matches.retain_mut(|pmatch| {
@@ -527,7 +531,8 @@ impl<T: Item> Picker<T> {
         // reset cursor position
         self.cursor = 0;
         let pattern = self.prompt.line();
-        self.previous_pattern.clone_from(pattern);
+        self.previous_pattern.0.clone_from(pattern);
+        self.previous_pattern.1 = query;
     }
 
     pub fn force_score(&mut self) {

From 61e1e6160afe2c6d0f1b9060112929957bba4e5f Mon Sep 17 00:00:00 2001
From: Dylan Bulfin <31492860+DylanBulfin@users.noreply.github.com>
Date: Thu, 2 Feb 2023 14:49:17 -0500
Subject: [PATCH 825/884] Removing C-j and C-k from completion menu navigation
 (#5070)

---
 helix-term/src/ui/menu.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index da00aa89..3ae00703 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -252,12 +252,12 @@ impl<T: Item + 'static> Component for Menu<T> {
                 return EventResult::Consumed(close_fn);
             }
             // arrow up/ctrl-p/shift-tab prev completion choice (including updating the doc)
-            shift!(Tab) | key!(Up) | ctrl!('p') | ctrl!('k') => {
+            shift!(Tab) | key!(Up) | ctrl!('p') => {
                 self.move_up();
                 (self.callback_fn)(cx.editor, self.selection(), MenuEvent::Update);
                 return EventResult::Consumed(None);
             }
-            key!(Tab) | key!(Down) | ctrl!('n') | ctrl!('j') => {
+            key!(Tab) | key!(Down) | ctrl!('n') => {
                 // arrow down/ctrl-n/tab advances completion choice (including updating the doc)
                 self.move_down();
                 (self.callback_fn)(cx.editor, self.selection(), MenuEvent::Update);

From 8ba0a4627439b944157c288f909517289d5aeb20 Mon Sep 17 00:00:00 2001
From: Filipe Azevedo <filipe@azevedo.io>
Date: Thu, 2 Feb 2023 19:51:11 +0000
Subject: [PATCH 826/884] add picker: current view dir (#4666)

---
 helix-term/src/commands.rs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index d1e28bbe..7d5f2241 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -276,6 +276,7 @@ impl MappableCommand {
         append_mode, "Append after selection",
         command_mode, "Enter command mode",
         file_picker, "Open file picker",
+        file_picker_in_current_buffer_directory, "Open file picker at current buffers's directory",
         file_picker_in_current_directory, "Open file picker at current working directory",
         code_action, "Perform code action",
         buffer_picker, "Open buffer picker",
@@ -2401,6 +2402,22 @@ fn file_picker(cx: &mut Context) {
     cx.push_layer(Box::new(overlayed(picker)));
 }
 
+fn file_picker_in_current_buffer_directory(cx: &mut Context) {
+    let doc_dir = doc!(cx.editor)
+        .path()
+        .and_then(|path| path.parent().map(|path| path.to_path_buf()));
+
+    let path = match doc_dir {
+        Some(path) => path,
+        None => {
+            cx.editor.set_error("current buffer has no path or parent");
+            return;
+        }
+    };
+
+    let picker = ui::file_picker(path, &cx.editor.config());
+    cx.push_layer(Box::new(overlayed(picker)));
+}
 fn file_picker_in_current_directory(cx: &mut Context) {
     let cwd = std::env::current_dir().unwrap_or_else(|_| PathBuf::from("./"));
     let picker = ui::file_picker(cwd, &cx.editor.config());

From 0e038fb80cd5f9bcdfd5fc057843cc1d79a7d7ea Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Fri, 21 Oct 2022 11:15:28 -0400
Subject: [PATCH 827/884] make clipboard message debug

---
 helix-view/src/clipboard.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helix-view/src/clipboard.rs b/helix-view/src/clipboard.rs
index 3c620c14..96c87d3f 100644
--- a/helix-view/src/clipboard.rs
+++ b/helix-view/src/clipboard.rs
@@ -41,7 +41,7 @@ macro_rules! command_provider {
      primary_paste => $pr_get_prg:literal $( , $pr_get_arg:literal )* ;
      primary_copy => $pr_set_prg:literal $( , $pr_set_arg:literal )* ;
     ) => {{
-        log::info!(
+        log::debug!(
             "Using {} to interact with the system and selection (primary) clipboard",
             if $set_prg != $get_prg { format!("{}+{}", $set_prg, $get_prg)} else { $set_prg.to_string() }
         );
@@ -381,7 +381,7 @@ mod provider {
 
     impl ClipboardProvider for WindowsProvider {
         fn name(&self) -> Cow<str> {
-            log::info!("Using clipboard-win to interact with the system clipboard");
+            log::debug!("Using clipboard-win to interact with the system clipboard");
             Cow::Borrowed("clipboard-win")
         }
 

From 06d095f31cb83cde1a59b672c222277a42f6c9b6 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Tue, 16 Aug 2022 10:58:13 -0400
Subject: [PATCH 828/884] provide option to completely disable lsp

---
 book/src/configuration.md |  1 +
 helix-view/src/editor.rs  | 33 +++++++++++++++++++++++++--------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 87585ece..7514a3d0 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -115,6 +115,7 @@ The following statusline elements can be configured:
 
 | Key                   | Description                                                 | Default |
 | ---                   | -----------                                                 | ------- |
+| `enable`              | Enables LSP integration. Setting to false will completely disable language servers regardless of language settings.| `true` |
 | `display-messages`    | Display LSP progress messages below statusline[^1]          | `false` |
 | `auto-signature-help` | Enable automatic popup of signature help (parameter hints)  | `true`  |
 | `display-signature-help-docs` | Display docs under signature help popup             | `true`  |
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index aabf9cde..042f5bdb 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -369,6 +369,8 @@ pub fn get_terminal_provider() -> Option<TerminalConfig> {
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(default, rename_all = "kebab-case", deny_unknown_fields)]
 pub struct LspConfig {
+    /// Enables LSP
+    pub enable: bool,
     /// Display LSP progress messages below statusline
     pub display_messages: bool,
     /// Enable automatic pop up of signature help (parameter hints)
@@ -380,6 +382,7 @@ pub struct LspConfig {
 impl Default for LspConfig {
     fn default() -> Self {
         Self {
+            enable: true,
             display_messages: false,
             auto_signature_help: true,
             display_signature_help_docs: true,
@@ -1077,18 +1080,25 @@ impl Editor {
 
     /// Refreshes the language server for a given document
     pub fn refresh_language_server(&mut self, doc_id: DocumentId) -> Option<()> {
-        let doc = self.documents.get_mut(&doc_id)?;
-        Self::launch_language_server(&mut self.language_servers, doc)
+        self.launch_language_server(doc_id)
     }
 
     /// Launch a language server for a given document
-    fn launch_language_server(ls: &mut helix_lsp::Registry, doc: &mut Document) -> Option<()> {
+    fn launch_language_server(&mut self, doc_id: DocumentId) -> Option<()> {
+        if !self.config().lsp.enable {
+            return None;
+        }
+
         // if doc doesn't have a URL it's a scratch buffer, ignore it
-        let doc_url = doc.url()?;
+        let (lang, path) = {
+            let doc = self.document(doc_id)?;
+            (doc.language.clone(), doc.path().cloned())
+        };
 
         // try to find a language server based on the language name
-        let language_server = doc.language.as_ref().and_then(|language| {
-            ls.get(language, doc.path())
+        let language_server = lang.as_ref().and_then(|language| {
+            self.language_servers
+                .get(language, path.as_ref())
                 .map_err(|e| {
                     log::error!(
                         "Failed to initialize the LSP for `{}` {{ {} }}",
@@ -1099,6 +1109,10 @@ impl Editor {
                 .ok()
                 .flatten()
         });
+
+        let doc = self.document_mut(doc_id)?;
+        let doc_url = doc.url()?;
+
         if let Some(language_server) = language_server {
             // only spawn a new lang server if the servers aren't the same
             if Some(language_server.id()) != doc.language_server().map(|server| server.id()) {
@@ -1288,11 +1302,14 @@ impl Editor {
                 self.config.clone(),
             )?;
 
-            let _ = Self::launch_language_server(&mut self.language_servers, &mut doc);
             if let Some(diff_base) = self.diff_providers.get_diff_base(&path) {
                 doc.set_diff_base(diff_base, self.redraw_handle.clone());
             }
-            self.new_document(doc)
+
+            let id = self.new_document(doc);
+            let _ = self.launch_language_server(id);
+
+            id
         };
 
         self.switch(id, action);

From a5233cf5ad3c4f8e95228314463cf41d744fac04 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Sat, 22 Oct 2022 20:51:55 -0400
Subject: [PATCH 829/884] disable lsp in integration tests

---
 helix-term/tests/test/auto_indent.rs |  2 +-
 helix-term/tests/test/helpers.rs     | 43 +++++++++++++---------------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/helix-term/tests/test/auto_indent.rs b/helix-term/tests/test/auto_indent.rs
index d5c220b7..2d908285 100644
--- a/helix-term/tests/test/auto_indent.rs
+++ b/helix-term/tests/test/auto_indent.rs
@@ -7,7 +7,7 @@ async fn auto_indent_c() -> anyhow::Result<()> {
             files: vec![(PathBuf::from("foo.c"), Position::default())],
             ..Default::default()
         },
-        Config::default(),
+        helpers::test_config(),
         helpers::test_syntax_conf(None),
         // switches to append mode?
         (
diff --git a/helix-term/tests/test/helpers.rs b/helix-term/tests/test/helpers.rs
index a0f3a32e..8755b60f 100644
--- a/helix-term/tests/test/helpers.rs
+++ b/helix-term/tests/test/helpers.rs
@@ -8,8 +8,8 @@ use std::{
 use anyhow::bail;
 use crossterm::event::{Event, KeyEvent};
 use helix_core::{diagnostic::Severity, test, Selection, Transaction};
-use helix_term::{application::Application, args::Args, config::Config};
-use helix_view::{doc, input::parse_macro, Editor};
+use helix_term::{application::Application, args::Args, config::Config, keymap::merge_keys};
+use helix_view::{doc, editor::LspConfig, input::parse_macro, Editor};
 use tempfile::NamedTempFile;
 use tokio_stream::wrappers::UnboundedReceiverStream;
 
@@ -118,7 +118,7 @@ pub async fn test_key_sequence_with_input_text<T: Into<TestCase>>(
     let test_case = test_case.into();
     let mut app = match app {
         Some(app) => app,
-        None => Application::new(Args::default(), Config::default(), test_syntax_conf(None))?,
+        None => Application::new(Args::default(), test_config(), test_syntax_conf(None))?,
     };
 
     let (view, doc) = helix_view::current!(app.editor);
@@ -143,27 +143,9 @@ pub async fn test_key_sequence_with_input_text<T: Into<TestCase>>(
 
 /// Generates language configs that merge in overrides, like a user language
 /// config. The argument string must be a raw TOML document.
-///
-/// By default, language server configuration is dropped from the languages.toml
-/// document. If a language-server is necessary for a test, it must be explicitly
-/// added in `overrides`.
 pub fn test_syntax_conf(overrides: Option<String>) -> helix_core::syntax::Configuration {
     let mut lang = helix_loader::config::default_lang_config();
 
-    for lang_config in lang
-        .as_table_mut()
-        .expect("Expected languages.toml to be a table")
-        .get_mut("language")
-        .expect("Expected languages.toml to have \"language\" keys")
-        .as_array_mut()
-        .expect("Expected an array of language configurations")
-    {
-        lang_config
-            .as_table_mut()
-            .expect("Expected language config to be a TOML table")
-            .remove("language-server");
-    }
-
     if let Some(overrides) = overrides {
         let override_toml = toml::from_str(&overrides).unwrap();
         lang = helix_loader::merge_toml_values(lang, override_toml, 3);
@@ -177,11 +159,12 @@ pub fn test_syntax_conf(overrides: Option<String>) -> helix_core::syntax::Config
 /// want to verify the resulting document and selection.
 pub async fn test_with_config<T: Into<TestCase>>(
     args: Args,
-    config: Config,
+    mut config: Config,
     syn_conf: helix_core::syntax::Configuration,
     test_case: T,
 ) -> anyhow::Result<()> {
     let test_case = test_case.into();
+    config = helix_term::keymap::merge_keys(config);
     let app = Application::new(args, config, syn_conf)?;
 
     test_key_sequence_with_input_text(
@@ -205,7 +188,7 @@ pub async fn test_with_config<T: Into<TestCase>>(
 pub async fn test<T: Into<TestCase>>(test_case: T) -> anyhow::Result<()> {
     test_with_config(
         Args::default(),
-        Config::default(),
+        test_config(),
         test_syntax_conf(None),
         test_case,
     )
@@ -226,6 +209,20 @@ pub fn temp_file_with_contents<S: AsRef<str>>(
     Ok(temp_file)
 }
 
+/// Generates a config with defaults more suitable for integration tests
+pub fn test_config() -> Config {
+    merge_keys(Config {
+        editor: helix_view::editor::Config {
+            lsp: LspConfig {
+                enable: false,
+                ..Default::default()
+            },
+            ..Default::default()
+        },
+        ..Default::default()
+    })
+}
+
 /// Replaces all LF chars with the system's appropriate line feed
 /// character, and if one doesn't exist already, appends the system's
 /// appropriate line ending to the end of a string.

From 350535208f134f1d8a6201833ad560905fea5abc Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Thu, 2 Feb 2023 20:56:52 +0100
Subject: [PATCH 830/884] always commit to history when pasting (#5790)

---
 helix-term/src/commands.rs       | 1 +
 helix-term/src/commands/typed.rs | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 7d5f2241..d1dc9223 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -3746,6 +3746,7 @@ fn paste_impl(
     }
 
     doc.apply(&transaction, view.id);
+    doc.append_changes_to_history(view);
 }
 
 pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index ec7100a6..f2495d8c 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -913,6 +913,7 @@ fn replace_selections_with_clipboard_impl(
     cx: &mut compositor::Context,
     clipboard_type: ClipboardType,
 ) -> anyhow::Result<()> {
+    let scrolloff = cx.editor.config().scrolloff;
     let (view, doc) = current!(cx.editor);
 
     match cx.editor.clipboard_provider.get_contents(clipboard_type) {
@@ -924,6 +925,7 @@ fn replace_selections_with_clipboard_impl(
 
             doc.apply(&transaction, view.id);
             doc.append_changes_to_history(view);
+            view.ensure_cursor_in_view(doc, scrolloff);
             Ok(())
         }
         Err(e) => Err(e.context("Couldn't get system clipboard contents")),
@@ -1570,6 +1572,7 @@ fn sort_impl(
     _args: &[Cow<str>],
     reverse: bool,
 ) -> anyhow::Result<()> {
+    let scrolloff = cx.editor.config().scrolloff;
     let (view, doc) = current!(cx.editor);
     let text = doc.text().slice(..);
 
@@ -1595,6 +1598,7 @@ fn sort_impl(
 
     doc.apply(&transaction, view.id);
     doc.append_changes_to_history(view);
+    view.ensure_cursor_in_view(doc, scrolloff);
 
     Ok(())
 }

From 10fee815c4d1ae952ef0863f3f75c3502e712edb Mon Sep 17 00:00:00 2001
From: Cemal Okten <60609268+cemalokten@users.noreply.github.com>
Date: Thu, 2 Feb 2023 22:42:15 +0000
Subject: [PATCH 831/884] Add Jellybeans theme (#5719)

---
 runtime/themes/jellybeans.toml | 138 +++++++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)
 create mode 100644 runtime/themes/jellybeans.toml

diff --git a/runtime/themes/jellybeans.toml b/runtime/themes/jellybeans.toml
new file mode 100644
index 00000000..592db9a9
--- /dev/null
+++ b/runtime/themes/jellybeans.toml
@@ -0,0 +1,138 @@
+#
+#    __       _ _       _                           
+#    \ \  ___| | |_   _| |__   ___  __ _ _ __  ___  
+#     \ \/ _ \ | | | | |  _ \ / _ \/ _  |  _ \/ __| 
+#  /\_/ /  __/ | | |_| | |_| |  __/ |_| | | | \__ \ 
+#  \___/ \___|_|_|\__  |____/ \___|\____|_| |_|___/ 
+#                 \___/                             
+#
+# Jellybeans
+# A take on the Jellybeans theme, please feel free to contribute! 
+#
+# Original author: @nanotech
+# Original repository: nanotech/jellybeans.vim
+# Contributors:
+# @cemalokten
+
+"attribute" = "green"
+"type" = "light_blue"
+"type.enum.variant" = "purple"
+"constructor" = "yellow"
+"constant" = "dark_orange"
+
+"constant.builtin.boolean" = "yellow"
+"constant.character" = "yellow"
+"constant.characted.escape" = "red_error"
+"constant.numeric" = "dark_orange"
+"string" = "dark_green"
+"string.regexp" = "light_purple"
+"string.special" = { fg = "yellow", modifiers = ["underlined"] }
+"comment" = "light_gray"
+
+"variable" = "light_yellow"
+"variable.builtin" = { fg = "dark_green", modifiers = ["underlined"] }
+"variable.parameter" = "yellow"
+"variable.other.member" = "light_purple"
+"label" = "yellow"
+"punctuation" = "mid_blue"
+"keyword" = "mid_blue"
+"keyword.control.exception" = "purple"
+"operator" = "light_purple"
+"function" = "yellow"
+"function.macro" = "green"
+"function.builtin" = "green"
+"function.special" = "green"
+"function.method" = "yellow"
+"tag" = "light_blue"
+"special" = "green"
+"namespace" = "light_purple"
+
+"markup.bold" = { fg = "white", modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.heading" = { fg = "mid_blue", modifiers = ["bold"] }
+"markup.list" = "dark_green"
+"markup.list.numbered" = "mid_blue"
+"markup.list.unnumbered" = "mid_blue"
+"markup.link.url" = { fg = "dark_green", modifiers = ['italic', 'underlined'] }
+"markup.link.text" = "mid_blue"
+"markup.link.label" = "purple"
+"markup.quote" = "dark_green"
+"markup.raw" = "dark_green"
+"markup.raw.inline" = "mid_blue"
+"markup.raw.block" = "dark_green"
+
+"diff.plus" = "diff_plus"
+"diff.minus" = "red_accent"
+"diff.delta" = "blue_accent"
+
+# ui specific
+"ui.background" = { bg = "background" }                                            # .separator
+"ui.cursor" = { bg = "background", modifiers = ["reversed"] }
+"ui.cursor.insert" = { bg = "light_yellow", fg = "background" }
+"ui.cursor.match" = { fg = "background", bg = "dark_orange" }
+"ui.cursorline" = { bg = "darker" }
+"ui.linenr" = "dark_gray"
+"ui.linenr.selected" = { fg = "light_yellow", bg = "darker" }
+"ui.statusline" = { fg = "light_yellow", bg = "darker" }
+"ui.statusline.inactive" = { fg = "dark", bg = "darker" }
+"ui.statusline.normal" = { fg = "light_yellow", bg = "darker" }
+"ui.statusline.insert" = { fg = "darker", bg = "purple" }
+"ui.statusline.select" = { fg = "selectionFG", bg = "selection" }
+"ui.popup" = { fg = "light_yellow", bg = "darkest" }
+"ui.window" = { fg = "dark", bg = "darkest" }
+"ui.help" = { fg = "light_yellow", bg = "darkest" }
+"ui.text" = "light_yellow"
+"ui.text.focus" = { fg = "white", bg = "dark_blue" }
+"ui.virtual" = "dark"
+"ui.virtual.ruler" = { bg = "darker" }
+"ui.menu" = { fg = "light_purple", bg = "darkest" }
+"ui.menu.selected" = { fg = "white", bg = "dark_blue" }
+"ui.selection" = { bg = "darker" }
+"ui.selection.primary" = { bg = "selection", fg = "selectionFG" }
+"hint" = "blue"
+"info" = "yellow_accent"
+"warning" = "orange_accent"
+"error" = "red_error"
+"diagnostic" = { modifiers = [] }
+"diagnostic.hint" = { underline = { color = "light_purple", style = "line" } }
+"diagnostic.info" = { underline = { color = "blue_accent", style = "line" } }
+"diagnostic.warning" = { underline = { color = "yellow_accent", style = "line" } }
+"diagnostic.error" = { underline = { color = "red_error", style = "line" } }
+
+[palette]
+background = "#151515"
+darkest = "#1e1e1e"
+darker = "#292929"
+dark = "#898989"
+white = "#ffffff"
+dark_gray = "#535353"
+light_gray = "#6d6d6d"
+
+purple = "#a390f0"
+light_purple = "#CDBEF0"
+
+blue = "#52a7f6"
+light_blue = "#8fbfdc"
+mid_blue = "#8197bf"
+dark_blue = "#204474"
+blue_accent = "#2197F3"
+
+green = "#99ad6a"
+dark_green = "#84A775"
+
+red = "#CC7C8A"
+red_error = "#902020"
+red_accent = "#F44747"
+
+orange = "#efb080"
+dark_orange = "#cf6a4c"
+orange_accent = "#EE7F25"
+
+yellow = "#fad07a"
+light_yellow = "#EBEBD8"
+yellow_accent = "#DEA407"
+
+diff_plus = "#5A9F81"
+selection = "#37232D"
+selectionFG = "#F2AAC7"

From 30412366be411335b7e2600e9b4178355c27da15 Mon Sep 17 00:00:00 2001
From: LeoniePhiline <22329650+LeoniePhiline@users.noreply.github.com>
Date: Thu, 2 Feb 2023 23:44:36 +0100
Subject: [PATCH 832/884] feat: Update `tree-sitter-sql` and migrate
 `highlights.scm` to match grammar (#5772)

* Sort buildin functions alphabetically

* fix: Query float type like other numeric types

* Update tree-sitter-sql and update highlights.scm to match grammar
---
 languages.toml                     |  2 +-
 runtime/queries/sql/highlights.scm | 69 ++++++++++++++++++++++++------
 2 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/languages.toml b/languages.toml
index 755f577f..09ba2a2a 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1434,7 +1434,7 @@ injection-regex = "sql"
 
 [[grammar]]
 name = "sql"
-source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "4fe05b2d81565ddb689d2f415e07afdacc515c52" }
+source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "286e10c5bc5d1703ee8f9afb351165a9a6182be1" }
 
 [[language]]
 name = "gdscript"
diff --git a/runtime/queries/sql/highlights.scm b/runtime/queries/sql/highlights.scm
index aad5ed31..a2d2f7fe 100644
--- a/runtime/queries/sql/highlights.scm
+++ b/runtime/queries/sql/highlights.scm
@@ -1,19 +1,20 @@
-(keyword_gist) @function.builtin
-(keyword_btree) @function.builtin
 (keyword_btree) @function.builtin
 (keyword_hash) @function.builtin
+(keyword_gist) @function.builtin
 (keyword_spgist) @function.builtin
 (keyword_gin) @function.builtin
 (keyword_brin) @function.builtin
-(keyword_float) @function.builtin
 
-(invocation
-  name: (identifier) @function.builtin
-  parameter: [(field)]? @variable.other.member)
+(cast
+  name: (identifier) @function.builtin)
   
 (count
-  name: (identifier) @function.builtin
-  parameter: [(field)]? @variable.other.member)
+  name: (identifier) @function.builtin)
+
+(keyword_group_concat) @function.builtin  
+
+(invocation
+  name: (identifier) @function.builtin)
   
 (table_reference
   name: (identifier) @namespace)
@@ -28,7 +29,6 @@
   table_alias: (identifier) @variable.parameter
   name: (identifier) @variable.other.member)
 
-
 (comment) @comment
 
 [
@@ -102,12 +102,16 @@
   (keyword_as)
   (keyword_distinct)
   (keyword_constraint)
+  ; (keyword_cast)
   ; (keyword_count)
+  ; (keyword_group_concat)
+  (keyword_separator)
   (keyword_max)
   (keyword_min)
   (keyword_avg)
   (keyword_end)
   (keyword_force)
+  (keyword_ignore)
   (keyword_using)
   (keyword_use)
   (keyword_index)
@@ -117,8 +121,6 @@
   (keyword_auto_increment)
   (keyword_default)
   (keyword_cascade)
-  (keyword_between)
-  (keyword_window)
   (keyword_with)
   (keyword_no)
   (keyword_data)
@@ -129,6 +131,7 @@
   (keyword_owner)
   (keyword_temp)
   (keyword_temporary)
+  (keyword_unlogged)
   (keyword_union)
   (keyword_all)
   (keyword_except)
@@ -138,8 +141,35 @@
   (keyword_commit)
   (keyword_rollback)
   (keyword_transaction)
-  (keyword_group_concat)
-  (keyword_separator)
+  (keyword_over)
+  (keyword_nulls)
+  (keyword_first)
+  (keyword_last)
+  (keyword_window)
+  (keyword_range)
+  (keyword_rows)
+  (keyword_groups)
+  (keyword_between)
+  (keyword_unbounded)
+  (keyword_preceding)
+  (keyword_following)
+  (keyword_exclude)
+  (keyword_current)
+  (keyword_row)
+  (keyword_ties)
+  (keyword_others)
+  (keyword_only)
+  (keyword_unique)
+  (keyword_concurrently)
+  ; (keyword_btree)
+  ; (keyword_hash)
+  ; (keyword_gist)
+  ; (keyword_spgist)
+  ; (keyword_gin)
+  ; (keyword_brin)
+  (keyword_like)
+  (keyword_similar)
+  (keyword_preserve)
 ] @keyword
 
 [
@@ -159,6 +189,7 @@
 
 [
   (keyword_boolean)
+
   (keyword_smallserial)
   (keyword_serial)
   (keyword_bigserial)
@@ -170,6 +201,7 @@
   (numeric)
   (keyword_real)
   (double)
+  (float)
 
   (keyword_money)
 
@@ -194,4 +226,15 @@
   (keyword_geography)
   (keyword_box2d)
   (keyword_box3d)
+
+  (char)
+  (varchar)
+  (numeric)
+
+  (keyword_oid)
+  (keyword_name)
+  (keyword_regclass)
+  (keyword_regnamespace)
+  (keyword_regproc)
+  (keyword_regtype)
 ] @type.builtin

From d8f482e11e2dec544ede636464cf6a87e32bd1f7 Mon Sep 17 00:00:00 2001
From: Brett Lyons <brettlyons@users.noreply.github.com>
Date: Fri, 3 Feb 2023 07:24:22 -0700
Subject: [PATCH 833/884] Add MSBuild language based on XML grammar (#5793)

---
 book/src/generated/lang-support.md     |  1 +
 languages.toml                         | 17 +++++++++++++++++
 runtime/queries/msbuild/highlights.scm |  1 +
 runtime/queries/msbuild/indents.scm    |  1 +
 runtime/queries/msbuild/injections.scm |  1 +
 5 files changed, 21 insertions(+)
 create mode 100644 runtime/queries/msbuild/highlights.scm
 create mode 100644 runtime/queries/msbuild/indents.scm
 create mode 100644 runtime/queries/msbuild/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 1711ec36..99fe82b3 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -83,6 +83,7 @@
 | mermaid | ✓ |  |  |  |
 | meson | ✓ |  | ✓ |  |
 | mint |  |  |  | `mint` |
+| msbuild | ✓ |  | ✓ |  |
 | nickel | ✓ |  | ✓ | `nls` |
 | nix | ✓ |  |  | `nil` |
 | nu | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 09ba2a2a..8520b12d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2117,3 +2117,20 @@ roots = []
 comment-token = "#"
 indent = { tab-width = 4, unit = "    " }
 grammar = "python"
+
+[[language]]
+name = "msbuild"
+scope = "source.msbuild"
+injection-regex = "msbuild"
+file-types = ["proj", "vbproj", "csproj", "fsproj", "targets", "props"]
+indent = { tab-width = 2, unit = "  " }
+roots = []
+grammar = "xml"
+
+[language.auto-pairs]
+'(' = ')'
+'{' = '}'
+'[' = ']'
+'"' = '"'
+"'" = "'"
+"<" = ">"
diff --git a/runtime/queries/msbuild/highlights.scm b/runtime/queries/msbuild/highlights.scm
new file mode 100644
index 00000000..27b10d95
--- /dev/null
+++ b/runtime/queries/msbuild/highlights.scm
@@ -0,0 +1 @@
+; inherits: xml
diff --git a/runtime/queries/msbuild/indents.scm b/runtime/queries/msbuild/indents.scm
new file mode 100644
index 00000000..27b10d95
--- /dev/null
+++ b/runtime/queries/msbuild/indents.scm
@@ -0,0 +1 @@
+; inherits: xml
diff --git a/runtime/queries/msbuild/injections.scm b/runtime/queries/msbuild/injections.scm
new file mode 100644
index 00000000..27b10d95
--- /dev/null
+++ b/runtime/queries/msbuild/injections.scm
@@ -0,0 +1 @@
+; inherits: xml

From f7bd7b5eafac9f016a470cc77c780922f83e690b Mon Sep 17 00:00:00 2001
From: William Etheredge <me@wetheredge.com>
Date: Fri, 3 Feb 2023 08:24:46 -0600
Subject: [PATCH 834/884] Add :character-info command (#4000)

---
 book/src/generated/typable-cmd.md |   1 +
 helix-term/src/commands/typed.rs  | 133 ++++++++++++++++++++++++++++++
 helix-term/tests/test/commands.rs |  58 +++++++++++++
 3 files changed, 192 insertions(+)

diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index 66e6ac03..0ff501a3 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -43,6 +43,7 @@
 | `:change-current-directory`, `:cd` | Change the current working directory. |
 | `:show-directory`, `:pwd` | Show the current working directory. |
 | `:encoding` | Set encoding. Based on `https://encoding.spec.whatwg.org`. |
+| `:character-info`, `:char` | Get info about the character under the primary cursor. |
 | `:reload` | Discard changes and reload from the source file. |
 | `:reload-all` | Discard changes and reload all documents from the source files. |
 | `:update` | Write changes only if the file has been modified. |
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index f2495d8c..1fd11b65 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -4,6 +4,7 @@ use crate::job::Job;
 
 use super::*;
 
+use helix_core::encoding;
 use helix_view::editor::{Action, CloseError, ConfigEvent};
 use ui::completers::{self, Completer};
 
@@ -1033,6 +1034,131 @@ fn set_encoding(
     }
 }
 
+/// Shows info about the character under the primary cursor.
+fn get_character_info(
+    cx: &mut compositor::Context,
+    _args: &[Cow<str>],
+    event: PromptEvent,
+) -> anyhow::Result<()> {
+    if event != PromptEvent::Validate {
+        return Ok(());
+    }
+
+    let (view, doc) = current_ref!(cx.editor);
+    let text = doc.text().slice(..);
+
+    let grapheme_start = doc.selection(view.id).primary().cursor(text);
+    let grapheme_end = graphemes::next_grapheme_boundary(text, grapheme_start);
+
+    if grapheme_start == grapheme_end {
+        return Ok(());
+    }
+
+    let grapheme = text.slice(grapheme_start..grapheme_end).to_string();
+    let encoding = doc.encoding();
+
+    let printable = grapheme.chars().fold(String::new(), |mut s, c| {
+        match c {
+            '\0' => s.push_str("\\0"),
+            '\t' => s.push_str("\\t"),
+            '\n' => s.push_str("\\n"),
+            '\r' => s.push_str("\\r"),
+            _ => s.push(c),
+        }
+
+        s
+    });
+
+    // Convert to Unicode codepoints if in UTF-8
+    let unicode = if encoding == encoding::UTF_8 {
+        let mut unicode = " (".to_owned();
+
+        for (i, char) in grapheme.chars().enumerate() {
+            if i != 0 {
+                unicode.push(' ');
+            }
+
+            unicode.push_str("U+");
+
+            let codepoint: u32 = if char.is_ascii() {
+                char.into()
+            } else {
+                // Not ascii means it will be multi-byte, so strip out the extra
+                // bits that encode the length & mark continuation bytes
+
+                let s = String::from(char);
+                let bytes = s.as_bytes();
+
+                // First byte starts with 2-4 ones then a zero, so strip those off
+                let first = bytes[0];
+                let codepoint = first & (0xFF >> (first.leading_ones() + 1));
+                let mut codepoint = u32::from(codepoint);
+
+                // Following bytes start with 10
+                for byte in bytes.iter().skip(1) {
+                    codepoint <<= 6;
+                    codepoint += u32::from(*byte) & 0x3F;
+                }
+
+                codepoint
+            };
+
+            unicode.push_str(&format!("{codepoint:0>4x}"));
+        }
+
+        unicode.push(')');
+        unicode
+    } else {
+        String::new()
+    };
+
+    // Give the decimal value for ascii characters
+    let dec = if encoding.is_ascii_compatible() && grapheme.len() == 1 {
+        format!(" Dec {}", grapheme.as_bytes()[0])
+    } else {
+        String::new()
+    };
+
+    let hex = {
+        let mut encoder = encoding.new_encoder();
+        let max_encoded_len = encoder
+            .max_buffer_length_from_utf8_without_replacement(grapheme.len())
+            .unwrap();
+        let mut bytes = Vec::with_capacity(max_encoded_len);
+        let mut current_byte = 0;
+        let mut hex = String::new();
+
+        for (i, char) in grapheme.chars().enumerate() {
+            if i != 0 {
+                hex.push_str(" +");
+            }
+
+            let (result, _input_bytes_read) = encoder.encode_from_utf8_to_vec_without_replacement(
+                &char.to_string(),
+                &mut bytes,
+                true,
+            );
+
+            if let encoding::EncoderResult::Unmappable(char) = result {
+                bail!("{char:?} cannot be mapped to {}", encoding.name());
+            }
+
+            for byte in &bytes[current_byte..] {
+                hex.push_str(&format!(" {byte:0>2x}"));
+            }
+
+            current_byte = bytes.len();
+        }
+
+        hex
+    };
+
+    cx.editor
+        .set_status(format!("\"{printable}\"{unicode}{dec} Hex{hex}"));
+
+    Ok(())
+}
+
 /// Reload the [`Document`] from its source file.
 fn reload(
     cx: &mut compositor::Context,
@@ -2131,6 +2257,13 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
             fun: set_encoding,
             completer: None,
         },
+        TypableCommand {
+            name: "character-info",
+            aliases: &["char"],
+            doc: "Get info about the character under the primary cursor.",
+            fun: get_character_info,
+            completer: None,
+        },
         TypableCommand {
             name: "reload",
             aliases: &[],
diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index 6e7275f5..da2e020e 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -354,3 +354,61 @@ async fn test_extend_line() -> anyhow::Result<()> {
 
     Ok(())
 }
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_character_info() -> anyhow::Result<()> {
+    // UTF-8, single byte
+    test_key_sequence(
+        &mut helpers::AppBuilder::new().build()?,
+        Some("ih<esc>h:char<ret>"),
+        Some(&|app| {
+            assert_eq!(
+                r#""h" (U+0068) Dec 104 Hex 68"#,
+                app.editor.get_status().unwrap().0
+            );
+        }),
+        false,
+    )
+    .await?;
+
+    // UTF-8, multi-byte
+    test_key_sequence(
+        &mut helpers::AppBuilder::new().build()?,
+        Some("ië<esc>h:char<ret>"),
+        Some(&|app| {
+            assert_eq!(
+                r#""ë" (U+0065 U+0308) Hex 65 + cc 88"#,
+                app.editor.get_status().unwrap().0
+            );
+        }),
+        false,
+    )
+    .await?;
+
+    // Multiple characters displayed as one, escaped characters
+    test_key_sequence(
+        &mut helpers::AppBuilder::new().build()?,
+        Some(":line<minus>ending crlf<ret>:char<ret>"),
+        Some(&|app| {
+            assert_eq!(
+                r#""\r\n" (U+000d U+000a) Hex 0d + 0a"#,
+                app.editor.get_status().unwrap().0
+            );
+        }),
+        false,
+    )
+    .await?;
+
+    // Non-UTF-8
+    test_key_sequence(
+        &mut helpers::AppBuilder::new().build()?,
+        Some(":encoding ascii<ret>ih<esc>h:char<ret>"),
+        Some(&|app| {
+            assert_eq!(r#""h" Dec 104 Hex 68"#, app.editor.get_status().unwrap().0);
+        }),
+        false,
+    )
+    .await?;
+
+    Ok(())
+}

From 7b46a6cadaf4abf1ab0814a5195cc8352574385c Mon Sep 17 00:00:00 2001
From: Aleksey Kuznetsov <zummenix@gmail.com>
Date: Sat, 4 Feb 2023 00:46:57 +0500
Subject: [PATCH 835/884] Add Podfile and *.podspec to the file types for ruby
 (#5811)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 8520b12d..c82bc155 100644
--- a/languages.toml
+++ b/languages.toml
@@ -519,7 +519,7 @@ source = { git = "https://github.com/cstrahan/tree-sitter-nix", rev = "6b71a810c
 name = "ruby"
 scope = "source.ruby"
 injection-regex = "ruby"
-file-types = ["rb", "rake", "rakefile", "irb", "gemfile", "gemspec", "Rakefile", "Gemfile", "rabl", "jbuilder", "jb"]
+file-types = ["rb", "rake", "rakefile", "irb", "gemfile", "gemspec", "Rakefile", "Gemfile", "rabl", "jbuilder", "jb", "Podfile", "podspec"]
 shebangs = ["ruby"]
 roots = []
 comment-token = "#"

From d6e2434f735545ded269f228e3d93684d2be262a Mon Sep 17 00:00:00 2001
From: Alex <3957610+CptPotato@users.noreply.github.com>
Date: Sat, 4 Feb 2023 17:33:53 +0100
Subject: [PATCH 836/884] Add `ui.virtual.wrap` to theme docs (#5823)

---
 book/src/themes.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/book/src/themes.md b/book/src/themes.md
index 0d0827fd..9b7e97a1 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -270,7 +270,7 @@ These scopes are used for theming the editor interface.
 | `ui.statusline.insert`      | Statusline mode during insert mode ([only if `editor.color-modes` is enabled][editor-section]) |
 | `ui.statusline.select`      | Statusline mode during select mode ([only if `editor.color-modes` is enabled][editor-section]) |
 | `ui.statusline.separator`   | Separator character in statusline                                                              |
-| `ui.popup`                  | Documentation popups (e.g Space + k)                                                             |
+| `ui.popup`                  | Documentation popups (e.g Space + k)                                                           |
 | `ui.popup.info`             | Prompt for multiple key options                                                                |
 | `ui.window`                 | Border lines separating splits                                                                 |
 | `ui.help`                   | Description box for commands                                                                   |
@@ -279,8 +279,9 @@ These scopes are used for theming the editor interface.
 | `ui.text.inactive`          | Same as `ui.text` but when the text is inactive (e.g. suggestions)                             |
 | `ui.text.info`              | The key: command text in `ui.popup.info` boxes                                                 |
 | `ui.virtual.ruler`          | Ruler columns (see the [`editor.rulers` config][editor-section])                               |
-| `ui.virtual.whitespace`     | Visible whitespace characters                                                                 |
+| `ui.virtual.whitespace`     | Visible whitespace characters                                                                  |
 | `ui.virtual.indent-guide`   | Vertical indent width guides                                                                   |
+| `ui.virtual.wrap`           | Soft-wrap indicator (see the [`editor.soft-wrap` config][editor-section])                      |
 | `ui.menu`                   | Code and command completion menus                                                              |
 | `ui.menu.selected`          | Selected autocomplete item                                                                     |
 | `ui.menu.scroll`            | `fg` sets thumb color, `bg` sets track color of scrollbar                                      |

From b2e83f81e10089a0e81ce33c4beb51aefc29a62e Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Sat, 4 Feb 2023 16:20:23 -0500
Subject: [PATCH 837/884] enable rendering in integration tests (#5819)

This will allow testing more of the code base, as well as enable UI-
specific testing.

Debug mode builds are prohibitively slow for the tests, mostly
because of the concurrency write tests. So there is now a profile for
integration tests that sets the optimization level to 2 for a few helix
crates, and lowers the number of rounds of concurrent writes to 1000.
---
 .cargo/config.toml             | 2 +-
 Cargo.toml                     | 6 ++++++
 helix-term/src/application.rs  | 4 ----
 helix-term/tests/test/write.rs | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 5d615566..b016eca3 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,3 +1,3 @@
 [alias]
 xtask = "run --package xtask --"
-integration-test = "test --features integration --workspace --test integration"
+integration-test = "test --features integration --profile integration --workspace --test integration"
diff --git a/Cargo.toml b/Cargo.toml
index ecf6848e..c7e25472 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,3 +25,9 @@ lto = "fat"
 codegen-units = 1
 # strip = "debuginfo" # TODO: or strip = true
 opt-level = 3
+
+[profile.integration]
+inherits = "test"
+package.helix-core.opt-level = 2
+package.helix-tui.opt-level = 2
+package.helix-term.opt-level = 2
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 05ceb874..a1685fcf 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -277,10 +277,6 @@ impl Application {
         Ok(app)
     }
 
-    #[cfg(feature = "integration")]
-    async fn render(&mut self) {}
-
-    #[cfg(not(feature = "integration"))]
     async fn render(&mut self) {
         let mut cx = crate::compositor::Context {
             editor: &mut self.editor,
diff --git a/helix-term/tests/test/write.rs b/helix-term/tests/test/write.rs
index d0128edc..bbf14fc2 100644
--- a/helix-term/tests/test/write.rs
+++ b/helix-term/tests/test/write.rs
@@ -70,7 +70,7 @@ async fn test_write_quit() -> anyhow::Result<()> {
 async fn test_write_concurrent() -> anyhow::Result<()> {
     let mut file = tempfile::NamedTempFile::new()?;
     let mut command = String::new();
-    const RANGE: RangeInclusive<i32> = 1..=5000;
+    const RANGE: RangeInclusive<i32> = 1..=1000;
     let mut app = helpers::AppBuilder::new()
         .with_file(file.path(), None)
         .build()?;

From 0eba0db4a012e9961cf0c5dddf0a4b73f95431b2 Mon Sep 17 00:00:00 2001
From: Jaeho Choi <choijaeho@gmail.com>
Date: Mon, 6 Feb 2023 04:31:20 +0900
Subject: [PATCH 838/884] docs: Fix PowerShell runtime linking command (#5822)

---
 README.md           | 3 ++-
 book/src/install.md | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 60125e11..a2667321 100644
--- a/README.md
+++ b/README.md
@@ -72,8 +72,9 @@ elevated privileges - i.e. PowerShell or Cmd must be run as administrator.
 **PowerShell:**
 
 ```powershell
-New-Item -ItemType SymbolicLink -Target "runtime" -Path "$Env:AppData\helix\runtime"
+New-Item -ItemType Junction -Target "runtime" -Path "$Env:AppData\helix\runtime"
 ```
+Note: "runtime" must be absolute path to the runtime directory.
 
 **Cmd:**
 
diff --git a/book/src/install.md b/book/src/install.md
index 792799d7..7df9e6c7 100644
--- a/book/src/install.md
+++ b/book/src/install.md
@@ -123,8 +123,9 @@ elevated privileges - i.e. PowerShell or Cmd must be run as administrator.
 **PowerShell:**
 
 ```powershell
-New-Item -ItemType SymbolicLink -Target "runtime" -Path "$Env:AppData\helix\runtime"
+New-Item -ItemType Junction -Target "runtime" -Path "$Env:AppData\helix\runtime"
 ```
+Note: "runtime" must be the absolute path to the runtime directory.
 
 **Cmd:**
 

From 9c98043c1cd6a8b92f35214007a90bb0f287beda Mon Sep 17 00:00:00 2001
From: Ethan Budd <budde25@protonmail.com>
Date: Sun, 5 Feb 2023 16:02:36 -0600
Subject: [PATCH 839/884] Recognize .C and .H file types as cpp (#5808)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index c82bc155..5cde4167 100644
--- a/languages.toml
+++ b/languages.toml
@@ -190,7 +190,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-c", rev = "7175a6dd
 name = "cpp"
 scope = "source.cpp"
 injection-regex = "cpp"
-file-types = ["cc", "hh", "c++", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino"]
+file-types = ["cc", "hh", "c++", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino", "C", "H"]
 roots = []
 comment-token = "//"
 language-server = { command = "clangd" }

From 093b37d7e73e137869984f8b062989755bd1e2a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Feb 2023 17:42:45 -0600
Subject: [PATCH 840/884] build(deps): bump cachix/install-nix-action from 18
 to 19 (#5855)

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 18 to 19.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v18...v19)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cachix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
index 20035678..bcdea319 100644
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@@ -14,7 +14,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Install nix
-      uses: cachix/install-nix-action@v18
+      uses: cachix/install-nix-action@v19
 
     - name: Authenticate with Cachix
       uses: cachix/cachix-action@v12

From b97462ea9b77a0cb4b174de3202c12b5d33886cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Feb 2023 17:43:08 -0600
Subject: [PATCH 841/884] build(deps): bump unicode-segmentation from 1.10.0 to
 1.10.1 (#5856)

Bumps [unicode-segmentation](https://github.com/unicode-rs/unicode-segmentation) from 1.10.0 to 1.10.1.
- [Release notes](https://github.com/unicode-rs/unicode-segmentation/releases)
- [Commits](https://github.com/unicode-rs/unicode-segmentation/compare/v1.10.0...v1.10.1)

---
updated-dependencies:
- dependency-name: unicode-segmentation
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 066af528..0f1d9b48 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2288,9 +2288,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
 
 [[package]]
 name = "unicode-width"

From f3f8660d363f385c54f0afa9199be993ce50ab57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Feb 2023 17:43:28 -0600
Subject: [PATCH 842/884] build(deps): bump serde_json from 1.0.91 to 1.0.92
 (#5857)

Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.91 to 1.0.92.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.91...v1.0.92)

---
updated-dependencies:
- dependency-name: serde_json
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0f1d9b48..905fc1b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1866,9 +1866,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.91"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
+checksum = "7434af0dc1cbd59268aa98b4c22c131c0584d2232f6fb166efb993e2832e896a"
 dependencies = [
  "itoa",
  "ryu",

From 9b69f5010d24b0f39c57f6d79e424601e7e2bfea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Feb 2023 17:43:48 -0600
Subject: [PATCH 843/884] build(deps): bump anyhow from 1.0.68 to 1.0.69
 (#5858)

Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.68 to 1.0.69.
- [Release notes](https://github.com/dtolnay/anyhow/releases)
- [Commits](https://github.com/dtolnay/anyhow/compare/1.0.68...1.0.69)

---
updated-dependencies:
- dependency-name: anyhow
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 905fc1b6..7f59ca1d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -51,9 +51,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.68"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
+checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
 
 [[package]]
 name = "arc-swap"

From 7f6a91fd63254ba735e7070652c3170be070a37c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Feb 2023 17:44:26 -0600
Subject: [PATCH 844/884] build(deps): bump ropey from 1.5.1 to 1.6.0 (#5859)

Bumps [ropey](https://github.com/cessen/ropey) from 1.5.1 to 1.6.0.
- [Release notes](https://github.com/cessen/ropey/releases)
- [Changelog](https://github.com/cessen/ropey/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cessen/ropey/compare/v1.5.1...v1.6.0)

---
updated-dependencies:
- dependency-name: ropey
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock            | 4 ++--
 helix-core/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7f59ca1d..1a76beed 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1803,9 +1803,9 @@ dependencies = [
 
 [[package]]
 name = "ropey"
-version = "1.5.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4f832915525613e83f275694cb8c184f5df13ca26a9ef0ea6ce736921964c8e"
+checksum = "53ce7a2c43a32e50d666e33c5a80251b31147bb4b49024bcab11fb6f20c671ed"
 dependencies = [
  "smallvec",
  "str_indices",
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
index 10de738f..62ec87b4 100644
--- a/helix-core/Cargo.toml
+++ b/helix-core/Cargo.toml
@@ -17,7 +17,7 @@ integration = []
 [dependencies]
 helix-loader = { version = "0.6", path = "../helix-loader" }
 
-ropey = { version = "1.5.1", default-features = false, features = ["simd"] }
+ropey = { version = "1.6.0", default-features = false, features = ["simd"] }
 smallvec = "1.10"
 smartstring = "1.0.1"
 unicode-segmentation = "1.10"

From fb149133db1269f14bc37ef8583fc762e7f19781 Mon Sep 17 00:00:00 2001
From: Kirawi <67773714+kirawi@users.noreply.github.com>
Date: Mon, 6 Feb 2023 18:47:51 -0500
Subject: [PATCH 845/884] Make `fleet-dark` accurate to the official theme
 (#5605)

---
 runtime/themes/fleet_dark.toml | 251 +++++++++++++++++++--------------
 1 file changed, 142 insertions(+), 109 deletions(-)

diff --git a/runtime/themes/fleet_dark.toml b/runtime/themes/fleet_dark.toml
index 0fc9e812..83caf8f3 100644
--- a/runtime/themes/fleet_dark.toml
+++ b/runtime/themes/fleet_dark.toml
@@ -4,128 +4,161 @@
 # Original author: @krfl
 # Contributors:
 # @matoous
+# @kirawi
 
-"attribute" = "green"
-"type" = "light_blue"
-"type.enum.variant" = "purple"
-"constructor" = "yellow"
-"constant" = "cyan"
+"attribute" = "Lime"
+
+"type" = "Blue"
+"type.return" = "Blue Light"
+"type.parameter" = "Blue Light"
+"constructor" = "Yellow"
+
+"constant" = "Violet"
 # "constant.builtin" = {} # .boolean
-"constant.builtin.boolean" = "yellow"
-"constant.character" = "yellow"
-"constant.characted.escape" = "light"
-"constant.numeric" = "yellow"
-"string" = "pink"
-"string.regexp" = "light"
-"string.special" = { fg = "yellow", modifiers = ["underlined"] } #.path / .url / .symbol
-"comment" = "light_gray" # .line
+"constant.builtin.boolean" = "Cyan"
+"constant.character" = "Yellow"
+"constant.character.escape" = "Cyan"
+"constant.numeric" = "Yellow"
+"string" = "Pink"
+"string.regexp" = "Cyan"
+"string.special" = { fg = "Yellow", modifiers = ["underlined"] } #.path / .url / .symbol
+
+"comment" = "Gray 90" # .line
 # "comment.block" = {} # .documentation
-"variable" = "light" # .builtin
-"variable.builtin" = { fg = "red", modifiers = ["underlined"] }
-"variable.parameter" = "light"
+"variable" = "Gray 120" # .builtin
+"variable.builtin" = { fg = "Coral" }
 # "variable.other" = {} # .member
-"variable.other.member" = "purple"
-"label" = "yellow"
-"punctuation" = "light" # .delimiter / .bracket
-"keyword" = "cyan" # .operator / .directive / .function
-# "keyword.control" = "cyan" # .conditional / .repeat / .import / .return / .exception
-"keyword.control.exception" = "purple"
-"operator" = "light"
-"function" = "yellow"
-"function.macro" = "green"
-"function.builtin" = "green"
-"function.special" = "green"
-"function.method" = "light"
+"variable.other.member" = "Violet"
+"label" = "Yellow"
+"keyword" = "Cyan" # .operator / .directive / .function
+"function" = "Yellow"
+"function.declaration" = "#EFEFEF"
+"function.macro" = "Lime"
+"function.builtin" = "Lime"
+"function.special" = "Lime"
 #"function.declaration.method" = { fg = "lightest", modifiers = ["bold"] } #depends on #4892
-"tag" = "light_blue"
-"special" = "green"
-"namespace" = "light"
+"tag" = "Blue"
+"special" = "Lime"
+"namespace" = "Blue"
 
 # used in theming
 # "markup" = {} # .normal / .quote / .raw
 # "markup.normal" = {} # .completion / .hover
-"markup.bold" = { fg = "lightest", modifiers = ["bold"] }
+"markup.bold" = {  modifiers = ["bold"] }
 "markup.italic" = { modifiers = ["italic"] }
 "markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.heading" = { fg = "cyan", modifiers = ["bold"] } # .marker / .1 / .2 / .3 / .4 / .5 / .6
-"markup.list" = "pink" # .unnumbered / .numbered
-"markup.list.numbered" = "cyan"
-"markup.list.unnumbered" = "cyan"
+"markup.heading" = { fg = "Cyan", modifiers = ["bold"] } # .marker / .1 / .2 / .3 / .4 / .5 / .6
+"markup.list" = "Pink" # .unnumbered / .numbered
+"markup.list.numbered" = "Cyan"
+"markup.list.unnumbered" = "Cyan"
 # "markup.link" = "green"
-"markup.link.url" = { fg = "pink", modifiers = ['italic', 'underlined'] }
-"markup.link.text" = "cyan"
-"markup.link.label" = "purple"
-"markup.quote" = "pink"
-"markup.raw" = "pink"
-"markup.raw.inline" = "cyan" # .completion / .hover
-"markup.raw.block" = "pink"
-
-"diff.plus" = "diff_plus"
-"diff.minus" = "red_accent"
-"diff.delta" = "blue_accent"
+"markup.link.url" = { fg = "Pink", modifiers = ['italic', 'underlined'] }
+"markup.link.text" = "Cyan"
+"markup.link.label" = "Purple 20"
+"markup.quote" = "Pink"
+"markup.raw" = "Pink"
+"markup.raw.inline" = "Cyan" # .completion / .hover
+"markup.raw.block" = "#EB83E2"
+
+"diff.plus" = "Green 50"
+"diff.minus" = "Red 50"
+"diff.delta" = "Blue 80"
 
 # ui specific
-"ui.background" = { bg = "background" } # .separator
-"ui.cursor" = { bg = "dark_gray", modifiers = ["reversed"] } # .insert / .select / .match / .primary
-"ui.cursor.match" = { fg = "light", bg = "selection" } # .insert / .select / .match / .primary
-"ui.cursorline" = { bg = "darker" }
-"ui.linenr" = "dark_gray"
-"ui.linenr.selected" = { fg = "light", bg = "darker" }
-"ui.statusline" = { fg = "light", bg = "darker" } # .inactive / .normal / .insert / .select
-"ui.statusline.inactive" = { fg = "dark", bg = "darker" }
-"ui.statusline.normal" = { fg = "lightest", bg = "darker"}
-"ui.statusline.insert" = { fg = "lightest", bg = "blue_accent" }
-"ui.statusline.select" = { fg = "lightest", bg = "orange_accent" }
-"ui.popup" = { fg = "light", bg = "darkest" } # .info
-"ui.window" = { fg = "dark", bg = "darkest" }
-"ui.help" = { fg = "light", bg = "darkest" }
-"ui.text" = "light" # .focus / .info
-"ui.text.focus" = { fg = "lightest", bg = "focus" }
-"ui.virtual" = "dark" # .whitespace
-"ui.virtual.ruler" = { bg = "darker"}
-"ui.menu" = { fg = "light", bg = "darkest" } # .selected
-"ui.menu.selected" = { fg = "lightest", bg = "focus" } # .selected
-"ui.selection" = { bg = "darker" } # .primary
-"ui.selection.primary" = { bg = "selection" }
-"hint" = "blue"
-"info" = "yellow_accent"
-"warning" = "orange_accent"
-"error" = "red_error"
-"diagnostic" = { modifiers = [] }
-"diagnostic.hint" = { underline = { color = "light", style = "curl" } }
-"diagnostic.info" = { underline = { color = "blue_accent", style = "curl" } }
-"diagnostic.warning" = { underline = { color = "yellow_accent", style = "curl" } }
-"diagnostic.error" = { underline = { color = "red_error", style = "curl" } }
+"ui.background" = { bg = "Gray 10" } # .separator
+"ui.statusline" = { fg = "Gray 120", bg = "Gray 10" } # .inactive / .normal / .insert / .select
+# "ui.statusline.normal" = { fg = "lightest", bg = "darker"}
+# "ui.statusline.insert" = { fg = "lightest", bg = "blue_accent" }
+# "ui.statusline.select" = { fg = "lightest", bg = "orange_accent" }
+
+"ui.cursor" = { modifiers = ["reversed"] } # .insert / .select / .match / .primary
+"ui.cursor.match" = { bg = "Blue 30" } # .insert / .select / .match / .primary
+"ui.selection" = { bg = "Gray 50" } # .primary
+"ui.selection.primary" = { bg = "Blue 40" }
+
+"ui.cursorline" = { bg = "Gray 20" }
+"ui.linenr" = "Gray 70"
+"ui.linenr.selected" = "Gray 110"
+
+"ui.popup" = { fg = "Gray 120", bg = "Gray 20" } # .info
+"ui.window" = { fg = "Gray 50" }
+"ui.help" = { fg = "Gray 120", bg = "Gray 20" }
+"ui.menu" = { fg = "Gray 120", bg = "Gray 20" } # .selected
+"ui.menu.selected" = { fg = "White", bg = "Blue 40" } # .selected
+# Calculated as #ffffff with 30% opacity
+"ui.menu.scroll" = { fg = "#dfdfdf" }
+
+"ui.text" = "Gray 120" # .focus / .info
+"ui.text.focus" = { fg = "White", bg = "Blue 40" }
+
+"ui.virtual" = "Gray 80" # .whitespace
+# "ui.virtual.ruler" = { bg = "darker"}
+
+"hint" = "Gray 80"
+"info" = "#A366C4"
+"warning" = "#FACb66"
+"error" = "#FF5269"
+
+"diagnostic.hint" = { underline = { color = "Gray 80", style = "line" } }
+"diagnostic.info" = { underline = { color = "#A366C4", style = "line" } }
+"diagnostic.warning" = { underline = { color = "#FACB66", style = "line" } }
+"diagnostic.error" = { underline = { color = "#FF5269", style = "line" } }
 
 [palette]
-background = "#181818"
-darkest = "#1e1e1e"
-darker = "#292929"
-dark = "#898989"
-
-light = "#d6d6dd"
-lightest = "#ffffff"
-
-dark_gray = "#535353"
-light_gray = "#6d6d6d"
-purple = "#a390f0"
-light_blue = "#7dbeff"
-blue = "#52a7f6"
-pink = "#d898d8"
-green = "#afcb85"
-cyan = "#78d0bd"
-orange = "#efb080"
-yellow = "#e5c995"
-red = "#CC7C8A"
-
-blue_accent = "#2197F3"
-pink_accent = "#E44C7A"
-green_accent = "#00AF99"
-orange_accent = "#EE7F25"
-yellow_accent = "#DEA407"
-red_accent = "#F44747"
-
-red_error = "#EB5F6A"
-selection = "#1F3661"
-diff_plus = "#5A9F81"
-focus = "#204474"
+"White" = "#ffffff"
+"Gray 120" = "#d1d1d1"
+"Gray 110" = "#c2c2c2"
+"Gray 100" = "#a0a0a0"
+"Gray 90" = "#898989"
+"Gray 80" = "#767676"
+"Gray 70" = "#5d5d5d"
+"Gray 60" = "#484848"
+"Gray 50" = "#383838"
+"Gray 40" = "#333333"
+"Gray 30" = "#2d2d2d"
+"Gray 20" = "#292929"
+"Gray 10" = "#181818"
+"Black" = "#000000"
+"Blue 110" = "#6daaf7"
+"Blue 100" = "#4d9bf8"
+"Blue 90" = "#3691f9"
+"Blue 80" = "#1a85f6"
+"Blue 70" = "#0273eb"
+"Blue 60" = "#0c6ddd"
+"Blue 50" = "#195eb5"
+"Blue 40" = "#194176"
+"Blue 30" = "#163764"
+"Blue 20" = "#132c4f"
+"Blue 10" = "#0b1b32"
+"Red 80" = "#ec7388"
+"Red 70" = "#ea4b67"
+"Red 60" = "#d93953"
+"Red 50" = "#ce364d"
+"Red 40" = "#c03248"
+"Red 30" = "#a72a3f"
+"Red 20" = "#761b2d"
+"Red 10" = "#390813"
+"Green 50" = "#4ca988"
+"Green 40" = "#3ea17f"
+"Green 30" = "#028764"
+"Green 20" = "#134939"
+"Green 10" = "#081f19"
+"Yellow 60" = "#f8ab17"
+"Yellow 50" = "#e1971b"
+"Yellow 40" = "#b5791f"
+"Yellow 30" = "#7c511a"
+"Yellow 20" = "#5a3a14"
+"Yellow 10" = "#281806"
+"Purple 20" = "#c07bf3"
+"Purple 10" = "#b35def"
+
+"Blue" = "#87C3FF"
+"Blue Light" = "#ADD1DE"
+"Coral" = "#CC7C8A"
+"Cyan" = "#82D2CE"
+"Cyan Dark" = "#779E9E"
+"Lime" = "#A8CC7C"
+"Orange" = "#E09B70"
+"Pink" = "#E394DC"
+"Violet" = "#AF9CFF"
+"Yellow" = "#EBC88D"

From f71f27f804016aa7a8e3517cebeef0861088fb0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Gonz=C3=A1lez?= <ito123456789@gmail.com>
Date: Tue, 7 Feb 2023 00:39:49 -0300
Subject: [PATCH 846/884] Add Darcula Solid theme (#5778)

* Add Darcula Solid theme.

* Update darcula solid theme.

* Derive darcula-solid theme from original darcula
---
 runtime/themes/darcula-solid.toml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 runtime/themes/darcula-solid.toml

diff --git a/runtime/themes/darcula-solid.toml b/runtime/themes/darcula-solid.toml
new file mode 100644
index 00000000..5feac234
--- /dev/null
+++ b/runtime/themes/darcula-solid.toml
@@ -0,0 +1,19 @@
+# Original source and more info: https://github.com/jesusmgg/darcula-solid-helix
+
+inherits = "darcula"
+
+"ui.background.separator" = { bg = "grey01" }
+"ui.menu.scroll" = { fg = "grey02", bg = "grey00" }
+"ui.popup" = { fg = "grey03", bg = "grey02" }
+"ui.window" = { bg = "grey00" }
+"ui.selection" = { bg = "blue" }
+"ui.cursorline.secondary" = { bg = "grey03" }
+
+[palette]
+grey00 = "#101010"
+grey01 = "#1f1f1f"
+grey02 = "#323232"
+grey03 = "#555555"
+grey04 = "#a8a8a8"
+
+blue = "#104158"

From 23ed8c12f17c28ee888b5560d0ab2a9f9cd74dc9 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Mon, 6 Feb 2023 21:43:48 -0600
Subject: [PATCH 847/884] Select change range for goto_first/last_change
 commands (#5206)

This matches the behavior from 42ad1a9e043e2e0fb148924ff79b9abbe06907ae
but for the first and last change. The selection rules are the same
as for goto_next/prev_change: additions and modifications select the
added and modified range while deletions are represented with a point.
---
 helix-term/src/commands.rs | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index d1dc9223..157d19f7 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2927,14 +2927,6 @@ fn exit_select_mode(cx: &mut Context) {
     }
 }
 
-fn goto_pos(editor: &mut Editor, pos: usize) {
-    let (view, doc) = current!(editor);
-
-    push_jump(view, doc);
-    doc.set_selection(view.id, Selection::point(pos));
-    align_view(doc, view, Align::Center);
-}
-
 fn goto_first_diag(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
     let selection = match doc.diagnostics().first() {
@@ -3012,7 +3004,7 @@ fn goto_last_change(cx: &mut Context) {
 
 fn goto_first_change_impl(cx: &mut Context, reverse: bool) {
     let editor = &mut cx.editor;
-    let (_, doc) = current!(editor);
+    let (view, doc) = current!(editor);
     if let Some(handle) = doc.diff_handle() {
         let hunk = {
             let hunks = handle.hunks();
@@ -3024,8 +3016,8 @@ fn goto_first_change_impl(cx: &mut Context, reverse: bool) {
             hunks.nth_hunk(idx)
         };
         if hunk != Hunk::NONE {
-            let pos = doc.text().line_to_char(hunk.after.start as usize);
-            goto_pos(editor, pos)
+            let range = hunk_range(hunk, doc.text().slice(..));
+            doc.set_selection(view.id, Selection::single(range.anchor, range.head));
         }
     }
 }
@@ -3069,14 +3061,7 @@ fn goto_next_change_impl(cx: &mut Context, direction: Direction) {
                 return range;
             };
             let hunk = hunks.nth_hunk(hunk_idx);
-
-            let hunk_start = doc_text.line_to_char(hunk.after.start as usize);
-            let hunk_end = if hunk.after.is_empty() {
-                hunk_start + 1
-            } else {
-                doc_text.line_to_char(hunk.after.end as usize)
-            };
-            let new_range = Range::new(hunk_start, hunk_end);
+            let new_range = hunk_range(hunk, doc_text);
             if editor.mode == Mode::Select {
                 let head = if new_range.head < range.anchor {
                     new_range.anchor
@@ -3096,6 +3081,20 @@ fn goto_next_change_impl(cx: &mut Context, direction: Direction) {
     cx.editor.last_motion = Some(Motion(Box::new(motion)));
 }
 
+/// Returns the [Range] for a [Hunk] in the given text.
+/// Additions and modifications cover the added and modified ranges.
+/// Deletions are represented as the point at the start of the deletion hunk.
+fn hunk_range(hunk: Hunk, text: RopeSlice) -> Range {
+    let anchor = text.line_to_char(hunk.after.start as usize);
+    let head = if hunk.after.is_empty() {
+        anchor + 1
+    } else {
+        text.line_to_char(hunk.after.end as usize)
+    };
+
+    Range::new(anchor, head)
+}
+
 pub mod insert {
     use super::*;
     pub type Hook = fn(&Rope, &Selection, char) -> Option<Transaction>;

From c704701714236f9de9fdb03823b6adb9227be744 Mon Sep 17 00:00:00 2001
From: Mike Trinkala <trink@acm.org>
Date: Tue, 7 Feb 2023 15:05:27 -0800
Subject: [PATCH 848/884] Short-circuit the word and treesitter object movement
 commands (#5851)

The loop always iterates the number of times the user specified even
if the beginning/end of the document is reached.

For an extreme demonstration try the following commands, Helix will
hang for several seconds.
100000000w
100000000]c
---
 helix-core/src/movement.rs | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/helix-core/src/movement.rs b/helix-core/src/movement.rs
index 11c12a6f..8e6b6306 100644
--- a/helix-core/src/movement.rs
+++ b/helix-core/src/movement.rs
@@ -227,9 +227,15 @@ fn word_move(slice: RopeSlice, range: Range, count: usize, target: WordMotionTar
     };
 
     // Do the main work.
-    (0..count).fold(start_range, |r, _| {
-        slice.chars_at(r.head).range_to_target(target, r)
-    })
+    let mut range = start_range;
+    for _ in 0..count {
+        let next_range = slice.chars_at(range.head).range_to_target(target, range);
+        if range == next_range {
+            break;
+        }
+        range = next_range;
+    }
+    range
 }
 
 pub fn move_prev_paragraph(
@@ -251,6 +257,7 @@ pub fn move_prev_paragraph(
     let mut lines = slice.lines_at(line);
     lines.reverse();
     let mut lines = lines.map(rope_is_line_ending).peekable();
+    let mut last_line = line;
     for _ in 0..count {
         while lines.next_if(|&e| e).is_some() {
             line -= 1;
@@ -258,6 +265,10 @@ pub fn move_prev_paragraph(
         while lines.next_if(|&e| !e).is_some() {
             line -= 1;
         }
+        if line == last_line {
+            break;
+        }
+        last_line = line;
     }
 
     let head = slice.line_to_char(line);
@@ -293,6 +304,7 @@ pub fn move_next_paragraph(
         line += 1;
     }
     let mut lines = slice.lines_at(line).map(rope_is_line_ending).peekable();
+    let mut last_line = line;
     for _ in 0..count {
         while lines.next_if(|&e| !e).is_some() {
             line += 1;
@@ -300,6 +312,10 @@ pub fn move_next_paragraph(
         while lines.next_if(|&e| e).is_some() {
             line += 1;
         }
+        if line == last_line {
+            break;
+        }
+        last_line = line;
     }
     let head = slice.line_to_char(line);
     let anchor = if behavior == Movement::Move {
@@ -523,7 +539,14 @@ pub fn goto_treesitter_object(
         // head of range should be at beginning
         Some(Range::new(start_char, end_char))
     };
-    (0..count).fold(range, |range, _| get_range(range).unwrap_or(range))
+    let mut last_range = range;
+    for _ in 0..count {
+        match get_range(last_range) {
+            Some(r) if r != last_range => last_range = r,
+            _ => break,
+        }
+    }
+    last_range
 }
 
 #[cfg(test)]

From fce30c0da0eb222bf20091752b599df723ebf559 Mon Sep 17 00:00:00 2001
From: Surendrajat <surendrajat@protonmail.com>
Date: Wed, 8 Feb 2023 04:47:48 +0530
Subject: [PATCH 849/884] xml: add mobileconfig & plist file types (#5863)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 5cde4167..f407ce34 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1967,7 +1967,7 @@ source = { git = "https://github.com/Unoqwy/tree-sitter-kdl", rev = "e1cd292c6d1
 name = "xml"
 scope = "source.xml"
 injection-regex = "xml"
-file-types = ["xml"]
+file-types = ["xml", "mobileconfig", "plist"]
 indent = { tab-width = 2, unit = "  " }
 roots = []
 

From 05c52072653f4c276750e3c651b9c4e030e912d2 Mon Sep 17 00:00:00 2001
From: Matthew Toohey <contact@mtoohey.com>
Date: Tue, 7 Feb 2023 18:24:26 -0500
Subject: [PATCH 850/884] feat: add pem language (#5797)

---
 book/src/generated/lang-support.md |  1 +
 languages.toml                     | 12 ++++++++++++
 runtime/queries/pem/highlights.scm |  7 +++++++
 3 files changed, 20 insertions(+)
 create mode 100644 runtime/queries/pem/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 99fe82b3..0ad6dedb 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -93,6 +93,7 @@
 | openscad | ✓ |  |  | `openscad-lsp` |
 | org | ✓ |  |  |  |
 | pascal | ✓ | ✓ |  | `pasls` |
+| pem | ✓ |  |  |  |
 | perl | ✓ | ✓ | ✓ |  |
 | php | ✓ | ✓ | ✓ | `intelephense` |
 | ponylang | ✓ | ✓ | ✓ |  |
diff --git a/languages.toml b/languages.toml
index f407ce34..2fa2c3f5 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2134,3 +2134,15 @@ grammar = "xml"
 '"' = '"'
 "'" = "'"
 "<" = ">"
+
+[[language]]
+name = "pem"
+scope = "source.pem"
+file-types = ["pem", "cert", "crt"]
+injection-regex = "pem"
+roots = []
+grammar = "pem"
+
+[[grammar]]
+name = "pem"
+source = { git = "https://github.com/mtoohey31/tree-sitter-pem", rev = "be67a4330a1aa507c7297bc322204f936ec1132c" }
diff --git a/runtime/queries/pem/highlights.scm b/runtime/queries/pem/highlights.scm
new file mode 100644
index 00000000..ee7a4043
--- /dev/null
+++ b/runtime/queries/pem/highlights.scm
@@ -0,0 +1,7 @@
+(label) @constant
+
+(preeb) @keyword
+(posteb) @keyword
+
+(base64pad) @string.special.symbol
+(laxbase64text) @string

From 00ecc556a8d3f7efe115f3d826c916ffacf6ab2e Mon Sep 17 00:00:00 2001
From: gavincrawford <94875769+gavincrawford@users.noreply.github.com>
Date: Wed, 8 Feb 2023 00:17:34 -0700
Subject: [PATCH 851/884] Fix Go select indenting (#5713)

* Fix Go  indenting

* Fix bracket outdent predicate

* Fix brace indenting (again)
---
 runtime/queries/go/indents.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/runtime/queries/go/indents.scm b/runtime/queries/go/indents.scm
index f72ec9e8..e439a905 100644
--- a/runtime/queries/go/indents.scm
+++ b/runtime/queries/go/indents.scm
@@ -20,8 +20,9 @@
 ] @indent
 
 [
-  "case"
-  "}"
   "]"
   ")"
 ] @outdent
+
+((_ "}" @outdent) @outer (#not-kind-eq? @outer "select_statement"))
+(communication_case) @extend

From f386ff795d4833cce02d57de921999284aadded3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Delafargue?= <clement@delafargue.name>
Date: Wed, 8 Feb 2023 17:09:19 +0100
Subject: [PATCH 852/884] Check for external file modifications when writing
 (#5805)

`:write` and other file-saving commands now check the file modification
time before writing to protect against overwriting external changes.

Co-authored-by: Gustavo Noronha Silva <gustavo@noronha.dev.br>
Co-authored-by: LeoniePhiline <22329650+LeoniePhiline@users.noreply.github.com>
Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>
---
 helix-term/tests/test/commands.rs |  2 +-
 helix-term/tests/test/helpers.rs  |  6 ++++++
 helix-term/tests/test/write.rs    | 36 +++++++++++++++++++++++++++++--
 helix-view/src/document.rs        | 25 ++++++++++++++++++++-
 4 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index da2e020e..2ca9e395 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -67,7 +67,7 @@ async fn test_buffer_close_concurrent() -> anyhow::Result<()> {
     const RANGE: RangeInclusive<i32> = 1..=1000;
 
     for i in RANGE {
-        let cmd = format!("%c{}<esc>:w<ret>", i);
+        let cmd = format!("%c{}<esc>:w!<ret>", i);
         command.push_str(&cmd);
     }
 
diff --git a/helix-term/tests/test/helpers.rs b/helix-term/tests/test/helpers.rs
index 8755b60f..fb12ef12 100644
--- a/helix-term/tests/test/helpers.rs
+++ b/helix-term/tests/test/helpers.rs
@@ -319,6 +319,12 @@ impl AppBuilder {
     }
 }
 
+pub async fn run_event_loop_until_idle(app: &mut Application) {
+    let (_, rx) = tokio::sync::mpsc::unbounded_channel();
+    let mut rx_stream = UnboundedReceiverStream::new(rx);
+    app.event_loop_until_idle(&mut rx_stream).await;
+}
+
 pub fn assert_file_has_content(file: &mut File, content: &str) -> anyhow::Result<()> {
     file.flush()?;
     file.sync_all()?;
diff --git a/helix-term/tests/test/write.rs b/helix-term/tests/test/write.rs
index bbf14fc2..81459b2f 100644
--- a/helix-term/tests/test/write.rs
+++ b/helix-term/tests/test/write.rs
@@ -1,5 +1,5 @@
 use std::{
-    io::{Read, Write},
+    io::{Read, Seek, SeekFrom, Write},
     ops::RangeInclusive,
 };
 
@@ -37,6 +37,38 @@ async fn test_write() -> anyhow::Result<()> {
     Ok(())
 }
 
+#[tokio::test(flavor = "multi_thread")]
+async fn test_overwrite_protection() -> anyhow::Result<()> {
+    let mut file = tempfile::NamedTempFile::new()?;
+    let mut app = helpers::AppBuilder::new()
+        .with_file(file.path(), None)
+        .build()?;
+
+    helpers::run_event_loop_until_idle(&mut app).await;
+
+    file.as_file_mut()
+        .write_all(helpers::platform_line("extremely important content").as_bytes())?;
+
+    file.as_file_mut().flush()?;
+    file.as_file_mut().sync_all()?;
+
+    test_key_sequence(&mut app, Some(":x<ret>"), None, false).await?;
+
+    file.as_file_mut().flush()?;
+    file.as_file_mut().sync_all()?;
+
+    file.seek(SeekFrom::Start(0))?;
+    let mut file_content = String::new();
+    file.as_file_mut().read_to_string(&mut file_content)?;
+
+    assert_eq!(
+        helpers::platform_line("extremely important content"),
+        file_content
+    );
+
+    Ok(())
+}
+
 #[tokio::test(flavor = "multi_thread")]
 async fn test_write_quit() -> anyhow::Result<()> {
     let mut file = tempfile::NamedTempFile::new()?;
@@ -76,7 +108,7 @@ async fn test_write_concurrent() -> anyhow::Result<()> {
         .build()?;
 
     for i in RANGE {
-        let cmd = format!("%c{}<esc>:w<ret>", i);
+        let cmd = format!("%c{}<esc>:w!<ret>", i);
         command.push_str(&cmd);
     }
 
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 798b5400..d308d013 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -19,6 +19,7 @@ use std::future::Future;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::sync::Arc;
+use std::time::SystemTime;
 
 use helix_core::{
     encoding,
@@ -135,6 +136,10 @@ pub struct Document {
 
     pub savepoint: Option<Transaction>,
 
+    // Last time we wrote to the file. This will carry the time the file was last opened if there
+    // were no saves.
+    last_saved_time: SystemTime,
+
     last_saved_revision: usize,
     version: i32, // should be usize?
     pub(crate) modified_since_accessed: bool,
@@ -160,6 +165,7 @@ impl fmt::Debug for Document {
             .field("changes", &self.changes)
             .field("old_state", &self.old_state)
             // .field("history", &self.history)
+            .field("last_saved_time", &self.last_saved_time)
             .field("last_saved_revision", &self.last_saved_revision)
             .field("version", &self.version)
             .field("modified_since_accessed", &self.modified_since_accessed)
@@ -382,6 +388,7 @@ impl Document {
             version: 0,
             history: Cell::new(History::default()),
             savepoint: None,
+            last_saved_time: SystemTime::now(),
             last_saved_revision: 0,
             modified_since_accessed: false,
             language_server: None,
@@ -577,9 +584,11 @@ impl Document {
 
         let encoding = self.encoding;
 
+        let last_saved_time = self.last_saved_time;
+
         // We encode the file according to the `Document`'s encoding.
         let future = async move {
-            use tokio::fs::File;
+            use tokio::{fs, fs::File};
             if let Some(parent) = path.parent() {
                 // TODO: display a prompt asking the user if the directories should be created
                 if !parent.exists() {
@@ -591,6 +600,17 @@ impl Document {
                 }
             }
 
+            // Protect against overwriting changes made externally
+            if !force {
+                if let Ok(metadata) = fs::metadata(&path).await {
+                    if let Ok(mtime) = metadata.modified() {
+                        if last_saved_time < mtime {
+                            bail!("file modified by an external process, use :w! to overwrite");
+                        }
+                    }
+                }
+            }
+
             let mut file = File::create(&path).await?;
             to_writer(&mut file, encoding, &text).await?;
 
@@ -668,6 +688,8 @@ impl Document {
         self.append_changes_to_history(view);
         self.reset_modified();
 
+        self.last_saved_time = SystemTime::now();
+
         self.detect_indent_and_line_ending();
 
         match provider_registry.get_diff_base(&path) {
@@ -1016,6 +1038,7 @@ impl Document {
             rev
         );
         self.last_saved_revision = rev;
+        self.last_saved_time = SystemTime::now();
     }
 
     /// Get the document's latest saved revision.

From 882fa11d17c27fbda3426023b898c0e7acb6cd94 Mon Sep 17 00:00:00 2001
From: zSchoen <mos-news@web.de>
Date: Wed, 8 Feb 2023 22:08:10 +0100
Subject: [PATCH 853/884] Add `Containerfile` file-type for dockerfile language
 (#5873)

---
 languages.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/languages.toml b/languages.toml
index 2fa2c3f5..9ecd1b78 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1072,8 +1072,8 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-scala", rev = "f6bb
 name = "dockerfile"
 scope = "source.dockerfile"
 injection-regex = "docker|dockerfile"
-roots = ["Dockerfile"]
-file-types = ["Dockerfile", "dockerfile"]
+roots = ["Dockerfile", "Containerfile"]
+file-types = ["Dockerfile", "dockerfile", "Containerfile", "containerfile"]
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 language-server = { command = "docker-langserver", args = ["--stdio"] }

From 8e2eab1a6fd90e3989ac807f675b022c540ad014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Thu, 9 Feb 2023 11:04:44 +0900
Subject: [PATCH 854/884] Also run build checks on merge queue

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0d6fcb3e..8f3b778a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+  merge_group:
   schedule:
     - cron: '00 01 * * *'
 

From bd14f5a72cec6932cf1792d62e420349eaec60db Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Thu, 9 Feb 2023 03:22:38 +0100
Subject: [PATCH 855/884] update bug report template (#5872)

---
 .github/ISSUE_TEMPLATE/bug_report.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index c67deb69..47fd3fe8 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -32,7 +32,7 @@ body:
     id: helix-log
     attributes:
       label: Helix log
-      description: See `hx -h` for log file path
+      description: See `hx -h` for log file path. If you can reproduce the issue run `RUST_BACKTRACE=1 hx -vv` to generate a more detailed log file.
       value: |
         <details><summary>~/.cache/helix/helix.log</summary>
 
@@ -61,7 +61,8 @@ body:
       label: Helix Version
       description: >
         Helix version (`hx -V` if using a release, `git describe` if building
-        from master)
-      placeholder: "helix 0.6.0 (c0dbd6dc)"
+        from master).
+        **Make sure that you are using the [latest helix release](https://github.com/helix-editor/helix/releases) or a newer master build**
+      placeholder: "helix 22.12 (5eaa6d97)"
     validations:
       required: true

From e474779c8729c36335b76badc98d8211829122d2 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Thu, 9 Feb 2023 03:24:31 +0100
Subject: [PATCH 856/884] bump msrv to 1.63 (#5570)

* bump msrv to 1.63

* resolve new complex type clippy lints
---
 .github/workflows/build.yml                | 16 ++++------------
 .github/workflows/msrv-rust-toolchain.toml |  3 ---
 helix-term/src/commands.rs                 |  4 +++-
 helix-term/src/compositor.rs               |  1 +
 helix-term/src/job.rs                      |  7 +++++--
 helix-term/src/ui/editor.rs                |  4 ++--
 helix-term/src/ui/menu.rs                  |  4 +++-
 helix-term/src/ui/picker.rs                |  8 ++++++--
 helix-term/src/ui/prompt.rs                | 11 +++++++----
 rust-toolchain.toml                        |  2 +-
 10 files changed, 32 insertions(+), 28 deletions(-)
 delete mode 100644 .github/workflows/msrv-rust-toolchain.toml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8f3b778a..44d26788 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,19 +10,11 @@ on:
 
 jobs:
   check:
-    name: Check
+    name: Check (msrv)
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        rust: [stable, msrv]
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
-
-      - name: Use MSRV rust toolchain
-        if: matrix.rust == 'msrv'
-        run: cp .github/workflows/msrv-rust-toolchain.toml rust-toolchain.toml
-
       - name: Install stable toolchain
         uses: helix-editor/rust-toolchain@v1
         with:
@@ -45,7 +37,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install stable toolchain
-        uses: dtolnay/rust-toolchain@1.61
+        uses: dtolnay/rust-toolchain@1.63
 
       - uses: Swatinem/rust-cache@v2
 
@@ -74,7 +66,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install stable toolchain
-        uses: dtolnay/rust-toolchain@1.61
+        uses: dtolnay/rust-toolchain@1.63
         with:
           components: rustfmt, clippy
 
@@ -99,7 +91,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install stable toolchain
-        uses: dtolnay/rust-toolchain@1.61
+        uses: dtolnay/rust-toolchain@1.63
 
       - uses: Swatinem/rust-cache@v2
 
diff --git a/.github/workflows/msrv-rust-toolchain.toml b/.github/workflows/msrv-rust-toolchain.toml
deleted file mode 100644
index b169d31e..00000000
--- a/.github/workflows/msrv-rust-toolchain.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[toolchain]
-channel = "1.61.0"
-components = ["rustfmt", "rust-src"]
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 157d19f7..e6cbed2c 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -73,13 +73,15 @@ use grep_searcher::{sinks, BinaryDetection, SearcherBuilder};
 use ignore::{DirEntry, WalkBuilder, WalkState};
 use tokio_stream::wrappers::UnboundedReceiverStream;
 
+pub type OnKeyCallback = Box<dyn FnOnce(&mut Context, KeyEvent)>;
+
 pub struct Context<'a> {
     pub register: Option<char>,
     pub count: Option<NonZeroUsize>,
     pub editor: &'a mut Editor,
 
     pub callback: Option<crate::compositor::Callback>,
-    pub on_next_key_callback: Option<Box<dyn FnOnce(&mut Context, KeyEvent)>>,
+    pub on_next_key_callback: Option<OnKeyCallback>,
     pub jobs: &'a mut Jobs,
 }
 
diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs
index 2e4a2e20..bcb3e449 100644
--- a/helix-term/src/compositor.rs
+++ b/helix-term/src/compositor.rs
@@ -7,6 +7,7 @@ use helix_view::graphics::{CursorKind, Rect};
 use tui::buffer::Buffer as Surface;
 
 pub type Callback = Box<dyn FnOnce(&mut Compositor, &mut Context)>;
+pub type SyncCallback = Box<dyn FnOnce(&mut Compositor, &mut Context) + Sync>;
 
 // Cursive-inspired
 pub enum EventResult {
diff --git a/helix-term/src/job.rs b/helix-term/src/job.rs
index 2888b6eb..19f2521a 100644
--- a/helix-term/src/job.rs
+++ b/helix-term/src/job.rs
@@ -5,9 +5,12 @@ use crate::compositor::Compositor;
 use futures_util::future::{BoxFuture, Future, FutureExt};
 use futures_util::stream::{FuturesUnordered, StreamExt};
 
+pub type EditorCompositorCallback = Box<dyn FnOnce(&mut Editor, &mut Compositor) + Send>;
+pub type EditorCallback = Box<dyn FnOnce(&mut Editor) + Send>;
+
 pub enum Callback {
-    EditorCompositor(Box<dyn FnOnce(&mut Editor, &mut Compositor) + Send>),
-    Editor(Box<dyn FnOnce(&mut Editor) + Send>),
+    EditorCompositor(EditorCompositorCallback),
+    Editor(EditorCallback),
 }
 
 pub type JobFuture = BoxFuture<'static, anyhow::Result<Option<Callback>>>;
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index f297b44e..493f8d50 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1,5 +1,5 @@
 use crate::{
-    commands,
+    commands::{self, OnKeyCallback},
     compositor::{Component, Context, Event, EventResult},
     job::{self, Callback},
     key,
@@ -37,7 +37,7 @@ use super::{document::LineDecoration, lsp::SignatureHelp};
 
 pub struct EditorView {
     pub keymaps: Keymaps,
-    on_next_key: Option<Box<dyn FnOnce(&mut commands::Context, KeyEvent)>>,
+    on_next_key: Option<OnKeyCallback>,
     pseudo_pending: Vec<KeyEvent>,
     last_insert: (commands::MappableCommand, Vec<InsertEvent>),
     pub(crate) completion: Option<Completion>,
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index 3ae00703..8aa10c08 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -43,6 +43,8 @@ impl Item for PathBuf {
     }
 }
 
+pub type MenuCallback<T> = Box<dyn Fn(&mut Editor, Option<&T>, MenuEvent)>;
+
 pub struct Menu<T: Item> {
     options: Vec<T>,
     editor_data: T::Data,
@@ -55,7 +57,7 @@ pub struct Menu<T: Item> {
 
     widths: Vec<Constraint>,
 
-    callback_fn: Box<dyn Fn(&mut Editor, Option<&T>, MenuEvent)>,
+    callback_fn: MenuCallback<T>,
 
     scroll: usize,
     size: (u16, u16),
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 5190fc53..803e2d65 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -70,6 +70,8 @@ impl From<DocumentId> for PathOrId {
     }
 }
 
+type FileCallback<T> = Box<dyn Fn(&Editor, &T) -> Option<FileLocation>>;
+
 /// File path and range of lines (used to align and highlight lines)
 pub type FileLocation = (PathOrId, Option<(usize, usize)>);
 
@@ -80,7 +82,7 @@ pub struct FilePicker<T: Item> {
     preview_cache: HashMap<PathBuf, CachedPreview>,
     read_buffer: Vec<u8>,
     /// Given an item in the picker, return the file path and line number to display.
-    file_fn: Box<dyn Fn(&Editor, &T) -> Option<FileLocation>>,
+    file_fn: FileCallback<T>,
 }
 
 pub enum CachedPreview {
@@ -394,6 +396,8 @@ impl Ord for PickerMatch {
     }
 }
 
+type PickerCallback<T> = Box<dyn Fn(&mut Context, &T, Action)>;
+
 pub struct Picker<T: Item> {
     options: Vec<T>,
     editor_data: T::Data,
@@ -415,7 +419,7 @@ pub struct Picker<T: Item> {
     /// Constraints for tabular formatting
     widths: Vec<Constraint>,
 
-    callback_fn: Box<dyn Fn(&mut Context, &T, Action)>,
+    callback_fn: PickerCallback<T>,
 }
 
 impl<T: Item> Picker<T> {
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 5fb6745a..f438231f 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -14,8 +14,11 @@ use helix_view::{
     Editor,
 };
 
-pub type Completion = (RangeFrom<usize>, Cow<'static, str>);
 type PromptCharHandler = Box<dyn Fn(&mut Prompt, char, &Context)>;
+pub type Completion = (RangeFrom<usize>, Cow<'static, str>);
+type CompletionFn = Box<dyn FnMut(&Editor, &str) -> Vec<Completion>>;
+type CallbackFn = Box<dyn FnMut(&mut Context, &str, PromptEvent)>;
+pub type DocFn = Box<dyn Fn(&str) -> Option<Cow<str>>>;
 
 pub struct Prompt {
     prompt: Cow<'static, str>,
@@ -25,9 +28,9 @@ pub struct Prompt {
     selection: Option<usize>,
     history_register: Option<char>,
     history_pos: Option<usize>,
-    completion_fn: Box<dyn FnMut(&Editor, &str) -> Vec<Completion>>,
-    callback_fn: Box<dyn FnMut(&mut Context, &str, PromptEvent)>,
-    pub doc_fn: Box<dyn Fn(&str) -> Option<Cow<str>>>,
+    completion_fn: CompletionFn,
+    callback_fn: CallbackFn,
+    pub doc_fn: DocFn,
     next_char_handler: Option<PromptCharHandler>,
 }
 
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index b169d31e..ace4f5f9 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.61.0"
+channel = "1.63.0"
 components = ["rustfmt", "rust-src"]

From 8a602995fa71bee009c0ab1e67b78828a731ca75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Thu, 9 Feb 2023 11:44:14 +0900
Subject: [PATCH 857/884] Address new clippy lints

---
 helix-term/src/commands/typed.rs | 5 +++--
 helix-term/src/ui/document.rs    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 1fd11b65..0cc1b743 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1,3 +1,4 @@
+use std::fmt::Write;
 use std::ops::Deref;
 
 use crate::job::Job;
@@ -1103,7 +1104,7 @@ fn get_character_info(
                 codepoint
             };
 
-            unicode.push_str(&format!("{codepoint:0>4x}"));
+            write!(unicode, "{codepoint:0>4x}").unwrap();
         }
 
         unicode.push(')');
@@ -1144,7 +1145,7 @@ fn get_character_info(
             }
 
             for byte in &bytes[current_byte..] {
-                hex.push_str(&format!(" {byte:0>2x}"));
+                write!(hex, " {byte:0>2x}").unwrap();
             }
 
             current_byte = bytes.len();
diff --git a/helix-term/src/ui/document.rs b/helix-term/src/ui/document.rs
index 56377d1e..ddbb2cf3 100644
--- a/helix-term/src/ui/document.rs
+++ b/helix-term/src/ui/document.rs
@@ -419,7 +419,7 @@ impl<'a> TextRenderer<'a> {
             // TODO special rendering for other whitespaces?
             Grapheme::Other { ref g } if g == " " => &self.space,
             Grapheme::Other { ref g } if g == "\u{00A0}" => &self.nbsp,
-            Grapheme::Other { ref g } => &*g,
+            Grapheme::Other { ref g } => g,
             Grapheme::Newline => &self.newline,
         };
 

From 7ebcf4e919a27b60610ba8f3a24a213282eb9ee6 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Thu, 9 Feb 2023 08:19:29 +0100
Subject: [PATCH 858/884] properly handle LSP position encoding (#5711)

* properly handle LSP position encoding

* add debug assertion to Transaction::change

* Apply suggestions from code review

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 helix-core/src/line_ending.rs |   7 +++
 helix-core/src/transaction.rs |   5 ++
 helix-lsp/src/client.rs       |   2 +-
 helix-lsp/src/lib.rs          | 112 ++++++++++++++++++++++++++++------
 4 files changed, 107 insertions(+), 19 deletions(-)

diff --git a/helix-core/src/line_ending.rs b/helix-core/src/line_ending.rs
index 09e92523..953d567d 100644
--- a/helix-core/src/line_ending.rs
+++ b/helix-core/src/line_ending.rs
@@ -203,6 +203,13 @@ pub fn line_end_char_index(slice: &RopeSlice, line: usize) -> usize {
             .unwrap_or(0)
 }
 
+pub fn line_end_byte_index(slice: &RopeSlice, line: usize) -> usize {
+    slice.line_to_byte(line + 1)
+        - get_line_ending(&slice.line(line))
+            .map(|le| le.as_str().len())
+            .unwrap_or(0)
+}
+
 /// Fetches line `line_idx` from the passed rope slice, sans any line ending.
 pub fn line_without_line_ending<'a>(slice: &'a RopeSlice, line_idx: usize) -> RopeSlice<'a> {
     let start = slice.line_to_char(line_idx);
diff --git a/helix-core/src/transaction.rs b/helix-core/src/transaction.rs
index 482fd6d9..d2f4de07 100644
--- a/helix-core/src/transaction.rs
+++ b/helix-core/src/transaction.rs
@@ -481,6 +481,11 @@ impl Transaction {
         for (from, to, tendril) in changes {
             // Verify ranges are ordered and not overlapping
             debug_assert!(last <= from);
+            // Verify ranges are correct
+            debug_assert!(
+                from <= to,
+                "Edit end must end before it starts (should {from} <= {to})"
+            );
 
             // Retain from last "to" to current "from"
             changeset.retain(from - last);
diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 6827f568..365c6990 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -104,7 +104,7 @@ impl Client {
             server_tx,
             request_counter: AtomicU64::new(0),
             capabilities: OnceCell::new(),
-            offset_encoding: OffsetEncoding::Utf8,
+            offset_encoding: OffsetEncoding::Utf16,
             config,
             req_timeout,
 
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index 8418896c..bcaff10a 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -57,6 +57,7 @@ pub enum OffsetEncoding {
 
 pub mod util {
     use super::*;
+    use helix_core::line_ending::{line_end_byte_index, line_end_char_index};
     use helix_core::{diagnostic::NumberOrString, Range, Rope, Selection, Tendril, Transaction};
 
     /// Converts a diagnostic in the document to [`lsp::Diagnostic`].
@@ -117,7 +118,7 @@ pub mod util {
 
     /// Converts [`lsp::Position`] to a position in the document.
     ///
-    /// Returns `None` if position exceeds document length or an operation overflows.
+    /// Returns `None` if position.line is out of bounds or an overflow occurs
     pub fn lsp_pos_to_pos(
         doc: &Rope,
         pos: lsp::Position,
@@ -128,22 +129,58 @@ pub mod util {
             return None;
         }
 
-        match offset_encoding {
+        // We need to be careful here to fully comply ith the LSP spec.
+        // Two relevant quotes from the spec:
+        //
+        // https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#position
+        // > If the character value is greater than the line length it defaults back
+        // >  to the line length.
+        //
+        // https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocuments
+        // > To ensure that both client and server split the string into the same
+        // > line representation the protocol specifies the following end-of-line sequences:
+        // > ‘\n’, ‘\r\n’ and ‘\r’. Positions are line end character agnostic.
+        // > So you can not specify a position that denotes \r|\n or \n| where | represents the character offset.
+        //
+        // This means that while the line must be in bounds the `charater`
+        // must be capped to the end of the line.
+        // Note that the end of the line here is **before** the line terminator
+        // so we must use `line_end_char_index` istead of `doc.line_to_char(pos_line + 1)`
+        //
+        // FIXME: Helix does not fully comply with the LSP spec for line terminators.
+        // The LSP standard requires that line terminators are ['\n', '\r\n', '\r'].
+        // Without the unicode-linebreak feature disabled, the `\r` terminator is not handled by helix.
+        // With the unicode-linebreak feature, helix recognizes multiple extra line break chars
+        // which means that positions will be decoded/encoded incorrectly in their presence
+
+        let line = match offset_encoding {
             OffsetEncoding::Utf8 => {
-                let line = doc.line_to_char(pos_line);
-                let pos = line.checked_add(pos.character as usize)?;
-                if pos <= doc.len_chars() {
-                    Some(pos)
-                } else {
-                    None
-                }
+                let line_start = doc.line_to_byte(pos_line);
+                let line_end = line_end_byte_index(&doc.slice(..), pos_line);
+                line_start..line_end
             }
             OffsetEncoding::Utf16 => {
-                let line = doc.line_to_char(pos_line);
-                let line_start = doc.char_to_utf16_cu(line);
-                let pos = line_start.checked_add(pos.character as usize)?;
-                doc.try_utf16_cu_to_char(pos).ok()
+                // TODO directly translate line index to char-idx
+                // ropey can do this just as easily as utf-8 byte translation
+                // but the functions are just missing.
+                // Translate to char first and then utf-16 as a workaround
+                let line_start = doc.line_to_char(pos_line);
+                let line_end = line_end_char_index(&doc.slice(..), pos_line);
+                doc.char_to_utf16_cu(line_start)..doc.char_to_utf16_cu(line_end)
             }
+        };
+
+        // The LSP spec demands that the offset is capped to the end of the line
+        let pos = line
+            .start
+            .checked_add(pos.character as usize)
+            .unwrap_or(line.end)
+            .min(line.end);
+
+        // TODO prefer UTF32/char indices to avoid this step
+        match offset_encoding {
+            OffsetEncoding::Utf8 => doc.try_byte_to_char(pos).ok(),
+            OffsetEncoding::Utf16 => doc.try_utf16_cu_to_char(pos).ok(),
         }
     }
 
@@ -158,8 +195,8 @@ pub mod util {
         match offset_encoding {
             OffsetEncoding::Utf8 => {
                 let line = doc.char_to_line(pos);
-                let line_start = doc.line_to_char(line);
-                let col = pos - line_start;
+                let line_start = doc.line_to_byte(line);
+                let col = doc.char_to_byte(pos) - line_start;
 
                 lsp::Position::new(line as u32, col as u32)
             }
@@ -606,16 +643,55 @@ mod tests {
         }
 
         test_case!("", (0, 0) => Some(0));
-        test_case!("", (0, 1) => None);
+        test_case!("", (0, 1) => Some(0));
         test_case!("", (1, 0) => None);
         test_case!("\n\n", (0, 0) => Some(0));
         test_case!("\n\n", (1, 0) => Some(1));
-        test_case!("\n\n", (1, 1) => Some(2));
+        test_case!("\n\n", (1, 1) => Some(1));
         test_case!("\n\n", (2, 0) => Some(2));
         test_case!("\n\n", (3, 0) => None);
         test_case!("test\n\n\n\ncase", (4, 3) => Some(11));
         test_case!("test\n\n\n\ncase", (4, 4) => Some(12));
-        test_case!("test\n\n\n\ncase", (4, 5) => None);
+        test_case!("test\n\n\n\ncase", (4, 5) => Some(12));
         test_case!("", (u32::MAX, u32::MAX) => None);
     }
+
+    #[test]
+    fn emoji_format_gh_4791() {
+        use lsp_types::{Position, Range, TextEdit};
+
+        let edits = vec![
+            TextEdit {
+                range: Range {
+                    start: Position {
+                        line: 0,
+                        character: 1,
+                    },
+                    end: Position {
+                        line: 1,
+                        character: 0,
+                    },
+                },
+                new_text: "\n  ".to_string(),
+            },
+            TextEdit {
+                range: Range {
+                    start: Position {
+                        line: 1,
+                        character: 7,
+                    },
+                    end: Position {
+                        line: 2,
+                        character: 0,
+                    },
+                },
+                new_text: "\n  ".to_string(),
+            },
+        ];
+
+        let mut source = Rope::from_str("[\n\"🇺🇸\",\n\"🎄\",\n]");
+
+        let transaction = generate_transaction_from_edits(&source, edits, OffsetEncoding::Utf8);
+        assert!(transaction.apply(&mut source));
+    }
 }

From 9d73a0d1128f8237eef2d4bf475496d4db081df2 Mon Sep 17 00:00:00 2001
From: Mike Trinkala <trink@acm.org>
Date: Thu, 9 Feb 2023 06:28:33 -0800
Subject: [PATCH 859/884] Fix the infinite loop when copying the cursor to the
 top of the file (#5888)

Example:
```
test
testitem
```

Select line 2 with x, then type Alt-C; Helix will go into an infinite
loop. The saturating_sub keeps the head_row and anchor_row pinned at 0,
and a selection is never made since the first line is too short.
---
 helix-term/src/commands.rs        |  4 ++
 helix-term/tests/test/commands.rs | 64 +++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index e6cbed2c..d7d87b5a 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1617,6 +1617,10 @@ fn copy_selection_on_line(cx: &mut Context, direction: Direction) {
                 sels += 1;
             }
 
+            if anchor_row == 0 && head_row == 0 {
+                break;
+            }
+
             i += 1;
         }
     }
diff --git a/helix-term/tests/test/commands.rs b/helix-term/tests/test/commands.rs
index 2ca9e395..e8d16bfa 100644
--- a/helix-term/tests/test/commands.rs
+++ b/helix-term/tests/test/commands.rs
@@ -132,6 +132,70 @@ async fn test_selection_duplication() -> anyhow::Result<()> {
         .as_str(),
     ))
     .await?;
+
+    // Copy the selection to previous line, skipping the first line in the file
+    test((
+        platform_line(indoc! {"\
+            test
+            #[testitem|]#
+            "})
+        .as_str(),
+        "<A-C>",
+        platform_line(indoc! {"\
+            test
+            #[testitem|]#
+            "})
+        .as_str(),
+    ))
+    .await?;
+
+    // Copy the selection to previous line, including the first line in the file
+    test((
+        platform_line(indoc! {"\
+            test
+            #[test|]#
+            "})
+        .as_str(),
+        "<A-C>",
+        platform_line(indoc! {"\
+            #[test|]#
+            #(test|)#
+            "})
+        .as_str(),
+    ))
+    .await?;
+
+    // Copy the selection to next line, skipping the last line in the file
+    test((
+        platform_line(indoc! {"\
+            #[testitem|]#
+            test
+            "})
+        .as_str(),
+        "C",
+        platform_line(indoc! {"\
+            #[testitem|]#
+            test
+            "})
+        .as_str(),
+    ))
+    .await?;
+
+    // Copy the selection to next line, including the last line in the file
+    test((
+        platform_line(indoc! {"\
+            #[test|]#
+            test
+            "})
+        .as_str(),
+        "C",
+        platform_line(indoc! {"\
+            #(test|)#
+            #[test|]#
+            "})
+        .as_str(),
+    ))
+    .await?;
     Ok(())
 }
 

From 8a3ec443f176218384db8c8610bbada9c43a6ea5 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Thu, 9 Feb 2023 23:27:08 +0100
Subject: [PATCH 860/884] Fix new clippy lints (#5892)

---
 helix-core/src/comment.rs           |  2 +-
 helix-core/src/increment/integer.rs |  4 ++--
 helix-core/src/indent.rs            |  4 ++--
 helix-core/src/syntax.rs            |  2 +-
 helix-lsp/src/client.rs             |  2 +-
 helix-term/src/commands.rs          |  8 +++++---
 helix-term/src/lib.rs               |  2 +-
 helix-term/src/ui/document.rs       | 12 ++++++------
 helix-term/src/ui/editor.rs         |  9 ++-------
 helix-term/src/ui/fuzzy_match.rs    |  2 +-
 helix-vcs/src/git/test.rs           |  2 +-
 helix-view/src/base64.rs            |  2 +-
 helix-view/src/clipboard.rs         |  2 +-
 helix-view/src/document.rs          |  2 +-
 helix-view/src/gutter.rs            |  8 +++-----
 helix-view/src/input.rs             |  2 +-
 helix-view/src/view.rs              |  2 +-
 xtask/src/themelint.rs              |  2 +-
 18 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/helix-core/src/comment.rs b/helix-core/src/comment.rs
index ec5d7a45..6241f7fd 100644
--- a/helix-core/src/comment.rs
+++ b/helix-core/src/comment.rs
@@ -68,7 +68,7 @@ pub fn toggle_line_comments(doc: &Rope, selection: &Selection, token: Option<&st
     let mut min_next_line = 0;
     for selection in selection {
         let (start, end) = selection.line_range(text);
-        let start = start.max(min_next_line).min(text.len_lines());
+        let start = start.clamp(min_next_line, text.len_lines());
         let end = (end + 1).min(text.len_lines());
 
         lines.extend(start..end);
diff --git a/helix-core/src/increment/integer.rs b/helix-core/src/increment/integer.rs
index 30803e17..0dfabc0d 100644
--- a/helix-core/src/increment/integer.rs
+++ b/helix-core/src/increment/integer.rs
@@ -69,8 +69,8 @@ pub fn increment(selected_text: &str, amount: i64) -> Option<String> {
                 let (lower_count, upper_count): (usize, usize) =
                     number.chars().fold((0, 0), |(lower, upper), c| {
                         (
-                            lower + c.is_ascii_lowercase().then(|| 1).unwrap_or(0),
-                            upper + c.is_ascii_uppercase().then(|| 1).unwrap_or(0),
+                            lower + c.is_ascii_lowercase() as usize,
+                            upper + c.is_ascii_uppercase() as usize,
                         )
                     });
                 if upper_count > lower_count {
diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index d6aa5edb..3aa59fa3 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -604,7 +604,7 @@ pub fn treesitter_indent_for_pos(
                 &mut cursor,
                 text,
                 query_range,
-                new_line.then(|| (line, byte_pos)),
+                new_line.then_some((line, byte_pos)),
             );
             ts_parser.cursors.push(cursor);
             (query_result, deepest_preceding)
@@ -624,7 +624,7 @@ pub fn treesitter_indent_for_pos(
             tab_width,
         );
     }
-    let mut first_in_line = get_first_in_line(node, new_line.then(|| byte_pos));
+    let mut first_in_line = get_first_in_line(node, new_line.then_some(byte_pos));
 
     let mut result = Indentation::default();
     // We always keep track of all the indent changes on one line, in order to only indent once
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index ca4da3dc..1b6c1b1d 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -427,7 +427,7 @@ impl TextObjectQuery {
                 let nodes: Vec<_> = mat
                     .captures
                     .iter()
-                    .filter_map(|cap| (cap.index == capture_idx).then(|| cap.node))
+                    .filter_map(|cap| (cap.index == capture_idx).then_some(cap.node))
                     .collect();
 
                 if nodes.len() > 1 {
diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 365c6990..cb6e5d81 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -628,7 +628,7 @@ impl Client {
         Some(self.notify::<lsp::notification::DidSaveTextDocument>(
             lsp::DidSaveTextDocumentParams {
                 text_document,
-                text: include_text.then(|| text.into()),
+                text: include_text.then_some(text.into()),
             },
         ))
     }
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index d7d87b5a..84daaef4 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -959,9 +959,11 @@ fn goto_window(cx: &mut Context, align: Align) {
         Align::Bottom => {
             view.offset.vertical_offset + last_visual_line.saturating_sub(scrolloff + count)
         }
-    }
-    .max(view.offset.vertical_offset + scrolloff)
-    .min(view.offset.vertical_offset + last_visual_line.saturating_sub(scrolloff));
+    };
+    let visual_line = visual_line.clamp(
+        view.offset.vertical_offset + scrolloff,
+        view.offset.vertical_offset + last_visual_line.saturating_sub(scrolloff),
+    );
 
     let pos = view
         .pos_at_visual_coords(doc, visual_line as u16, 0, false)
diff --git a/helix-term/src/lib.rs b/helix-term/src/lib.rs
index f0bc9129..2f6ec12b 100644
--- a/helix-term/src/lib.rs
+++ b/helix-term/src/lib.rs
@@ -42,7 +42,7 @@ fn filter_picker_entry(entry: &DirEntry, root: &Path, dedup_symlinks: bool) -> b
             .path()
             .canonicalize()
             .ok()
-            .map_or(false, |path| !path.starts_with(&root));
+            .map_or(false, |path| !path.starts_with(root));
     }
 
     true
diff --git a/helix-term/src/ui/document.rs b/helix-term/src/ui/document.rs
index ddbb2cf3..ed4b1de9 100644
--- a/helix-term/src/ui/document.rs
+++ b/helix-term/src/ui/document.rs
@@ -402,7 +402,7 @@ impl<'a> TextRenderer<'a> {
         is_in_indent_area: &mut bool,
         position: Position,
     ) {
-        let cut_off_start = self.col_offset.saturating_sub(position.col as usize);
+        let cut_off_start = self.col_offset.saturating_sub(position.col);
         let is_whitespace = grapheme.is_whitespace();
 
         // TODO is it correct to apply the whitspace style to all unicode white spaces?
@@ -413,7 +413,7 @@ impl<'a> TextRenderer<'a> {
         let width = grapheme.width();
         let grapheme = match grapheme {
             Grapheme::Tab { width } => {
-                let grapheme_tab_width = char_to_byte_idx(&self.tab, width as usize);
+                let grapheme_tab_width = char_to_byte_idx(&self.tab, width);
                 &self.tab[..grapheme_tab_width]
             }
             // TODO special rendering for other whitespaces?
@@ -423,8 +423,8 @@ impl<'a> TextRenderer<'a> {
             Grapheme::Newline => &self.newline,
         };
 
-        let in_bounds = self.col_offset <= (position.col as usize)
-            && (position.col as usize) < self.viewport.width as usize + self.col_offset;
+        let in_bounds = self.col_offset <= position.col
+            && position.col < self.viewport.width as usize + self.col_offset;
 
         if in_bounds {
             self.surface.set_string(
@@ -433,10 +433,10 @@ impl<'a> TextRenderer<'a> {
                 grapheme,
                 style,
             );
-        } else if cut_off_start != 0 && cut_off_start < width as usize {
+        } else if cut_off_start != 0 && cut_off_start < width {
             // partially on screen
             let rect = Rect::new(
-                self.viewport.x as u16,
+                self.viewport.x,
                 self.viewport.y + position.row as u16,
                 (width - cut_off_start) as u16,
                 1,
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 493f8d50..59f371bd 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -206,7 +206,7 @@ impl EditorView {
             highlights,
             theme,
             &mut line_decorations,
-            &mut *translated_positions,
+            &mut translated_positions,
         );
         Self::render_rulers(editor, doc, view, inner, surface, theme);
 
@@ -723,12 +723,7 @@ impl EditorView {
         let viewport = view.area;
 
         let line_decoration = move |renderer: &mut TextRenderer, pos: LinePos| {
-            let area = Rect::new(
-                viewport.x,
-                viewport.y + pos.visual_line as u16,
-                viewport.width,
-                1,
-            );
+            let area = Rect::new(viewport.x, viewport.y + pos.visual_line, viewport.width, 1);
             if primary_line == pos.doc_line {
                 renderer.surface.set_style(area, primary_style);
             } else if secondary_lines.binary_search(&pos.doc_line).is_ok() {
diff --git a/helix-term/src/ui/fuzzy_match.rs b/helix-term/src/ui/fuzzy_match.rs
index e6a3f03a..b406702f 100644
--- a/helix-term/src/ui/fuzzy_match.rs
+++ b/helix-term/src/ui/fuzzy_match.rs
@@ -25,7 +25,7 @@ impl QueryAtom {
             _ => QueryAtomKind::Fuzzy,
         };
 
-        if atom.starts_with(&['^', '\'']) {
+        if atom.starts_with(['^', '\'']) {
             atom.remove(0);
         }
 
diff --git a/helix-vcs/src/git/test.rs b/helix-vcs/src/git/test.rs
index d6e9af08..6b1aba7f 100644
--- a/helix-vcs/src/git/test.rs
+++ b/helix-vcs/src/git/test.rs
@@ -89,7 +89,7 @@ fn directory() {
     std::fs::create_dir(&dir).expect("");
     let file = dir.join("file.txt");
     let contents = b"foo".as_slice();
-    File::create(&file).unwrap().write_all(contents).unwrap();
+    File::create(file).unwrap().write_all(contents).unwrap();
 
     create_commit(temp_git.path(), true);
 
diff --git a/helix-view/src/base64.rs b/helix-view/src/base64.rs
index a0dc167f..13ee919d 100644
--- a/helix-view/src/base64.rs
+++ b/helix-view/src/base64.rs
@@ -36,7 +36,7 @@ const LOW_SIX_BITS: u32 = 0x3F;
 pub fn encode(input: &[u8]) -> String {
     let rem = input.len() % 3;
     let complete_chunks = input.len() / 3;
-    let remainder_chunk = if rem == 0 { 0 } else { 1 };
+    let remainder_chunk = usize::from(rem != 0);
     let encoded_size = (complete_chunks + remainder_chunk) * 4;
 
     let mut output = vec![0; encoded_size];
diff --git a/helix-view/src/clipboard.rs b/helix-view/src/clipboard.rs
index 96c87d3f..d43d632a 100644
--- a/helix-view/src/clipboard.rs
+++ b/helix-view/src/clipboard.rs
@@ -258,7 +258,7 @@ pub mod provider {
                 .args(args)
                 .output()
                 .ok()
-                .and_then(|out| out.status.success().then(|| ())) // TODO: use then_some when stabilized
+                .and_then(|out| out.status.success().then_some(()))
                 .is_some()
         }
 
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index d308d013..11a0dbf8 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -1096,7 +1096,7 @@ impl Document {
     /// Language server if it has been initialized.
     pub fn language_server(&self) -> Option<&helix_lsp::Client> {
         let server = self.language_server.as_deref()?;
-        server.is_initialized().then(|| server)
+        server.is_initialized().then_some(server)
     }
 
     pub fn diff_handle(&self) -> Option<&DiffHandle> {
diff --git a/helix-view/src/gutter.rs b/helix-view/src/gutter.rs
index 90c94d55..cb9e4333 100644
--- a/helix-view/src/gutter.rs
+++ b/helix-view/src/gutter.rs
@@ -7,9 +7,8 @@ use crate::{
 };
 
 fn count_digits(n: usize) -> usize {
-    // NOTE: if int_log gets standardized in stdlib, can use checked_log10
-    // (https://github.com/rust-lang/rust/issues/70887#issue)
-    std::iter::successors(Some(n), |&n| (n >= 10).then(|| n / 10)).count()
+    // TODO: use checked_log10 when MSRV reaches 1.67
+    std::iter::successors(Some(n), |&n| (n >= 10).then_some(n / 10)).count()
 }
 
 pub type GutterFn<'doc> = Box<dyn FnMut(usize, bool, bool, &mut String) -> Option<Style> + 'doc>;
@@ -199,8 +198,7 @@ pub fn line_numbers<'doc>(
                     write!(out, "{:>1$}", " ", width).unwrap();
                 }
 
-                // TODO: Use then_some when MSRV reaches 1.62
-                first_visual_line.then(|| style)
+                first_visual_line.then_some(style)
             }
         },
     )
diff --git a/helix-view/src/input.rs b/helix-view/src/input.rs
index bda0520e..d8832adc 100644
--- a/helix-view/src/input.rs
+++ b/helix-view/src/input.rs
@@ -380,7 +380,7 @@ impl std::str::FromStr for KeyEvent {
                 let function: String = function.chars().skip(1).collect();
                 let function = str::parse::<u8>(&function)?;
                 (function > 0 && function < 13)
-                    .then(|| KeyCode::F(function))
+                    .then_some(KeyCode::F(function))
                     .ok_or_else(|| anyhow!("Invalid function key '{}'", function))?
             }
             invalid => return Err(anyhow!("Invalid key code '{}'", invalid)),
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index 660cce65..f793cbe3 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -243,7 +243,7 @@ impl View {
                 true
             }
             Some((visual_pos, _)) if visual_pos.row >= vertical_viewport_end - scrolloff => {
-                if CENTERING && visual_pos.row >= vertical_viewport_end as usize {
+                if CENTERING && visual_pos.row >= vertical_viewport_end {
                     // cursor out of view
                     return None;
                 }
diff --git a/xtask/src/themelint.rs b/xtask/src/themelint.rs
index e9980574..2a5ef4b7 100644
--- a/xtask/src/themelint.rs
+++ b/xtask/src/themelint.rs
@@ -156,7 +156,7 @@ pub fn lint(file: String) -> Result<(), DynError> {
         return Ok(());
     }
     let path = path::themes().join(file.clone() + ".toml");
-    let theme = std::fs::read_to_string(&path).unwrap();
+    let theme = std::fs::read_to_string(path).unwrap();
     let theme: Theme = toml::from_str(&theme).expect("Failed to parse theme");
 
     let mut messages: Vec<String> = vec![];

From 189c3c2ddc60fb0eb7d15496099d46baec514732 Mon Sep 17 00:00:00 2001
From: ath3 <45574139+ath3@users.noreply.github.com>
Date: Fri, 10 Feb 2023 18:12:46 +0100
Subject: [PATCH 861/884] Add tree-sitter-passwd (#4959)

---
 book/src/generated/lang-support.md    |  1 +
 languages.toml                        | 10 ++++++++++
 runtime/queries/passwd/highlights.scm |  7 +++++++
 3 files changed, 18 insertions(+)
 create mode 100644 runtime/queries/passwd/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 0ad6dedb..368b178f 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -93,6 +93,7 @@
 | openscad | ✓ |  |  | `openscad-lsp` |
 | org | ✓ |  |  |  |
 | pascal | ✓ | ✓ |  | `pasls` |
+| passwd | ✓ |  |  |  |
 | pem | ✓ |  |  |  |
 | perl | ✓ | ✓ | ✓ |  |
 | php | ✓ | ✓ | ✓ | `intelephense` |
diff --git a/languages.toml b/languages.toml
index 9ecd1b78..1eb8f3c3 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2146,3 +2146,13 @@ grammar = "pem"
 [[grammar]]
 name = "pem"
 source = { git = "https://github.com/mtoohey31/tree-sitter-pem", rev = "be67a4330a1aa507c7297bc322204f936ec1132c" }
+
+[[language]]
+name = "passwd"
+scope = "source.passwd"
+file-types = ["passwd"]
+roots = []
+
+[[grammar]]
+name = "passwd"
+source = { git = "https://github.com/ath3/tree-sitter-passwd", rev = "20239395eacdc2e0923a7e5683ad3605aee7b716" }
diff --git a/runtime/queries/passwd/highlights.scm b/runtime/queries/passwd/highlights.scm
new file mode 100644
index 00000000..00751750
--- /dev/null
+++ b/runtime/queries/passwd/highlights.scm
@@ -0,0 +1,7 @@
+(user) @namespace
+(auth) @keyword
+(uid) @constant
+(gid) @constant
+(gecos) @string
+(home) @variable
+(shell) @attribute

From 1840d775c8d5207f08b0fcc3f2325e337369efe8 Mon Sep 17 00:00:00 2001
From: ath3 <45574139+ath3@users.noreply.github.com>
Date: Fri, 10 Feb 2023 18:32:04 +0100
Subject: [PATCH 862/884] Added tree-sitter-hosts (#4950)

---
 book/src/generated/lang-support.md   |  1 +
 languages.toml                       | 10 ++++++++++
 runtime/queries/hosts/highlights.scm |  3 +++
 3 files changed, 14 insertions(+)
 create mode 100644 runtime/queries/hosts/highlights.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 368b178f..e6b68c8c 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -56,6 +56,7 @@
 | haskell | ✓ | ✓ |  | `haskell-language-server-wrapper` |
 | hcl | ✓ |  | ✓ | `terraform-ls` |
 | heex | ✓ | ✓ |  | `elixir-ls` |
+| hosts | ✓ |  |  |  |
 | html | ✓ |  |  | `vscode-html-language-server` |
 | idris |  |  |  | `idris2-lsp` |
 | iex | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 1eb8f3c3..c84a62b0 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2156,3 +2156,13 @@ roots = []
 [[grammar]]
 name = "passwd"
 source = { git = "https://github.com/ath3/tree-sitter-passwd", rev = "20239395eacdc2e0923a7e5683ad3605aee7b716" }
+
+[[language]]
+name = "hosts"
+scope = "source.hosts"
+file-types = ["hosts"]
+roots = []
+
+[[grammar]]
+name = "hosts"
+source = { git = "https://github.com/ath3/tree-sitter-hosts", rev = "301b9379ce7dfc8bdbe2c2699a6887dcb73953f9" }
diff --git a/runtime/queries/hosts/highlights.scm b/runtime/queries/hosts/highlights.scm
new file mode 100644
index 00000000..9d069031
--- /dev/null
+++ b/runtime/queries/hosts/highlights.scm
@@ -0,0 +1,3 @@
+(comment) @comment
+(ip) @namespace
+(host) @string

From ea3293b4daaa472c363105e3c2c2666a2af82ffc Mon Sep 17 00:00:00 2001
From: Colton Clemmer <cole.clemmer@gmail.com>
Date: Fri, 10 Feb 2023 11:34:18 -0600
Subject: [PATCH 863/884] Split modification indicator from file statusline
 elements (#4731)

---
 helix-term/src/ui/statusline.rs | 29 +++++++++++++++++++----------
 helix-view/src/editor.rs        | 10 +++++++++-
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index a25b4540..dbb513f8 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -141,6 +141,9 @@ where
         helix_view::editor::StatusLineElement::Spinner => render_lsp_spinner,
         helix_view::editor::StatusLineElement::FileBaseName => render_file_base_name,
         helix_view::editor::StatusLineElement::FileName => render_file_name,
+        helix_view::editor::StatusLineElement::FileModificationIndicator => {
+            render_file_modification_indicator
+        }
         helix_view::editor::StatusLineElement::FileEncoding => render_file_encoding,
         helix_view::editor::StatusLineElement::FileLineEnding => render_file_line_ending,
         helix_view::editor::StatusLineElement::FileType => render_file_type,
@@ -417,16 +420,26 @@ where
             .as_ref()
             .map(|p| p.to_string_lossy())
             .unwrap_or_else(|| SCRATCH_BUFFER_NAME.into());
-        format!(
-            " {}{} ",
-            path,
-            if context.doc.is_modified() { "[+]" } else { "" }
-        )
+        format!(" {} ", path)
     };
 
     write(context, title, None);
 }
 
+fn render_file_modification_indicator<F>(context: &mut RenderContext, write: F)
+where
+    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
+{
+    let title = (if context.doc.is_modified() {
+        "[+]"
+    } else {
+        "   "
+    })
+    .to_string();
+
+    write(context, title, None);
+}
+
 fn render_file_base_name<F>(context: &mut RenderContext, write: F)
 where
     F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
@@ -437,11 +450,7 @@ where
             .as_ref()
             .and_then(|p| p.as_path().file_name().map(|s| s.to_string_lossy()))
             .unwrap_or_else(|| SCRATCH_BUFFER_NAME.into());
-        format!(
-            " {}{} ",
-            path,
-            if context.doc.is_modified() { "[+]" } else { "" }
-        )
+        format!(" {} ", path)
     };
 
     write(context, title, None);
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 042f5bdb..50da3dde 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -414,7 +414,12 @@ impl Default for StatusLineConfig {
         use StatusLineElement as E;
 
         Self {
-            left: vec![E::Mode, E::Spinner, E::FileName],
+            left: vec![
+                E::Mode,
+                E::Spinner,
+                E::FileName,
+                E::FileModificationIndicator,
+            ],
             center: vec![],
             right: vec![E::Diagnostics, E::Selections, E::Position, E::FileEncoding],
             separator: String::from("│"),
@@ -456,6 +461,9 @@ pub enum StatusLineElement {
     /// The relative file path, including a dirty flag if it's unsaved
     FileName,
 
+    // The file modification indicator
+    FileModificationIndicator,
+
     /// The file encoding
     FileEncoding,
 

From af1157f37c04e158b96f3e2da7c641356b2219dc Mon Sep 17 00:00:00 2001
From: lesleyrs <19632758+lesleyrs@users.noreply.github.com>
Date: Fri, 10 Feb 2023 18:56:56 +0100
Subject: [PATCH 864/884] Add exit code to command failed msg (#5898)

---
 helix-term/src/commands.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 84daaef4..38a62364 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -5043,7 +5043,10 @@ async fn shell_impl_async(
             log::error!("Shell error: {}", err);
             bail!("Shell error: {}", err);
         }
-        bail!("Shell command failed");
+        match output.status.code() {
+            Some(exit_code) => bail!("Shell command failed: status {}", exit_code),
+            None => bail!("Shell command failed"),
+        }
     } else if !output.stderr.is_empty() {
         log::debug!(
             "Command printed to stderr: {}",

From 6929a12f291fa5dee50cde9c89845b206b7333fd Mon Sep 17 00:00:00 2001
From: Daniel S Poulin <dan.poulin@digitalsurgeons.com>
Date: Fri, 10 Feb 2023 14:52:57 -0500
Subject: [PATCH 865/884] Make `m` textobject look for pairs enclosing
 selections (#3344)

* Make `m` textobject look for pairs enclosing selections

Right now, this textobject only looks for pairs that surround the
cursor. This ensures that the pair found encloses each selection, which
is likely to be intuitively what is expected of this textobject.

* Simplification of match code

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Adjust logic for ensuring surround range encloses selection

Prior, it was missing the case where the start of the selection came
before the opening brace. We also had an off-by-one error where if the
end of the selection was on the closing brace it would not work.

* Refactor to search for the open pair specifically to avoid edge cases

* Adjust wording of autoinfo to reflect new functionality

* Implement tests for surround functionality in new integration style

* Fix handling of skip values

* Fix out of bounds error

* Add `ma` version of tests

* Fix formatting of tests

* Reduce indentation levels for readability, and update comments

* Preserve each selection's direction with enclosing pair surround

* Add test case for multiple cursors resulting in overlap

* Mark known failures as TODO

* Make tests multi-threaded or they fail

* Cargo fmt

* Fix typos in integration test comments

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
---
 helix-core/src/surround.rs        | 149 +++++----------
 helix-core/src/textobject.rs      |  16 +-
 helix-term/src/commands.rs        |   2 +-
 helix-term/tests/test/movement.rs | 301 ++++++++++++++++++++++++++++++
 4 files changed, 361 insertions(+), 107 deletions(-)

diff --git a/helix-core/src/surround.rs b/helix-core/src/surround.rs
index a3de3cd1..64d48c13 100644
--- a/helix-core/src/surround.rs
+++ b/helix-core/src/surround.rs
@@ -1,6 +1,6 @@
 use std::fmt::Display;
 
-use crate::{search, Range, Selection};
+use crate::{movement::Direction, search, Range, Selection};
 use ropey::RopeSlice;
 
 pub const PAIRS: &[(char, char)] = &[
@@ -55,15 +55,18 @@ pub fn get_pair(ch: char) -> (char, char) {
 pub fn find_nth_closest_pairs_pos(
     text: RopeSlice,
     range: Range,
-    n: usize,
+    mut skip: usize,
 ) -> Result<(usize, usize)> {
     let is_open_pair = |ch| PAIRS.iter().any(|(open, _)| *open == ch);
     let is_close_pair = |ch| PAIRS.iter().any(|(_, close)| *close == ch);
 
     let mut stack = Vec::with_capacity(2);
-    let pos = range.cursor(text);
+    let pos = range.from();
+    let mut close_pos = pos.saturating_sub(1);
 
     for ch in text.chars_at(pos) {
+        close_pos += 1;
+
         if is_open_pair(ch) {
             // Track open pairs encountered so that we can step over
             // the corresponding close pairs that will come up further
@@ -71,20 +74,46 @@ pub fn find_nth_closest_pairs_pos(
             // open pair is before the cursor position.
             stack.push(ch);
             continue;
-        } else if is_close_pair(ch) {
-            let (open, _) = get_pair(ch);
-            if stack.last() == Some(&open) {
-                stack.pop();
-                continue;
-            } else {
-                // In the ideal case the stack would be empty here and the
-                // current character would be the close pair that we are
-                // looking for. It could also be the case that the pairs
-                // are unbalanced and we encounter a close pair that doesn't
-                // close the last seen open pair. In either case use this
-                // char as the auto-detected closest pair.
-                return find_nth_pairs_pos(text, ch, range, n);
+        }
+
+        if !is_close_pair(ch) {
+            // We don't care if this character isn't a brace pair item,
+            // so short circuit here.
+            continue;
+        }
+
+        let (open, close) = get_pair(ch);
+
+        if stack.last() == Some(&open) {
+            // If we are encountering the closing pair for an opener
+            // we just found while traversing, then its inside the
+            // selection and should be skipped over.
+            stack.pop();
+            continue;
+        }
+
+        match find_nth_open_pair(text, open, close, close_pos, 1) {
+            // Before we accept this pair, we want to ensure that the
+            // pair encloses the range rather than just the cursor.
+            Some(open_pos)
+                if open_pos <= pos.saturating_add(1)
+                    && close_pos >= range.to().saturating_sub(1) =>
+            {
+                // Since we have special conditions for when to
+                // accept, we can't just pass the skip parameter on
+                // through to the find_nth_*_pair methods, so we
+                // track skips manually here.
+                if skip > 1 {
+                    skip -= 1;
+                    continue;
+                }
+
+                return match range.direction() {
+                    Direction::Forward => Ok((open_pos, close_pos)),
+                    Direction::Backward => Ok((close_pos, open_pos)),
+                };
             }
+            _ => continue,
         }
     }
 
@@ -244,94 +273,6 @@ mod test {
     use ropey::Rope;
     use smallvec::SmallVec;
 
-    #[allow(clippy::type_complexity)]
-    fn check_find_nth_pair_pos(
-        text: &str,
-        cases: Vec<(usize, char, usize, Result<(usize, usize)>)>,
-    ) {
-        let doc = Rope::from(text);
-        let slice = doc.slice(..);
-
-        for (cursor_pos, ch, n, expected_range) in cases {
-            let range = find_nth_pairs_pos(slice, ch, (cursor_pos, cursor_pos + 1).into(), n);
-            assert_eq!(
-                range, expected_range,
-                "Expected {:?}, got {:?}",
-                expected_range, range
-            );
-        }
-    }
-
-    #[test]
-    fn test_find_nth_pairs_pos() {
-        check_find_nth_pair_pos(
-            "some (text) here",
-            vec![
-                // cursor on [t]ext
-                (6, '(', 1, Ok((5, 10))),
-                (6, ')', 1, Ok((5, 10))),
-                // cursor on so[m]e
-                (2, '(', 1, Err(Error::PairNotFound)),
-                // cursor on bracket itself
-                (5, '(', 1, Ok((5, 10))),
-                (10, '(', 1, Ok((5, 10))),
-            ],
-        );
-    }
-
-    #[test]
-    fn test_find_nth_pairs_pos_skip() {
-        check_find_nth_pair_pos(
-            "(so (many (good) text) here)",
-            vec![
-                // cursor on go[o]d
-                (13, '(', 1, Ok((10, 15))),
-                (13, '(', 2, Ok((4, 21))),
-                (13, '(', 3, Ok((0, 27))),
-            ],
-        );
-    }
-
-    #[test]
-    fn test_find_nth_pairs_pos_same() {
-        check_find_nth_pair_pos(
-            "'so 'many 'good' text' here'",
-            vec![
-                // cursor on go[o]d
-                (13, '\'', 1, Ok((10, 15))),
-                (13, '\'', 2, Ok((4, 21))),
-                (13, '\'', 3, Ok((0, 27))),
-                // cursor on the quotes
-                (10, '\'', 1, Err(Error::CursorOnAmbiguousPair)),
-            ],
-        )
-    }
-
-    #[test]
-    fn test_find_nth_pairs_pos_step() {
-        check_find_nth_pair_pos(
-            "((so)((many) good (text))(here))",
-            vec![
-                // cursor on go[o]d
-                (15, '(', 1, Ok((5, 24))),
-                (15, '(', 2, Ok((0, 31))),
-            ],
-        )
-    }
-
-    #[test]
-    fn test_find_nth_pairs_pos_mixed() {
-        check_find_nth_pair_pos(
-            "(so [many {good} text] here)",
-            vec![
-                // cursor on go[o]d
-                (13, '{', 1, Ok((10, 15))),
-                (13, '[', 1, Ok((4, 21))),
-                (13, '(', 1, Ok((0, 27))),
-            ],
-        )
-    }
-
     #[test]
     fn test_get_surround_pos() {
         let doc = Rope::from("(some) (chars)\n(newline)");
diff --git a/helix-core/src/textobject.rs b/helix-core/src/textobject.rs
index 76c6d103..972a80e7 100644
--- a/helix-core/src/textobject.rs
+++ b/helix-core/src/textobject.rs
@@ -231,8 +231,20 @@ fn textobject_pair_surround_impl(
     };
     pair_pos
         .map(|(anchor, head)| match textobject {
-            TextObject::Inside => Range::new(next_grapheme_boundary(slice, anchor), head),
-            TextObject::Around => Range::new(anchor, next_grapheme_boundary(slice, head)),
+            TextObject::Inside => {
+                if anchor < head {
+                    Range::new(next_grapheme_boundary(slice, anchor), head)
+                } else {
+                    Range::new(anchor, next_grapheme_boundary(slice, head))
+                }
+            }
+            TextObject::Around => {
+                if anchor < head {
+                    Range::new(anchor, next_grapheme_boundary(slice, head))
+                } else {
+                    Range::new(next_grapheme_boundary(slice, anchor), head)
+                }
+            }
             TextObject::Movement => unreachable!(),
         })
         .unwrap_or(range)
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 38a62364..f8a96074 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4791,7 +4791,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
         ("a", "Argument/parameter (tree-sitter)"),
         ("c", "Comment (tree-sitter)"),
         ("T", "Test (tree-sitter)"),
-        ("m", "Closest surrounding pair to cursor"),
+        ("m", "Closest surrounding pair"),
         (" ", "... or any character acting as a pair"),
     ];
 
diff --git a/helix-term/tests/test/movement.rs b/helix-term/tests/test/movement.rs
index fedf4b0e..e6ea3f95 100644
--- a/helix-term/tests/test/movement.rs
+++ b/helix-term/tests/test/movement.rs
@@ -64,6 +64,307 @@ async fn insert_to_normal_mode_cursor_position() -> anyhow::Result<()> {
     Ok(())
 }
 
+#[tokio::test(flavor = "multi_thread")]
+async fn surround_by_character() -> anyhow::Result<()> {
+    // Only pairs matching the passed character count
+    test((
+        "(so [many {go#[o|]#d} text] here)",
+        "mi{",
+        "(so [many {#[good|]#} text] here)",
+    ))
+    .await?;
+    test((
+        "(so [many {go#[o|]#d} text] here)",
+        "mi[",
+        "(so [#[many {good} text|]#] here)",
+    ))
+    .await?;
+    test((
+        "(so [many {go#[o|]#d} text] here)",
+        "mi(",
+        "(#[so [many {good} text] here|]#)",
+    ))
+    .await?;
+
+    // Works with characters that aren't pairs too
+    test((
+        "'so 'many 'go#[o|]#d' text' here'",
+        "mi'",
+        "'so 'many '#[good|]#' text' here'",
+    ))
+    .await?;
+    test((
+        "'so 'many 'go#[o|]#d' text' here'",
+        "2mi'",
+        "'so '#[many 'good' text|]#' here'",
+    ))
+    .await?;
+    test((
+        "'so \"many 'go#[o|]#d' text\" here'",
+        "mi\"",
+        "'so \"#[many 'good' text|]#\" here'",
+    ))
+    .await?;
+
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn surround_inside_pair() -> anyhow::Result<()> {
+    // Works at first character of buffer
+    // TODO: Adjust test when opening pair failure is fixed
+    test(("#[(|]#something)", "mim", "#[(|]#something)")).await?;
+
+    // Inside a valid pair selects pair
+    test(("some (#[t|]#ext) here", "mim", "some (#[text|]#) here")).await?;
+
+    // On pair character selects pair
+    // TODO: Opening pair character is a known failure case that needs addressing
+    // test(("some #[(|]#text) here", "mim", "some (#[text|]#) here")).await?;
+    test(("some (text#[)|]# here", "mim", "some (#[text|]#) here")).await?;
+
+    // No valid pair does nothing
+    test(("so#[m|]#e (text) here", "mim", "so#[m|]#e (text) here")).await?;
+
+    // Count skips to outer pairs
+    test((
+        "(so (many (go#[o|]#d) text) here)",
+        "1mim",
+        "(so (many (#[good|]#) text) here)",
+    ))
+    .await?;
+    test((
+        "(so (many (go#[o|]#d) text) here)",
+        "2mim",
+        "(so (#[many (good) text|]#) here)",
+    ))
+    .await?;
+    test((
+        "(so (many (go#[o|]#d) text) here)",
+        "3mim",
+        "(#[so (many (good) text) here|]#)",
+    ))
+    .await?;
+
+    // Matching pairs outside selection don't match
+    test((
+        "((so)((many) go#[o|]#d (text))(here))",
+        "mim",
+        "((so)(#[(many) good (text)|]#)(here))",
+    ))
+    .await?;
+    test((
+        "((so)((many) go#[o|]#d (text))(here))",
+        "2mim",
+        "(#[(so)((many) good (text))(here)|]#)",
+    ))
+    .await?;
+
+    // Works with mixed braces
+    test((
+        "(so [many {go#[o|]#d} text] here)",
+        "mim",
+        "(so [many {#[good|]#} text] here)",
+    ))
+    .await?;
+    test((
+        "(so [many {go#[o|]#d} text] here)",
+        "2mim",
+        "(so [#[many {good} text|]#] here)",
+    ))
+    .await?;
+    test((
+        "(so [many {go#[o|]#d} text] here)",
+        "3mim",
+        "(#[so [many {good} text] here|]#)",
+    ))
+    .await?;
+
+    // Selection direction is preserved
+    test((
+        "(so [many {go#[|od]#} text] here)",
+        "mim",
+        "(so [many {#[|good]#} text] here)",
+    ))
+    .await?;
+    test((
+        "(so [many {go#[|od]#} text] here)",
+        "2mim",
+        "(so [#[|many {good} text]#] here)",
+    ))
+    .await?;
+    test((
+        "(so [many {go#[|od]#} text] here)",
+        "3mim",
+        "(#[|so [many {good} text] here]#)",
+    ))
+    .await?;
+
+    // Only pairs outside of full selection range are considered
+    test((
+        "(so (many (go#[od) |]#text) here)",
+        "mim",
+        "(so (#[many (good) text|]#) here)",
+    ))
+    .await?;
+    test((
+        "(so (many#[ (go|]#od) text) here)",
+        "mim",
+        "(so (#[many (good) text|]#) here)",
+    ))
+    .await?;
+    test((
+        "(so#[ (many (go|]#od) text) here)",
+        "mim",
+        "(#[so (many (good) text) here|]#)",
+    ))
+    .await?;
+    test((
+        "(so (many (go#[od) text) |]#here)",
+        "mim",
+        "(#[so (many (good) text) here|]#)",
+    ))
+    .await?;
+
+    // Works with multiple cursors
+    test((
+        "(so (many (good) text) #[he|]#re\nso (many (good) text) #(|he)#re)",
+        "mim",
+        "(#[so (many (good) text) here\nso (many (good) text) here|]#)",
+    ))
+    .await?;
+
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn surround_around_pair() -> anyhow::Result<()> {
+    // Works at first character of buffer
+    // TODO: Adjust test when opening pair failure is fixed
+    test(("#[(|]#something)", "mam", "#[(|]#something)")).await?;
+
+    // Inside a valid pair selects pair
+    test(("some (#[t|]#ext) here", "mam", "some #[(text)|]# here")).await?;
+
+    // On pair character selects pair
+    // TODO: Opening pair character is a known failure case that needs addressing
+    // test(("some #[(|]#text) here", "mam", "some #[(text)|]# here")).await?;
+    test(("some (text#[)|]# here", "mam", "some #[(text)|]# here")).await?;
+
+    // No valid pair does nothing
+    test(("so#[m|]#e (text) here", "mam", "so#[m|]#e (text) here")).await?;
+
+    // Count skips to outer pairs
+    test((
+        "(so (many (go#[o|]#d) text) here)",
+        "1mam",
+        "(so (many #[(good)|]# text) here)",
+    ))
+    .await?;
+    test((
+        "(so (many (go#[o|]#d) text) here)",
+        "2mam",
+        "(so #[(many (good) text)|]# here)",
+    ))
+    .await?;
+    test((
+        "(so (many (go#[o|]#d) text) here)",
+        "3mam",
+        "#[(so (many (good) text) here)|]#",
+    ))
+    .await?;
+
+    // Matching pairs outside selection don't match
+    test((
+        "((so)((many) go#[o|]#d (text))(here))",
+        "mam",
+        "((so)#[((many) good (text))|]#(here))",
+    ))
+    .await?;
+    test((
+        "((so)((many) go#[o|]#d (text))(here))",
+        "2mam",
+        "#[((so)((many) good (text))(here))|]#",
+    ))
+    .await?;
+
+    // Works with mixed braces
+    test((
+        "(so [many {go#[o|]#d} text] here)",
+        "mam",
+        "(so [many #[{good}|]# text] here)",
+    ))
+    .await?;
+    test((
+        "(so [many {go#[o|]#d} text] here)",
+        "2mam",
+        "(so #[[many {good} text]|]# here)",
+    ))
+    .await?;
+    test((
+        "(so [many {go#[o|]#d} text] here)",
+        "3mam",
+        "#[(so [many {good} text] here)|]#",
+    ))
+    .await?;
+
+    // Selection direction is preserved
+    test((
+        "(so [many {go#[|od]#} text] here)",
+        "mam",
+        "(so [many #[|{good}]# text] here)",
+    ))
+    .await?;
+    test((
+        "(so [many {go#[|od]#} text] here)",
+        "2mam",
+        "(so #[|[many {good} text]]# here)",
+    ))
+    .await?;
+    test((
+        "(so [many {go#[|od]#} text] here)",
+        "3mam",
+        "#[|(so [many {good} text] here)]#",
+    ))
+    .await?;
+
+    // Only pairs outside of full selection range are considered
+    test((
+        "(so (many (go#[od) |]#text) here)",
+        "mam",
+        "(so #[(many (good) text)|]# here)",
+    ))
+    .await?;
+    test((
+        "(so (many#[ (go|]#od) text) here)",
+        "mam",
+        "(so #[(many (good) text)|]# here)",
+    ))
+    .await?;
+    test((
+        "(so#[ (many (go|]#od) text) here)",
+        "mam",
+        "#[(so (many (good) text) here)|]#",
+    ))
+    .await?;
+    test((
+        "(so (many (go#[od) text) |]#here)",
+        "mam",
+        "#[(so (many (good) text) here)|]#",
+    ))
+    .await?;
+
+    // Works with multiple cursors
+    test((
+        "(so (many (good) text) #[he|]#re\nso (many (good) text) #(|he)#re)",
+        "mam",
+        "#[(so (many (good) text) here\nso (many (good) text) here)|]#",
+    ))
+    .await?;
+
+    Ok(())
+}
+
 /// Ensure the very initial cursor in an opened file is the width of
 /// the first grapheme
 #[tokio::test(flavor = "multi_thread")]

From 93c7afc4ed2b8d848fa2779f43202ba7f837263b Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Sat, 11 Feb 2023 07:50:01 +0100
Subject: [PATCH 866/884] Negotiate LSP Position Encoding (#5894)

So far LSP always required that `PositionEncoding.characters` is an
UTF-16 offset. Now that LSP 3.17 is available in `lsp-types` request
the server to send char offsets (UTF-32) or byte offsets (UTF-8)
instead. For compatability with old servers, UTF-16 remains as the
fallback as required by the standard.
---
 Cargo.lock                     |  4 ++--
 helix-lsp/Cargo.toml           |  2 +-
 helix-lsp/src/client.rs        | 29 ++++++++++++++++++++++++-----
 helix-lsp/src/lib.rs           | 22 +++++++++++++++++-----
 helix-term/src/commands/lsp.rs |  6 +++++-
 5 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1a76beed..2e4ebe20 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1481,9 +1481,9 @@ dependencies = [
 
 [[package]]
 name = "lsp-types"
-version = "0.93.2"
+version = "0.94.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be6e9c7e2d18f651974370d7aff703f9513e0df6e464fd795660edc77e6ca51"
+checksum = "0b63735a13a1f9cd4f4835223d828ed9c2e35c8c5e61837774399f558b6a1237"
 dependencies = [
  "bitflags",
  "serde",
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 0db61ad4..733f9727 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -19,7 +19,7 @@ anyhow = "1.0"
 futures-executor = "0.3"
 futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
 log = "0.4"
-lsp-types = { version = "0.93", features = ["proposed"] }
+lsp-types = { version = "0.94" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index cb6e5d81..2f5b498d 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -6,6 +6,7 @@ use crate::{
 
 use helix_core::{find_root, ChangeSet, Rope};
 use helix_loader::{self, VERSION_AND_GIT_HASH};
+use lsp::PositionEncodingKind;
 use lsp_types as lsp;
 use serde::Deserialize;
 use serde_json::Value;
@@ -32,7 +33,6 @@ pub struct Client {
     server_tx: UnboundedSender<Payload>,
     request_counter: AtomicU64,
     pub(crate) capabilities: OnceCell<lsp::ServerCapabilities>,
-    offset_encoding: OffsetEncoding,
     config: Option<Value>,
     root_path: std::path::PathBuf,
     root_uri: Option<lsp::Url>,
@@ -104,7 +104,6 @@ impl Client {
             server_tx,
             request_counter: AtomicU64::new(0),
             capabilities: OnceCell::new(),
-            offset_encoding: OffsetEncoding::Utf16,
             config,
             req_timeout,
 
@@ -147,7 +146,19 @@ impl Client {
     }
 
     pub fn offset_encoding(&self) -> OffsetEncoding {
-        self.offset_encoding
+        self.capabilities()
+            .position_encoding
+            .as_ref()
+            .and_then(|encoding| match encoding.as_str() {
+                "utf-8" => Some(OffsetEncoding::Utf8),
+                "utf-16" => Some(OffsetEncoding::Utf16),
+                "utf-32" => Some(OffsetEncoding::Utf32),
+                encoding => {
+                    log::error!("Server provided invalid position encording {encoding}, defaulting to utf-16");
+                    None
+                },
+            })
+            .unwrap_or_default()
     }
 
     pub fn config(&self) -> Option<&Value> {
@@ -377,6 +388,14 @@ impl Client {
                     work_done_progress: Some(true),
                     ..Default::default()
                 }),
+                general: Some(lsp::GeneralClientCapabilities {
+                    position_encodings: Some(vec![
+                        PositionEncodingKind::UTF32,
+                        PositionEncodingKind::UTF8,
+                        PositionEncodingKind::UTF16,
+                    ]),
+                    ..Default::default()
+                }),
                 ..Default::default()
             },
             trace: None,
@@ -577,7 +596,7 @@ impl Client {
                 }]
             }
             lsp::TextDocumentSyncKind::INCREMENTAL => {
-                Self::changeset_to_changes(old_text, new_text, changes, self.offset_encoding)
+                Self::changeset_to_changes(old_text, new_text, changes, self.offset_encoding())
             }
             lsp::TextDocumentSyncKind::NONE => return None,
             kind => unimplemented!("{:?}", kind),
@@ -1027,7 +1046,7 @@ impl Client {
             partial_result_params: lsp::PartialResultParams::default(),
         };
 
-        Some(self.call::<lsp::request::WorkspaceSymbol>(params))
+        Some(self.call::<lsp::request::WorkspaceSymbolRequest>(params))
     }
 
     pub fn code_actions(
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index bcaff10a..72456b37 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs
@@ -20,7 +20,6 @@ use std::{
     },
 };
 
-use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use tokio_stream::wrappers::UnboundedReceiverStream;
 
@@ -45,13 +44,14 @@ pub enum Error {
     Other(#[from] anyhow::Error),
 }
 
-#[derive(Clone, Copy, Debug, Serialize, Deserialize)]
+#[derive(Clone, Copy, Debug, Default)]
 pub enum OffsetEncoding {
     /// UTF-8 code units aka bytes
-    #[serde(rename = "utf-8")]
     Utf8,
+    /// UTF-32 code units aka chars
+    Utf32,
     /// UTF-16 code units
-    #[serde(rename = "utf-16")]
+    #[default]
     Utf16,
 }
 
@@ -168,6 +168,11 @@ pub mod util {
                 let line_end = line_end_char_index(&doc.slice(..), pos_line);
                 doc.char_to_utf16_cu(line_start)..doc.char_to_utf16_cu(line_end)
             }
+            OffsetEncoding::Utf32 => {
+                let line_start = doc.line_to_char(pos_line);
+                let line_end = line_end_char_index(&doc.slice(..), pos_line);
+                line_start..line_end
+            }
         };
 
         // The LSP spec demands that the offset is capped to the end of the line
@@ -177,10 +182,10 @@ pub mod util {
             .unwrap_or(line.end)
             .min(line.end);
 
-        // TODO prefer UTF32/char indices to avoid this step
         match offset_encoding {
             OffsetEncoding::Utf8 => doc.try_byte_to_char(pos).ok(),
             OffsetEncoding::Utf16 => doc.try_utf16_cu_to_char(pos).ok(),
+            OffsetEncoding::Utf32 => Some(pos),
         }
     }
 
@@ -205,6 +210,13 @@ pub mod util {
                 let line_start = doc.char_to_utf16_cu(doc.line_to_char(line));
                 let col = doc.char_to_utf16_cu(pos) - line_start;
 
+                lsp::Position::new(line as u32, col as u32)
+            }
+            OffsetEncoding::Utf32 => {
+                let line = doc.char_to_line(pos);
+                let line_start = doc.line_to_char(line);
+                let col = pos - line_start;
+
                 lsp::Position::new(line as u32, col as u32)
             }
         }
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index d12aa436..d1fb32a8 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -1,7 +1,10 @@
 use futures_util::FutureExt;
 use helix_lsp::{
     block_on,
-    lsp::{self, CodeAction, CodeActionOrCommand, DiagnosticSeverity, NumberOrString},
+    lsp::{
+        self, CodeAction, CodeActionOrCommand, CodeActionTriggerKind, DiagnosticSeverity,
+        NumberOrString,
+    },
     util::{diagnostic_to_lsp_diagnostic, lsp_pos_to_pos, lsp_range_to_range, range_to_lsp_range},
     OffsetEncoding,
 };
@@ -561,6 +564,7 @@ pub fn code_action(cx: &mut Context) {
                 .map(|diag| diagnostic_to_lsp_diagnostic(doc.text(), diag, offset_encoding))
                 .collect(),
             only: None,
+            trigger_kind: Some(CodeActionTriggerKind::INVOKED),
         },
     ) {
         Some(future) => future,

From 8e9c3299521cb886e1cd4e18f75ffd8f7b8723f9 Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Mon, 6 Feb 2023 02:57:40 +0530
Subject: [PATCH 867/884] Use early return in rendering completion doc

---
 helix-term/src/ui/completion.rs | 184 ++++++++++++++++----------------
 1 file changed, 93 insertions(+), 91 deletions(-)

diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 90e2fed0..d5f001d1 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -381,104 +381,106 @@ impl Component for Completion {
         self.popup.render(area, surface, cx);
 
         // if we have a selection, render a markdown popup on top/below with info
-        if let Some(option) = self.popup.contents().selection() {
-            // need to render:
-            // option.detail
-            // ---
-            // option.documentation
-
-            let (view, doc) = current!(cx.editor);
-            let language = doc.language_name().unwrap_or("");
-            let text = doc.text().slice(..);
-            let cursor_pos = doc.selection(view.id).primary().cursor(text);
-            let coords = view
-                .screen_coords_at_pos(doc, text, cursor_pos)
-                .expect("cursor must be in view");
-            let cursor_pos = coords.row as u16;
-
-            let mut markdown_doc = match &option.documentation {
-                Some(lsp::Documentation::String(contents))
-                | Some(lsp::Documentation::MarkupContent(lsp::MarkupContent {
-                    kind: lsp::MarkupKind::PlainText,
-                    value: contents,
-                })) => {
-                    // TODO: convert to wrapped text
-                    Markdown::new(
-                        format!(
-                            "```{}\n{}\n```\n{}",
-                            language,
-                            option.detail.as_deref().unwrap_or_default(),
-                            contents
-                        ),
-                        cx.editor.syn_loader.clone(),
-                    )
-                }
-                Some(lsp::Documentation::MarkupContent(lsp::MarkupContent {
-                    kind: lsp::MarkupKind::Markdown,
-                    value: contents,
-                })) => {
-                    // TODO: set language based on doc scope
-                    if let Some(detail) = &option.detail.as_deref() {
-                        Markdown::new(
-                            format!("```{}\n{}\n```\n{}", language, detail, contents),
-                            cx.editor.syn_loader.clone(),
-                        )
-                    } else {
-                        Markdown::new(contents.to_string(), cx.editor.syn_loader.clone())
-                    }
-                }
-                None if option.detail.is_some() => {
-                    // TODO: copied from above
-
-                    // TODO: set language based on doc scope
+        let option = match self.popup.contents().selection() {
+            Some(option) => option,
+            None => return,
+        };
+        // need to render:
+        // option.detail
+        // ---
+        // option.documentation
+
+        let (view, doc) = current!(cx.editor);
+        let language = doc.language_name().unwrap_or("");
+        let text = doc.text().slice(..);
+        let cursor_pos = doc.selection(view.id).primary().cursor(text);
+        let coords = view
+            .screen_coords_at_pos(doc, text, cursor_pos)
+            .expect("cursor must be in view");
+        let cursor_pos = coords.row as u16;
+
+        let mut markdown_doc = match &option.documentation {
+            Some(lsp::Documentation::String(contents))
+            | Some(lsp::Documentation::MarkupContent(lsp::MarkupContent {
+                kind: lsp::MarkupKind::PlainText,
+                value: contents,
+            })) => {
+                // TODO: convert to wrapped text
+                Markdown::new(
+                    format!(
+                        "```{}\n{}\n```\n{}",
+                        language,
+                        option.detail.as_deref().unwrap_or_default(),
+                        contents
+                    ),
+                    cx.editor.syn_loader.clone(),
+                )
+            }
+            Some(lsp::Documentation::MarkupContent(lsp::MarkupContent {
+                kind: lsp::MarkupKind::Markdown,
+                value: contents,
+            })) => {
+                // TODO: set language based on doc scope
+                if let Some(detail) = &option.detail.as_deref() {
                     Markdown::new(
-                        format!(
-                            "```{}\n{}\n```",
-                            language,
-                            option.detail.as_deref().unwrap_or_default(),
-                        ),
+                        format!("```{}\n{}\n```\n{}", language, detail, contents),
                         cx.editor.syn_loader.clone(),
                     )
+                } else {
+                    Markdown::new(contents.to_string(), cx.editor.syn_loader.clone())
                 }
-                None => return,
-            };
+            }
+            None if option.detail.is_some() => {
+                // TODO: copied from above
+
+                // TODO: set language based on doc scope
+                Markdown::new(
+                    format!(
+                        "```{}\n{}\n```",
+                        language,
+                        option.detail.as_deref().unwrap_or_default(),
+                    ),
+                    cx.editor.syn_loader.clone(),
+                )
+            }
+            None => return,
+        };
 
-            let (popup_x, popup_y) = self.popup.get_rel_position(area, cx);
-            let (popup_width, _popup_height) = self.popup.get_size();
-            let mut width = area
-                .width
-                .saturating_sub(popup_x)
-                .saturating_sub(popup_width);
-            let area = if width > 30 {
-                let mut height = area.height.saturating_sub(popup_y);
-                let x = popup_x + popup_width;
-                let y = popup_y;
-
-                if let Some((rel_width, rel_height)) = markdown_doc.required_size((width, height)) {
-                    width = rel_width.min(width);
-                    height = rel_height.min(height);
-                }
-                Rect::new(x, y, width, height)
+        let (popup_x, popup_y) = self.popup.get_rel_position(area, cx);
+        let (popup_width, _popup_height) = self.popup.get_size();
+        let mut width = area
+            .width
+            .saturating_sub(popup_x)
+            .saturating_sub(popup_width);
+        let area = if width > 30 {
+            let mut height = area.height.saturating_sub(popup_y);
+            let x = popup_x + popup_width;
+            let y = popup_y;
+
+            if let Some((rel_width, rel_height)) = markdown_doc.required_size((width, height)) {
+                width = rel_width.min(width);
+                height = rel_height.min(height);
+            }
+            Rect::new(x, y, width, height)
+        } else {
+            let half = area.height / 2;
+            let height = 15.min(half);
+            // we want to make sure the cursor is visible (not hidden behind the documentation)
+            let y = if cursor_pos + area.y
+                >= (cx.editor.tree.area().height - height - 2/* statusline + commandline */)
+            {
+                0
             } else {
-                let half = area.height / 2;
-                let height = 15.min(half);
-                // we want to make sure the cursor is visible (not hidden behind the documentation)
-                let y = if cursor_pos + area.y
-                    >= (cx.editor.tree.area().height - height - 2/* statusline + commandline */)
-                {
-                    0
-                } else {
-                    // -2 to subtract command line + statusline. a bit of a hack, because of splits.
-                    area.height.saturating_sub(height).saturating_sub(2)
-                };
-
-                Rect::new(0, y, area.width, height)
+                // -2 to subtract command line + statusline. a bit of a hack, because of splits.
+                area.height.saturating_sub(height).saturating_sub(2)
             };
 
-            // clear area
-            let background = cx.editor.theme.get("ui.popup");
-            surface.clear_with(area, background);
-            markdown_doc.render(area, surface, cx);
-        }
+            Rect::new(0, y, area.width, height)
+        };
+
+        // clear area
+        let background = cx.editor.theme.get("ui.popup");
+        surface.clear_with(area, background);
+        markdown_doc.render(area, surface, cx);
     }
 }

From 937825e8fc415f2236c5effde7b5543f51fef542 Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Mon, 6 Feb 2023 03:00:52 +0530
Subject: [PATCH 868/884] Rename completion doc popup area variables

---
 helix-term/src/ui/completion.rs | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index d5f001d1..6263106c 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -448,39 +448,42 @@ impl Component for Completion {
 
         let (popup_x, popup_y) = self.popup.get_rel_position(area, cx);
         let (popup_width, _popup_height) = self.popup.get_size();
-        let mut width = area
+        let doc_width_available = area
             .width
             .saturating_sub(popup_x)
             .saturating_sub(popup_width);
-        let area = if width > 30 {
-            let mut height = area.height.saturating_sub(popup_y);
+        let doc_area = if doc_width_available > 30 {
+            let mut doc_width = doc_width_available;
+            let mut doc_height = area.height.saturating_sub(popup_y);
             let x = popup_x + popup_width;
             let y = popup_y;
 
-            if let Some((rel_width, rel_height)) = markdown_doc.required_size((width, height)) {
-                width = rel_width.min(width);
-                height = rel_height.min(height);
+            if let Some((rel_width, rel_height)) =
+                markdown_doc.required_size((doc_width, doc_height))
+            {
+                doc_width = rel_width.min(doc_width);
+                doc_height = rel_height.min(doc_height);
             }
-            Rect::new(x, y, width, height)
+            Rect::new(x, y, doc_width, doc_height)
         } else {
             let half = area.height / 2;
-            let height = 15.min(half);
+            let doc_height = 15.min(half);
             // we want to make sure the cursor is visible (not hidden behind the documentation)
             let y = if cursor_pos + area.y
-                >= (cx.editor.tree.area().height - height - 2/* statusline + commandline */)
+                >= (cx.editor.tree.area().height - doc_height - 2/* statusline + commandline */)
             {
                 0
             } else {
                 // -2 to subtract command line + statusline. a bit of a hack, because of splits.
-                area.height.saturating_sub(height).saturating_sub(2)
+                area.height.saturating_sub(doc_height).saturating_sub(2)
             };
 
-            Rect::new(0, y, area.width, height)
+            Rect::new(0, y, area.width, doc_height)
         };
 
         // clear area
         let background = cx.editor.theme.get("ui.popup");
-        surface.clear_with(area, background);
-        markdown_doc.render(area, surface, cx);
+        surface.clear_with(doc_area, background);
+        markdown_doc.render(doc_area, surface, cx);
     }
 }

From 0f844ef191af69da62c7a65b93db8a7e02cf86ff Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Mon, 6 Feb 2023 03:48:50 +0530
Subject: [PATCH 869/884] Refactor our Markdown construction in completion doc

---
 helix-term/src/ui/completion.rs | 40 +++++++++++----------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 6263106c..7492b065 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -399,6 +399,16 @@ impl Component for Completion {
             .expect("cursor must be in view");
         let cursor_pos = coords.row as u16;
 
+        let markdowned = |lang: &str, detail: Option<&str>, doc: Option<&str>| {
+            let md = match (detail, doc) {
+                (Some(detail), Some(doc)) => format!("```{lang}\n{detail}\n```\n{doc}"),
+                (Some(detail), None) => format!("```{lang}\n{detail}\n```"),
+                (None, Some(doc)) => doc.to_string(),
+                (None, None) => String::new(),
+            };
+            Markdown::new(md, cx.editor.syn_loader.clone())
+        };
+
         let mut markdown_doc = match &option.documentation {
             Some(lsp::Documentation::String(contents))
             | Some(lsp::Documentation::MarkupContent(lsp::MarkupContent {
@@ -406,42 +416,18 @@ impl Component for Completion {
                 value: contents,
             })) => {
                 // TODO: convert to wrapped text
-                Markdown::new(
-                    format!(
-                        "```{}\n{}\n```\n{}",
-                        language,
-                        option.detail.as_deref().unwrap_or_default(),
-                        contents
-                    ),
-                    cx.editor.syn_loader.clone(),
-                )
+                markdowned(language, option.detail.as_deref(), Some(contents))
             }
             Some(lsp::Documentation::MarkupContent(lsp::MarkupContent {
                 kind: lsp::MarkupKind::Markdown,
                 value: contents,
             })) => {
                 // TODO: set language based on doc scope
-                if let Some(detail) = &option.detail.as_deref() {
-                    Markdown::new(
-                        format!("```{}\n{}\n```\n{}", language, detail, contents),
-                        cx.editor.syn_loader.clone(),
-                    )
-                } else {
-                    Markdown::new(contents.to_string(), cx.editor.syn_loader.clone())
-                }
+                markdowned(language, option.detail.as_deref(), Some(contents))
             }
             None if option.detail.is_some() => {
-                // TODO: copied from above
-
                 // TODO: set language based on doc scope
-                Markdown::new(
-                    format!(
-                        "```{}\n{}\n```",
-                        language,
-                        option.detail.as_deref().unwrap_or_default(),
-                    ),
-                    cx.editor.syn_loader.clone(),
-                )
+                markdowned(language, option.detail.as_deref(), None)
             }
             None => return,
         };

From 1562b5ce67fbe4239de3b45d21f5853a4c123b99 Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Mon, 6 Feb 2023 04:53:17 +0530
Subject: [PATCH 870/884] Create popup rect instead of using raw values

---
 helix-term/src/ui/completion.rs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 7492b065..3d354bda 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -432,17 +432,18 @@ impl Component for Completion {
             None => return,
         };
 
-        let (popup_x, popup_y) = self.popup.get_rel_position(area, cx);
-        let (popup_width, _popup_height) = self.popup.get_size();
-        let doc_width_available = area
-            .width
-            .saturating_sub(popup_x)
-            .saturating_sub(popup_width);
+        let popup_area = {
+            let (popup_x, popup_y) = self.popup.get_rel_position(area, cx);
+            let (popup_width, popup_height) = self.popup.get_size();
+            Rect::new(popup_x, popup_y, popup_width, popup_height)
+        };
+
+        let doc_width_available = area.width.saturating_sub(popup_area.right());
         let doc_area = if doc_width_available > 30 {
             let mut doc_width = doc_width_available;
-            let mut doc_height = area.height.saturating_sub(popup_y);
-            let x = popup_x + popup_width;
-            let y = popup_y;
+            let mut doc_height = area.height.saturating_sub(popup_area.top());
+            let x = popup_area.right();
+            let y = popup_area.top();
 
             if let Some((rel_width, rel_height)) =
                 markdown_doc.required_size((doc_width, doc_height))

From 425315d7525759545fa9d164434056b435891ad4 Mon Sep 17 00:00:00 2001
From: Gokul Soumya <gokulps15@gmail.com>
Date: Mon, 6 Feb 2023 04:54:03 +0530
Subject: [PATCH 871/884] Fix completion doc popup area calculation logic

Earlier the doc popup would draw over the compeltion popup
itself and sometimes over the cursor too.
---
 helix-term/src/ui/completion.rs | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 3d354bda..ac434894 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -453,19 +453,25 @@ impl Component for Completion {
             }
             Rect::new(x, y, doc_width, doc_height)
         } else {
-            let half = area.height / 2;
-            let doc_height = 15.min(half);
-            // we want to make sure the cursor is visible (not hidden behind the documentation)
-            let y = if cursor_pos + area.y
-                >= (cx.editor.tree.area().height - doc_height - 2/* statusline + commandline */)
-            {
-                0
+            // Documentation should not cover the cursor or the completion popup
+            // Completion popup could be above or below the current line
+            let avail_height_above = cursor_pos.min(popup_area.top()).saturating_sub(1);
+            let avail_height_below = area
+                .height
+                .saturating_sub(cursor_pos.max(popup_area.bottom()) + 1 /* padding */);
+            let (y, avail_height) = if avail_height_below >= avail_height_above {
+                (
+                    area.height.saturating_sub(avail_height_below),
+                    avail_height_below,
+                )
             } else {
-                // -2 to subtract command line + statusline. a bit of a hack, because of splits.
-                area.height.saturating_sub(doc_height).saturating_sub(2)
+                (0, avail_height_above)
             };
+            if avail_height <= 1 {
+                return;
+            }
 
-            Rect::new(0, y, area.width, doc_height)
+            Rect::new(0, y, area.width, avail_height.min(15))
         };
 
         // clear area

From 3b301a9d1d832d304ff109aa9f5eee025789b3e8 Mon Sep 17 00:00:00 2001
From: Aleksey Kuznetsov <zummenix@gmail.com>
Date: Sat, 11 Feb 2023 15:43:30 +0500
Subject: [PATCH 872/884] Add comment-token to the hosts language definition
 (#5914)

---
 languages.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/languages.toml b/languages.toml
index c84a62b0..311ef689 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2162,6 +2162,7 @@ name = "hosts"
 scope = "source.hosts"
 file-types = ["hosts"]
 roots = []
+comment-token = "#"
 
 [[grammar]]
 name = "hosts"

From a4751db8c7f308494e574429fc862a8deec96a7b Mon Sep 17 00:00:00 2001
From: John DeSilva <desilvjo@umich.edu>
Date: Sat, 11 Feb 2023 17:06:12 -0500
Subject: [PATCH 873/884] Remove outdated tutor note about increment and
 decrement behavior

---
 runtime/tutor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/tutor b/runtime/tutor
index e0b41bcf..a6682ed9 100644
--- a/runtime/tutor
+++ b/runtime/tutor
@@ -830,8 +830,8 @@ lines.
  --> 3) Another point.
  --> 6) Last point.
 
- Note: If there isn't a number under the selection the cursor
-       will jump to the next number in the line and act on it.
+
+
 
 
 =================================================================

From ef221abe83862cfdfcce358bbecc14080824abdb Mon Sep 17 00:00:00 2001
From: Mike Trinkala <trink@acm.org>
Date: Sun, 12 Feb 2023 11:13:22 -0800
Subject: [PATCH 874/884] Prevent a panic when uncommenting a line with only a
 comment token (#5933)

Open a new document `test.rs` and type the following:
`di//<esc><C-c>`

The margin calculation pushes the range out of bounds for the comment
marker when there are no characters (newline) after it.

thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value:
Char range out of bounds: char range 0..3,
Rope/RopeSlice char length 2', ropey-1.6.0/src/rope.rs:546:37

The debug build catches the error in the transaction: thread 'main'
panicked at 'attempt to subtract with overflow',
helix-core/src/transaction.rs:503:26
---
 helix-core/src/comment.rs | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/helix-core/src/comment.rs b/helix-core/src/comment.rs
index 6241f7fd..9c7e50f3 100644
--- a/helix-core/src/comment.rs
+++ b/helix-core/src/comment.rs
@@ -45,7 +45,7 @@ fn find_line_comment(
 
             // determine margin of 0 or 1 for uncommenting; if any comment token is not followed by a space,
             // a margin of 0 is used for all lines.
-            if matches!(line_slice.get_char(pos + token_len), Some(c) if c != ' ') {
+            if !matches!(line_slice.get_char(pos + token_len), Some(c) if c == ' ') {
                 margin = 0;
             }
 
@@ -108,8 +108,8 @@ mod test {
         let text = doc.slice(..);
 
         let res = find_line_comment("//", text, 0..3);
-        // (commented = true, to_change = [line 0, line 2], min = col 2, margin = 1)
-        assert_eq!(res, (false, vec![0, 2], 2, 1));
+        // (commented = true, to_change = [line 0, line 2], min = col 2, margin = 0)
+        assert_eq!(res, (false, vec![0, 2], 2, 0));
 
         // comment
         let transaction = toggle_line_comments(&doc, &selection, None);
@@ -136,6 +136,17 @@ mod test {
         assert_eq!(doc, "  1\n\n  2\n  3");
         assert!(selection.len() == 1); // to ignore the selection unused warning
 
+        // 0 margin comments, with no space
+        doc = Rope::from("//");
+        // reset the selection.
+        selection = Selection::single(0, doc.len_chars() - 1);
+
+        let transaction = toggle_line_comments(&doc, &selection, None);
+        transaction.apply(&mut doc);
+        selection = selection.map(transaction.changes());
+        assert_eq!(doc, "");
+        assert!(selection.len() == 1); // to ignore the selection unused warning
+
         // TODO: account for uncommenting with uneven comment indentation
     }
 }

From c71b4c5579fdc753e62300f5ee6ca5e747a98e13 Mon Sep 17 00:00:00 2001
From: Erasin <erasinoo@gmail.com>
Date: Mon, 13 Feb 2023 04:03:02 +0800
Subject: [PATCH 875/884] Update grammar for godot (#5944)

* update grammar for gdscript.
* add comment injections for gdscript.
* add indent for gdscript
* add file-type support for godot-resource
---
 book/src/generated/lang-support.md            |  2 +-
 languages.toml                                |  4 +--
 runtime/queries/gdscript/indents.scm          | 35 +++++++++++++++++++
 runtime/queries/gdscript/injections.scm       |  2 ++
 runtime/queries/godot-resource/highlights.scm |  3 +-
 runtime/queries/godot-resource/injections.scm |  2 ++
 6 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 runtime/queries/gdscript/indents.scm
 create mode 100644 runtime/queries/gdscript/injections.scm
 create mode 100644 runtime/queries/godot-resource/injections.scm

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index e6b68c8c..c31ddd3d 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -38,7 +38,7 @@
 | esdl | ✓ |  |  |  |
 | fish | ✓ | ✓ | ✓ |  |
 | fortran | ✓ |  | ✓ | `fortls` |
-| gdscript | ✓ | ✓ |  |  |
+| gdscript | ✓ | ✓ | ✓ |  |
 | git-attributes | ✓ |  |  |  |
 | git-commit | ✓ |  |  |  |
 | git-config | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 311ef689..eaf73b41 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1449,13 +1449,13 @@ indent = { tab-width = 4, unit = "\t" }
 
 [[grammar]]
 name = "gdscript"
-source = { git = "https://github.com/PrestonKnopp/tree-sitter-gdscript", rev = "2a6abdaa47fcb91397e09a97c7433fd995ea46c6" }
+source = { git = "https://github.com/PrestonKnopp/tree-sitter-gdscript", rev = "a56a6fcec3fb63ec3324bf9373aae7298861eb30" }
 
 [[language]]
 name = "godot-resource"
 scope = "source.tscn"
 injection-regex = "godot"
-file-types = ["tscn","tres"]
+file-types = ["tscn", "tres", "godot", "gdextension"]
 shebangs = []
 roots = ["project.godot"]
 auto-format = false
diff --git a/runtime/queries/gdscript/indents.scm b/runtime/queries/gdscript/indents.scm
new file mode 100644
index 00000000..1ab41a44
--- /dev/null
+++ b/runtime/queries/gdscript/indents.scm
@@ -0,0 +1,35 @@
+[
+  (if_statement)
+  (for_statement)
+  (while_statement)
+  (match_statement)
+  (pattern_section)
+
+  (function_definition)
+  (constructor_definition)
+  (class_definition)
+  (enum_definition)
+
+  (dictionary (_))
+  (array (_))
+] @indent
+
+[
+  (if_statement)
+  (for_statement)
+  (while_statement)
+  (match_statement)
+  (pattern_section)
+
+  (function_definition)
+  (class_definition)
+] @extend
+
+
+[
+  (return_statement)
+  (break_statement)
+  (continue_statement)
+  (pass_statement)
+] @extend.prevent-once
+
diff --git a/runtime/queries/gdscript/injections.scm b/runtime/queries/gdscript/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/gdscript/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/runtime/queries/godot-resource/highlights.scm b/runtime/queries/godot-resource/highlights.scm
index 18dae41f..d8a69f65 100644
--- a/runtime/queries/godot-resource/highlights.scm
+++ b/runtime/queries/godot-resource/highlights.scm
@@ -25,4 +25,5 @@
 
 "=" @operator
 
-(ERROR) @error
\ No newline at end of file
+(ERROR) @error
+(comment) @comment
diff --git a/runtime/queries/godot-resource/injections.scm b/runtime/queries/godot-resource/injections.scm
new file mode 100644
index 00000000..321c90ad
--- /dev/null
+++ b/runtime/queries/godot-resource/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))

From 87518db1d12ea48a4d2fce7808e24852992b03ee Mon Sep 17 00:00:00 2001
From: Jared Beller <25756846+jbellerb@users.noreply.github.com>
Date: Sun, 12 Feb 2023 21:04:31 -0500
Subject: [PATCH 876/884] dhall: additional highlight queries (#5959)

---
 runtime/queries/dhall/highlights.scm | 108 ++++++++++++++++++++-------
 runtime/queries/dhall/injections.scm |   2 +
 2 files changed, 85 insertions(+), 25 deletions(-)
 create mode 100644 runtime/queries/dhall/injections.scm

diff --git a/runtime/queries/dhall/highlights.scm b/runtime/queries/dhall/highlights.scm
index 52ede310..0663bbd9 100644
--- a/runtime/queries/dhall/highlights.scm
+++ b/runtime/queries/dhall/highlights.scm
@@ -1,52 +1,110 @@
 ;; Literals
-
 (integer_literal) @constant.numeric.integer
 (natural_literal) @constant.numeric.integer
 (double_literal) @constant.numeric.float
 (boolean_literal) @constant.builtin.boolean
+(builtin "None") @constant.builtin
+
+;; Text
 (text_literal) @string
+(interpolation "}" @string)
+(double_quote_escaped) @constant.character.escape
+(single_quote_escaped) @constant.character.escape
+
+;; Imports
 (local_import) @string.special.path
 (http_import) @string.special.url
-(import_hash) @string
+(env_import) @keyword
+(env_variable) @string.special
+(import_hash) @string.special
+(missing_import) @keyword.control.import
+[ (import_as_location) (import_as_text) ] @type
 
 ;; Comments
-[
-  (line_comment)
-  (block_comment)
-] @comment
+(block_comment) @comment.block
+(line_comment) @comment.line
+
+;; Types
+([
+  (let_binding (label) @type)
+  (union_type_entry (label) @type)
+] (#match? @type "^[A-Z]"))
+((primitive_expression
+  (identifier (label) @type)
+  (selector (label) @type)?) @whole_identifier
+  (#match? @whole_identifier "(?:^|\\.)[A-Z][^.]*$"))
+
+;; Variables
+(identifier [
+  (label) @variable
+  (de_bruijn_index) @operator
+])
+(let_binding label: (label) @variable)
+(lambda_expression label: (label) @variable.parameter)
+(record_literal_entry (label) @variable.other.member)
+(record_type_entry (label) @variable.other.member)
+(selector) @variable.other.member
 
 ;; Keywords
 [
-  ("let")
-  ("in")
-  (assign_operator)
+  "let"
+  "in"
+  "assert"
+] @keyword
+[
+  "using"
+  "as"
+  "with"
+] @keyword.operator
+
+;; Operators
+[
   (type_operator)
+  (assign_operator)
   (lambda_operator)
   (arrow_operator)
   (infix_operator)
   (completion_operator)
-  ("using")
-  ("assert")
   (assert_operator)
-  ("as")
   (forall_operator)
-  ("with")
-] @keyword
+  (empty_record_literal)
+] @operator
 
 ;; Builtins
-[
-  (builtin_function)
-  (missing_import)
-] @function.builtin
+(builtin_function) @function.builtin
+(builtin [
+  "Bool"
+  "Optional"
+  "Natural"
+  "Integer"
+  "Double"
+  "Text"
+  "Date"
+  "Time"
+  "TimeZone"
+  "List"
+  "Type"
+  "Kind"
+  "Sort"
+] @type.builtin)
 
-[ 
-  (builtin)
-  (import_as_text)
-] @type.builtin
+;; Punctuation
+[ "," "|" ] @punctuation.delimiter
+(selector_dot) @punctuation.delimiter
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+  "<"
+  ">"
+] @punctuation.bracket
 
 ;; Conditionals
 [
-  ("if")
-  ("then")
-  ("else")
+  "if"
+  "then"
+  "else"
 ] @keyword.control.conditional
diff --git a/runtime/queries/dhall/injections.scm b/runtime/queries/dhall/injections.scm
new file mode 100644
index 00000000..0164f684
--- /dev/null
+++ b/runtime/queries/dhall/injections.scm
@@ -0,0 +1,2 @@
+([(block_comment) (line_comment)] @injection.content
+ (#set! injection.language "comment"))

From 8b09b0094285bb832ab88ac001b1fe631b10bfb1 Mon Sep 17 00:00:00 2001
From: A-Walrus <58790821+A-Walrus@users.noreply.github.com>
Date: Mon, 13 Feb 2023 04:40:31 +0200
Subject: [PATCH 877/884] Add :toggle-option command (#4085)

This command toggles the value of boolean options
---
 book/src/generated/typable-cmd.md |  1 +
 helix-term/src/commands/typed.rs  | 48 +++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md
index 0ff501a3..7416ac32 100644
--- a/book/src/generated/typable-cmd.md
+++ b/book/src/generated/typable-cmd.md
@@ -61,6 +61,7 @@
 | `:goto`, `:g` | Goto line number. |
 | `:set-language`, `:lang` | Set the language of current buffer. |
 | `:set-option`, `:set` | Set a config option at runtime.<br>For example to disable smart case search, use `:set search.smart-case false`. |
+| `:toggle-option`, `:toggle` | Toggle a boolean config option at runtime.<br>For example to toggle smart case search, use `:toggle search.smart-case`. |
 | `:get-option`, `:get` | Get the current value of a config option. |
 | `:sort` | Sort ranges in selection. |
 | `:rsort` | Sort ranges in selection in reverse order. |
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 0cc1b743..6b45b005 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -7,6 +7,7 @@ use super::*;
 
 use helix_core::encoding;
 use helix_view::editor::{Action, CloseError, ConfigEvent};
+use serde_json::Value;
 use ui::completers::{self, Completer};
 
 #[derive(Clone)]
@@ -1646,6 +1647,46 @@ fn set_option(
     Ok(())
 }
 
+/// Toggle boolean config option at runtime. Access nested values by dot
+/// syntax, for example to toggle smart case search, use `:toggle search.smart-
+/// case`.
+fn toggle_option(
+    cx: &mut compositor::Context,
+    args: &[Cow<str>],
+    event: PromptEvent,
+) -> anyhow::Result<()> {
+    if event != PromptEvent::Validate {
+        return Ok(());
+    }
+
+    if args.len() != 1 {
+        anyhow::bail!("Bad arguments. Usage: `:toggle key`");
+    }
+    let key = &args[0].to_lowercase();
+
+    let key_error = || anyhow::anyhow!("Unknown key `{}`", key);
+
+    let mut config = serde_json::json!(&cx.editor.config().deref());
+    let pointer = format!("/{}", key.replace('.', "/"));
+    let value = config.pointer_mut(&pointer).ok_or_else(key_error)?;
+
+    if let Value::Bool(b) = *value {
+        *value = Value::Bool(!b);
+    } else {
+        anyhow::bail!("Key `{}` is not toggle-able", key)
+    }
+
+    // This unwrap should never fail because we only replace one boolean value
+    // with another, maintaining a valid json config
+    let config = serde_json::from_value(config).unwrap();
+
+    cx.editor
+        .config_events
+        .0
+        .send(ConfigEvent::Update(config))?;
+    Ok(())
+}
+
 /// Change the language of the current buffer at runtime.
 fn language(
     cx: &mut compositor::Context,
@@ -2384,6 +2425,13 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
             fun: set_option,
             completer: Some(completers::setting),
         },
+        TypableCommand {
+            name: "toggle-option",
+            aliases: &["toggle"],
+            doc: "Toggle a boolean config option at runtime.\nFor example to toggle smart case search, use `:toggle search.smart-case`.",
+            fun: toggle_option,
+            completer: Some(completers::setting),
+        },
         TypableCommand {
             name: "get-option",
             aliases: &["get"],

From 2bebc5042e5e50a6cd7691f3590184c4499376a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= <matousdzivjak@gmail.com>
Date: Mon, 13 Feb 2023 03:44:31 +0100
Subject: [PATCH 878/884] feat(ui): deprecated completions (#5932)

* feat(ui): deprecated completions

Mark deprecated completions using strike-through
(CROSSED_OUT modifier). The deprection information
is taken either from the `deprecated` field of the
completion item or from the completion tags.

The field seems to be the older way of passing
the deprecated information and it was already
marked as deprecated for Symbol. In completion
item the field is still valid but it seems that
the LSP is moving in the general direction of using
tags for this kind of information and as such
relying on tags as well seems reasonable and
future-proof.
---
 helix-lsp/src/client.rs         |  4 ++++
 helix-term/src/ui/completion.rs | 21 ++++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 2f5b498d..46772dd2 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -329,6 +329,10 @@ impl Client {
                                 ],
                             }),
                             insert_replace_support: Some(true),
+                            deprecated_support: Some(true),
+                            tag_support: Some(lsp::TagSupport {
+                                value_set: vec![lsp::CompletionItemTag::DEPRECATED],
+                            }),
                             ..Default::default()
                         }),
                         completion_item_kind: Some(lsp::CompletionItemKindCapability {
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index ac434894..3e2f2aea 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -1,6 +1,10 @@
 use crate::compositor::{Component, Context, Event, EventResult};
-use helix_view::{editor::CompleteAction, ViewId};
-use tui::buffer::Buffer as Surface;
+use helix_view::{
+    editor::CompleteAction,
+    theme::{Modifier, Style},
+    ViewId,
+};
+use tui::{buffer::Buffer as Surface, text::Span};
 
 use std::borrow::Cow;
 
@@ -33,8 +37,19 @@ impl menu::Item for CompletionItem {
     }
 
     fn format(&self, _data: &Self::Data) -> menu::Row {
+        let deprecated = self.deprecated.unwrap_or_default()
+            || self.tags.as_ref().map_or(false, |tags| {
+                tags.contains(&lsp::CompletionItemTag::DEPRECATED)
+            });
         menu::Row::new(vec![
-            menu::Cell::from(self.label.as_str()),
+            menu::Cell::from(Span::styled(
+                self.label.as_str(),
+                if deprecated {
+                    Style::default().add_modifier(Modifier::CROSSED_OUT)
+                } else {
+                    Style::default()
+                },
+            )),
             menu::Cell::from(match self.kind {
                 Some(lsp::CompletionItemKind::TEXT) => "text",
                 Some(lsp::CompletionItemKind::METHOD) => "method",

From 72e5704f528e85a0aeb331587391572f7a93ef42 Mon Sep 17 00:00:00 2001
From: vwkd <33468089+vwkd@users.noreply.github.com>
Date: Mon, 13 Feb 2023 21:46:47 +0200
Subject: [PATCH 879/884] docs: clarify `join_selections_space` (#5969)

---
 book/src/keymap.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/src/keymap.md b/book/src/keymap.md
index 0550e57f..8864ab69 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -130,7 +130,7 @@
 | `X`                   | Extend selection to line bounds (line-wise selection)             | `extend_to_line_bounds`              |
 | `Alt-x`               | Shrink selection to line bounds (line-wise selection)             | `shrink_to_line_bounds`              |
 | `J`                   | Join lines inside selection                                       | `join_selections`                    |
-| `Alt-J`               | Join lines inside selection and select space                      | `join_selections_space`              |
+| `Alt-J`               | Join lines inside selection and select the inserted space         | `join_selections_space`              |
 | `K`                   | Keep selections matching the regex                                | `keep_selections`                    |
 | `Alt-K`               | Remove selections matching the regex                              | `remove_selections`                  |
 | `Ctrl-c`              | Comment/uncomment the selections                                  | `toggle_comments`                    |

From ab17f30f45aac4cb8f8fe909e401eee03cc44a60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Feb 2023 18:20:15 -0600
Subject: [PATCH 880/884] build(deps): bump encoding_rs from 0.8.31 to 0.8.32
 (#5977)

Bumps [encoding_rs](https://github.com/hsivonen/encoding_rs) from 0.8.31 to 0.8.32.
- [Release notes](https://github.com/hsivonen/encoding_rs/releases)
- [Commits](https://github.com/hsivonen/encoding_rs/compare/v0.8.31...v0.8.32)

---
updated-dependencies:
- dependency-name: encoding_rs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2e4ebe20..e2e7e61f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -391,9 +391,9 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.31"
+version = "0.8.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
+checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
 dependencies = [
  "cfg-if",
 ]

From 47a3aaaa24e2cfa248743fa500c4c8dbc276b343 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Feb 2023 18:21:30 -0600
Subject: [PATCH 881/884] build(deps): bump signal-hook from 0.3.14 to 0.3.15
 (#5975)

Bumps [signal-hook](https://github.com/vorner/signal-hook) from 0.3.14 to 0.3.15.
- [Release notes](https://github.com/vorner/signal-hook/releases)
- [Changelog](https://github.com/vorner/signal-hook/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vorner/signal-hook/compare/v0.3.14...v0.3.15)

---
updated-dependencies:
- dependency-name: signal-hook
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e2e7e61f..dae93f72 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1903,9 +1903,9 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
 
 [[package]]
 name = "signal-hook"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
+checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9"
 dependencies = [
  "libc",
  "signal-hook-registry",

From 64ca02258ddc2bcc997c598af5856b94ddc08be3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Feb 2023 18:23:59 -0600
Subject: [PATCH 882/884] build(deps): bump cc from 1.0.78 to 1.0.79 (#5976)

Bumps [cc](https://github.com/rust-lang/cc-rs) from 1.0.78 to 1.0.79.
- [Release notes](https://github.com/rust-lang/cc-rs/releases)
- [Commits](https://github.com/rust-lang/cc-rs/compare/1.0.78...1.0.79)

---
updated-dependencies:
- dependency-name: cc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dae93f72..ea34f6da 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -155,9 +155,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.78"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
 
 [[package]]
 name = "cfg-if"

From 0a7c697dd785111626c8f47a36e07381f55c2e83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Feb 2023 18:28:21 -0600
Subject: [PATCH 883/884] build(deps): bump tokio from 1.24.2 to 1.25.0 (#5974)

Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.24.2 to 1.25.0.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/commits/tokio-1.25.0)

---
updated-dependencies:
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock           | 4 ++--
 helix-lsp/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ea34f6da..b70f34c4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2150,9 +2150,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.24.2"
+version = "1.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb"
+checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af"
 dependencies = [
  "autocfg",
  "bytes",
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 733f9727..06811902 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -23,6 +23,6 @@ lsp-types = { version = "0.94" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-tokio = { version = "1.24", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
+tokio = { version = "1.25", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
 tokio-stream = "0.1.11"
 which = "4.4"

From 715c4b24d94c9e2fa70d5d59ce658b89fbde0392 Mon Sep 17 00:00:00 2001
From: Pascal Kuthe <pascal.kuthe@semimod.de>
Date: Tue, 14 Feb 2023 20:00:54 +0100
Subject: [PATCH 884/884] Fix crash in goto_window_center at EOF (#5987)

---
 helix-term/src/commands.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index f8a96074..a3c9f0b4 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -960,10 +960,9 @@ fn goto_window(cx: &mut Context, align: Align) {
             view.offset.vertical_offset + last_visual_line.saturating_sub(scrolloff + count)
         }
     };
-    let visual_line = visual_line.clamp(
-        view.offset.vertical_offset + scrolloff,
-        view.offset.vertical_offset + last_visual_line.saturating_sub(scrolloff),
-    );
+    let visual_line = visual_line
+        .max(view.offset.vertical_offset + scrolloff)
+        .min(view.offset.vertical_offset + last_visual_line.saturating_sub(scrolloff));
 
     let pos = view
         .pos_at_visual_coords(doc, visual_line as u16, 0, false)