Skip to content

Fix tabs not setting code when monaco finishes loading #2297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thegrb93 merged 2 commits into from
Mar 13, 2026
+14 −13
Merged

Fix tabs not setting code when monaco finishes loading #2297

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f41863
Fix tabs not setting code when monaco finishes loading
thegrb93 Mar 11, 2026
e9c13b4
Clean this up too
thegrb93 Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions lua/starfall/editor/tabhandlers/tab_monaco.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,17 @@ MonacoSetting.settings = {
MonacoSetting("wordBasedSuggestions", "sf_editor_monaco_wordsuggestion", "currentDocument"),
MonacoSetting("wordWrap", "sf_editor_monaco_wordwrap", "off"),
}
function MonacoSetting:concat()
local s = {}
for k, v in ipairs(self.settings) do s[k]=v.js end
return table.concat(s, ",\n")
function MonacoSetting:applyAll()
local settings = {}
for k, v in ipairs(self.settings) do settings[k]=v.js end

TabHandler.html:RunJavascript([[
sfeditor.updateOptions({
autoDetectHighContrast: false,
detectIndentation: false,
insertSpaces: false,
]]..table.concat(settings, ",\n")..[[
});]])
end

local ImageBackgroundSetting = {
Expand Down Expand Up @@ -109,7 +116,7 @@ function TabHandler:AddSession(tab)
self.html:RunJavascript([[
{
let uri="]]..tab.uri..[[";
let m=monaco.editor.createModel("", "lua", uri);
let m=monaco.editor.createModel("]]..string.JavascriptSafe(tab.code)..[[", "lua", uri);
m.pushEOL(monaco.editor.EndOfLineSequence.LF);
m.onDidChangeContent((event) => sf.updateCode(uri, m.getValue()));
}
Expand Down Expand Up @@ -212,13 +219,7 @@ function TabHandler:FinishedLoading()
TabHandler.ImageBackground:apply()
end

self.html:RunJavascript([[
sfeditor.updateOptions({
autoDetectHighContrast: false,
detectIndentation: false,
insertSpaces: false,
]]..MonacoSetting:concat()..[[
});]])
MonacoSetting:applyAll()

for i = 1, SF.Editor.editor:GetNumTabs() do
local tab = SF.Editor.editor:GetTabContent(i)
Expand Down Expand Up @@ -380,8 +381,8 @@ local PANEL = {}
function PANEL:Init()
self:SetBackgroundColor(Color(39, 40, 34))
self:OnThemeChange(SF.Editor.Themes.CurrentTheme)
TabHandler:AddSession(self)
self.code = ""
TabHandler:AddSession(self)
end

function PANEL:GetCode()
Expand Down
Loading