walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 15 Wiki Activity

Merge pull request #370 from adamharrison/home-fixes 

Changed behaviour of home.
This commit is contained in:
Adam 2021-08-10 14:46:48 -04:00 committed by GitHub
parent c552d373ca 3c8da0fc3f
commit f3a8e264fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/core/commands/doc.lua
View File

@ -418,6 +418,7 @@ local translations = {
["start-of-line"] = translate.start_of_line, ["start-of-line"] = translate.start_of_line,
["end-of-line"] = translate.end_of_line, ["end-of-line"] = translate.end_of_line,
["start-of-word"] = translate.start_of_word, ["start-of-word"] = translate.start_of_word,
["start-of-indentation"] = translate.start_of_indentation,
["end-of-word"] = translate.end_of_word, ["end-of-word"] = translate.end_of_word,
["previous-line"] = DocView.translate.previous_line, ["previous-line"] = DocView.translate.previous_line,
["next-line"] = DocView.translate.next_line, ["next-line"] = DocView.translate.next_line,

4
data/core/doc/translate.lua
View File

@ -117,6 +117,10 @@ function translate.start_of_line(doc, line, col)
return line, 1 return line, 1
end end
function translate.start_of_indentation(doc, line, col)
local s, e = doc.lines[line]:find("^%s*")
return line, col > e + 1 and e + 1 or 1
end
function translate.end_of_line(doc, line, col) function translate.end_of_line(doc, line, col)
return line, math.huge return line, math.huge

4
data/core/keymap-macos.lua
View File

@ -80,7 +80,7 @@ local function keymap_macos(keymap)
["cmd+right"] = "doc:move-to-next-word-end", ["cmd+right"] = "doc:move-to-next-word-end",
["cmd+["] = "doc:move-to-previous-block-start", ["cmd+["] = "doc:move-to-previous-block-start",
["cmd+]"] = "doc:move-to-next-block-end", ["cmd+]"] = "doc:move-to-next-block-end",
["home"] = "doc:move-to-start-of-line", ["home"] = "doc:move-to-start-of-indentation",
["end"] = "doc:move-to-end-of-line", ["end"] = "doc:move-to-end-of-line",
["cmd+home"] = "doc:move-to-start-of-doc", ["cmd+home"] = "doc:move-to-start-of-doc",
["cmd+end"] = "doc:move-to-end-of-doc", ["cmd+end"] = "doc:move-to-end-of-doc",
@ -95,7 +95,7 @@ local function keymap_macos(keymap)
["cmd+shift+right"] = "doc:select-to-next-word-end", ["cmd+shift+right"] = "doc:select-to-next-word-end",
["cmd+shift+["] = "doc:select-to-previous-block-start", ["cmd+shift+["] = "doc:select-to-previous-block-start",
["cmd+shift+]"] = "doc:select-to-next-block-end", ["cmd+shift+]"] = "doc:select-to-next-block-end",
["shift+home"] = "doc:select-to-start-of-line", ["shift+home"] = "doc:select-to-start-of-indentation",
["shift+end"] = "doc:select-to-end-of-line", ["shift+end"] = "doc:select-to-end-of-line",
["cmd+shift+home"] = "doc:select-to-start-of-doc", ["cmd+shift+home"] = "doc:select-to-start-of-doc",
["cmd+shift+end"] = "doc:select-to-end-of-doc", ["cmd+shift+end"] = "doc:select-to-end-of-doc",

4
data/core/keymap.lua
View File

@ -184,7 +184,7 @@ keymap.add_direct {
["ctrl+right"] = "doc:move-to-next-word-end", ["ctrl+right"] = "doc:move-to-next-word-end",
["ctrl+["] = "doc:move-to-previous-block-start", ["ctrl+["] = "doc:move-to-previous-block-start",
["ctrl+]"] = "doc:move-to-next-block-end", ["ctrl+]"] = "doc:move-to-next-block-end",
["home"] = "doc:move-to-start-of-line", ["home"] = "doc:move-to-start-of-indentation",
["end"] = "doc:move-to-end-of-line", ["end"] = "doc:move-to-end-of-line",
["ctrl+home"] = "doc:move-to-start-of-doc", ["ctrl+home"] = "doc:move-to-start-of-doc",
["ctrl+end"] = "doc:move-to-end-of-doc", ["ctrl+end"] = "doc:move-to-end-of-doc",
@ -199,7 +199,7 @@ keymap.add_direct {
["ctrl+shift+right"] = "doc:select-to-next-word-end", ["ctrl+shift+right"] = "doc:select-to-next-word-end",
["ctrl+shift+["] = "doc:select-to-previous-block-start", ["ctrl+shift+["] = "doc:select-to-previous-block-start",
["ctrl+shift+]"] = "doc:select-to-next-block-end", ["ctrl+shift+]"] = "doc:select-to-next-block-end",
["shift+home"] = "doc:select-to-start-of-line", ["shift+home"] = "doc:select-to-start-of-indentation",
["shift+end"] = "doc:select-to-end-of-line", ["shift+end"] = "doc:select-to-end-of-line",
["ctrl+shift+home"] = "doc:select-to-start-of-doc", ["ctrl+shift+home"] = "doc:select-to-start-of-doc",
["ctrl+shift+end"] = "doc:select-to-end-of-doc", ["ctrl+shift+end"] = "doc:select-to-end-of-doc",