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

Fix reload module problem on windows

This commit is contained in:
Francesco Abbate 2021-02-17 19:20:00 +01:00
parent 6369a7f760
commit 1ce1c114ba
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,7 @@ end
local function save(filename)
doc():save(filename)
if doc().filename == (USERDIR .. PATHSEP .. "init.lua") then
if doc().filename == common.normalize_path(USERDIR .. PATHSEP .. "init.lua") then
core.reload_module("core.style")
core.load_user_directory()
end

10
data/core/common.lua
View File

@ -228,4 +228,14 @@ function common.home_expand(text)
end
function common.normalize_path(filename)
if PATHSEP == '\\' then
filename = filename:gsub('[/\\]', '\\')
local drive, rem = filename:match('^([a-zA-Z])(:.*)')
return drive and drive:upper() .. rem or filename
end
return filename
end
return common

3
data/core/doc/init.lua
View File

@ -67,6 +67,7 @@ end
function Doc:load(filename)
local fp = assert( io.open(filename, "rb") )
filename = common.normalize_path(filename)
self:reset()
self.filename = filename
self.lines = {}
@ -93,7 +94,7 @@ function Doc:save(filename)
fp:write(line)
end
fp:close()
self.filename = filename or self.filename
self.filename = common.normalize_path(filename or self.filename)
self:reset_syntax()
self:clean()
end