mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-12-27 20:09:39 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(cmd): only call supported lua functions

Browse source
This commit is contained in:
Jan De Dobbeleer 2021-11-13 21:24:52 +01:00
parent e0c31470b7
commit 2a44dca898
No known key found for this signature in database
GPG key ID: F6CC273CE5BA9AEE
1 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/init/omp.lua
View file

@ -3,10 +3,21 @@
local endedit_time local endedit_time
local last_duration local last_duration
local function os_clock_millis()
-- Clink v1.2.30 has a fix for Lua's os.clock() implementation failing after
-- the program has been running more than 24 days. In older versions, call
-- OMP to get the time in milliseconds.
if (clink.version_encoded or 0) >= 10020030 then
return math.floor(os.clock() * 1000)
else
return io.popen("::OMP:: --millis"):read("*n")
end
end
local function duration_onbeginedit() local function duration_onbeginedit()
last_duration = 0 last_duration = 0
if endedit_time then if endedit_time then
local beginedit_time = io.popen("::OMP:: --millis"):read("*n") local beginedit_time = os_clock_millis()
local elapsed = beginedit_time - endedit_time local elapsed = beginedit_time - endedit_time
if elapsed >= 0 then if elapsed >= 0 then
last_duration = elapsed last_duration = elapsed
@ -15,13 +26,27 @@ local function duration_onbeginedit()
end end
local function duration_onendedit() local function duration_onendedit()
endedit_time = io.popen("::OMP:: --millis"):read("*n") endedit_time = os_clock_millis()
end end
-- Prompt functions -- Prompt functions
local function execution_time_option()
if last_duration ~= nil then
return "--execution-time "..last_duration
end
return ""
end
local function error_level_option()
if os.geterrorlevel ~= nil and settings.get("cmd.get_errorlevel") then
return "--error "..os.geterrorlevel()
end
return ""
end
local function get_posh_prompt(rprompt) local function get_posh_prompt(rprompt)
local prompt_exe = string.format("::OMP:: --config=\"::CONFIG::\" --execution-time %s --error %s --rprompt=%s", last_duration, os.geterrorlevel(), rprompt) local prompt_exe = string.format('::OMP:: --config="::CONFIG::" %s %s --rprompt=%s', execution_time_option(), error_level_option(), rprompt)
prompt = io.popen(prompt_exe):read("*a") prompt = io.popen(prompt_exe):read("*a")
return prompt return prompt
end end
@ -45,6 +70,7 @@ local function builtin_modules_onendedit()
duration_onendedit() duration_onendedit()
end end
if clink.onbeginedit ~= nil and clink.onendedit ~= nil then
clink.onbeginedit(builtin_modules_onbeginedit) clink.onbeginedit(builtin_modules_onbeginedit)
clink.onendedit(builtin_modules_onendedit) clink.onendedit(builtin_modules_onendedit)
end