wiremod/wire
1
0
Fork 0
mirror of https://github.com/wiremod/wire.git synced 2025-03-04 03:03:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Limit @autoupdate directive executions (#3191)

Browse Source 
* Guard autoupdate directive handler from multiple runs
Add some warning reporting to autoupdate directive
Annotate directive_handlers (doesn't really work :P)

* Try to prevent the editor from ever failing to close

* Rewrite to error on client/server if @autoupdate is in same file
@autoupdate is still ignored beyond 1 instance
This commit is contained in:
Denneisk 2024-12-03 15:57:29 +00:00 committed by GitHub
parent 27f153bd26
commit 99271ee5ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lua/entities/gmod_wire_expression2/base/preprocessor.lua
View File

@ -234,6 +234,7 @@ local function handleIO(name)
end
end
---@type fun(PreProcessor, string, Trace):string?[]
local directive_handlers = {
["name"] = function(self, value)
if not self.ignorestuff then
@ -293,8 +294,32 @@ local directive_handlers = {
end
end,
["autoupdate"] = function(self)
if CLIENT then return "" end
["autoupdate"] = function(self, arg, trace)
if not self.directives.autoupdate then
self.directives.autoupdate = true
else
if not self.ignorestuff then -- Assume includes are in good faith and ignore them
local quickfix
if CLIENT then -- Only do quickfix on the client for optimization
trace.end_line = trace.start_line + 1 -- Modify this trace to avoid creating new ones. Hacky but resourceful(?)
trace.end_col = 1
quickfix = { { at = trace, replace = "" } }
end
self:Error("Directive (@autoupdate) cannot be defined twice", trace, quickfix)
end
return ""
end
if CLIENT then
if #string.Trim(arg) > 0 then
trace.start_col = trace.end_col + 1
trace.end_line = trace.start_line + 1
trace.end_col = 1
self:Warning("Directive (@autoupdate) takes no arguments", trace, { { at = trace, replace = "\n" } })
end
return ""
end
if not IsValid( self.ent ) or not self.ent.duped or not self.ent.filepath or self.ent.filepath == "" then return "" end
WireLib.Expression2Upload( self.ent:GetPlayer(), self.ent, self.ent.filepath )
end,
@ -350,7 +375,7 @@ end
---@alias IODirective { [1]: string[], [2]: TypeSignature[], [3]: table<string, TypeSignature>, [4]: table<string, string>, [5]: table<string, Trace> }
---@alias PPDirectives { inputs: IODirective, outputs: IODirective, persist: IODirective, name: string?, model: string?, trigger: { [1]: boolean?, [2]: table<string, boolean> }, strict: boolean? }
---@alias PPDirectives { inputs: IODirective, outputs: IODirective, persist: IODirective, name: string?, model: string?, trigger: { [1]: boolean?, [2]: table<string, boolean> }, strict: boolean?, autoupdate: true? }
---@param buffer string
---@param directives PPDirectives

22
lua/wire/client/text_editor/wire_expression2_editor.lua
View File

@ -2006,14 +2006,28 @@ end
function Editor:Close()
timer.Stop("e2autosave")
self:AutoSave()
local ok, err = pcall(self.AutoSave, self)
if not ok then
WireLib.Notify(nil, "Failed to autosave file while closing E2 editor.\n" .. err, 3)
end
ok = pcall(self.Validate, self)
if not ok then
WireLib.Notify(nil, "Failed to validate file while closing E2 editor.\n", 2)
end
ok, err = pcall(self.ExtractName, self)
if not ok then
WireLib.Notify(nil, "Failed to extract name while closing E2 editor.\n" .. err, 3)
end
self:Validate()
self:ExtractName()
self:SetV(false)
self.chip = false
self:SaveEditorSettings()
ok, err = pcall(self.SaveEditorSettings, self)
if not ok then
WireLib.Notify(nil, "Failed to save editor settings while closing E2 editor.\n" .. err, 3)
end
hook.Run("WireEditorClose", self)
end