Allow openScriptsExternally option to be changed during sync (#911)

This commit is contained in:
Micah
2024-05-08 12:34:00 -07:00
committed by GitHub
parent 41443d3989
commit 2c46640105
4 changed files with 5 additions and 11 deletions

View File

@@ -175,7 +175,6 @@ function SettingsPage:render()
id = "openScriptsExternally",
name = "Open Scripts Externally",
description = "Attempt to open scripts in an external editor",
locked = self.props.syncActive,
experimental = true,
transparency = self.props.transparency,
layoutOrder = layoutIncrement(),

View File

@@ -425,11 +425,6 @@ function App:startSession()
local host, port = self:getHostAndPort()
local sessionOptions = {
openScriptsExternally = Settings:get("openScriptsExternally"),
twoWaySync = Settings:get("twoWaySync"),
}
local baseUrl = if string.find(host, "^https?://")
then string.format("%s:%s", host, port)
else string.format("http://%s:%s", host, port)
@@ -437,8 +432,7 @@ function App:startSession()
local serveSession = ServeSession.new({
apiContext = apiContext,
openScriptsExternally = sessionOptions.openScriptsExternally,
twoWaySync = sessionOptions.twoWaySync,
twoWaySync = Settings:get("twoWaySync"),
})
self.cleanupPrecommit = serveSession.__reconciler:hookPrecommit(function(patch, instanceMap)

View File

@@ -13,6 +13,7 @@ local InstanceMap = require(script.Parent.InstanceMap)
local PatchSet = require(script.Parent.PatchSet)
local Reconciler = require(script.Parent.Reconciler)
local strict = require(script.Parent.strict)
local Settings = require(script.Parent.Settings)
local Status = strict("Session.Status", {
NotStarted = "NotStarted",
@@ -50,7 +51,6 @@ ServeSession.Status = Status
local validateServeOptions = t.strictInterface({
apiContext = t.table,
openScriptsExternally = t.boolean,
twoWaySync = t.boolean,
})
@@ -89,7 +89,6 @@ function ServeSession.new(options)
self = {
__status = Status.NotStarted,
__apiContext = options.apiContext,
__openScriptsExternally = options.openScriptsExternally,
__twoWaySync = options.twoWaySync,
__reconciler = reconciler,
__instanceMap = instanceMap,
@@ -170,7 +169,7 @@ function ServeSession:__applyGameAndPlaceId(serverInfo)
end
function ServeSession:__onActiveScriptChanged(activeScript)
if not self.__openScriptsExternally then
if not Settings:get("openScriptsExternally") then
Log.trace("Not opening script {} because feature not enabled.", activeScript)
return