Merge branch 'master' into PR/project-rework

lite-xl · adamharrison · Apr 1, 2023 · Jun 22, 2024 · Jun 22, 2024 · Jun 22, 2024
commit dcb0ee6937e30abeb2acbb2a6581185fdc2fc204
diff --git a/data/core/doc/init.lua b/data/core/doc/init.lua
@@ -103,7 +103,23 @@ function Doc:save(filename, abs_filename)
   else
     assert(self.filename or abs_filename, "calling save on unnamed doc without absolute path")
   end
-  local fp = assert(io.open(abs_filename, "wb"))
+
+  local fp
+  if PLATFORM == "Windows" then
+    -- On Windows, opening a hidden file with wb fails with a permission error.
+    -- To get around this, we must open the file as r+b and truncate.
+    -- Since r+b fails if file doesn't exist, fall back to wb.
+    fp = io.open(abs_filename, "r+b")
+    if fp then
+      system.ftruncate(fp)
+    else
+      -- file probably doesn't exist, create one
+      fp = assert (io.open(abs_filename, "wb"))
+    end
+  else
+    fp = assert (io.open(abs_filename, "wb"))
+  end
+
   for _, line in ipairs(self.lines) do
     if self.crlf then line = line:gsub("\n", "\r\n") end
     fp:write(line)

diff --git a/data/core/start.lua b/data/core/start.lua
@@ -46,6 +46,71 @@ end }
 table.pack = table.pack or pack or function(...) return {...} end
 table.unpack = table.unpack or unpack
 
+local lua_require = require
+local require_stack = { "" }
+---Loads the given module, returns any value returned by the searcher (`true` when `nil`).
+---Besides that value, also returns as a second result the loader data returned by the searcher,
+---which indicates how `require` found the module.
+---(For instance, if the module came from a file, this loader data is the file path.)
+---
+---This is a variant that also supports relative imports.
+---
+---For example `require ".b"` will require `b` in the same path of the current
+---file.
+---This also supports multiple levels traversal. For example `require "...b"`
+---will require `b` from two levels above the current one.
+---This method has a few caveats: it uses the last `require` call to get the
+---current "path", so this only works if the relative `require` is called inside
+---its parent `require`.
+---Calling a relative `require` in a function called outside the parent
+---`require`, will result in the wrong "path" being used.
+---
+---It's possible to save the current "path" with `get_current_require_path`
+---called inside the parent `require`, and use its return value to populate
+---future requires.
+---@see get_current_require_path
+---@param modname string
+---@return unknown
+---@return unknown loaderdata
+function require(modname, ...)
+  if modname then
+    local level, rel_path = string.match(modname, "^(%.*)(.*)")
+    level = #(level or "")
+    if level > 0 then
+      if #require_stack == 0 then
+        return error("Require stack underflowed.")
+      else
+        local base_path = require_stack[#require_stack]
+        while level > 1 do
+          base_path = string.match(base_path, "^(.*)%.") or ""
+          level = level - 1
+        end
+        modname = base_path
+        if #base_path > 0 then
+          modname = modname .. "."
+        end
+        modname = modname .. rel_path
+      end
+    end
+  end
+
+  table.insert(require_stack, modname)
+  local ok, result, loaderdata = pcall(lua_require, modname, ...)
+  table.remove(require_stack)
+
+  if not ok then
+    return error(result)
+  end
+  return result, loaderdata
+end
+
+---Returns the current `require` path.
+---@see require for details and caveats
+---@return string
+function get_current_require_path()
+  return require_stack[#require_stack]
+end
+
 require "core.utf8string"
 require "core.process"