From 57112a9f22eefbe1cc30c734427cf3c5ca8b4570 Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 19 Feb 2026 05:16:40 -0600 Subject: [PATCH] Update submodule and enhance syncback confirmation dialog - Updated the `vscode-rojo` submodule to the latest commit. - Modified the syncback confirmation dialog title to indicate its beta status and adjusted its dimensions for better usability. - Enhanced the warning message to clarify the differences between live syncback and CLI syncback, helping users make informed decisions. These changes aim to improve user experience and provide clearer guidance during the syncback process. --- .cursor/commands/format.md | 14 ++++++++++++-- plugin/src/App/init.lua | 8 ++++---- vscode-rojo | 2 +- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.cursor/commands/format.md b/.cursor/commands/format.md index 50fecabc..3c4f7203 100644 --- a/.cursor/commands/format.md +++ b/.cursor/commands/format.md @@ -16,8 +16,18 @@ Run formatting and static analysis (linting) across the entire project. bash scripts/format.sh ``` -**Monitor the script output as it runs.** If a step fails, investigate the failure and fix it manually before re-running. +**Monitor the script output as it runs.** -### 2. Report +### 2. Fix ALL Failures + +If any step fails, you MUST fix the issues and re-run until everything passes. This applies to **every** failure -- Clippy, Selene, Prettier, all of them. + +**Clippy is not optional.** Fix every Clippy warning, even if the warning is in code you did not write or that existed before your changes. There is no "pre-existing" or "before my time" exception. If Clippy reports it, fix it. The CI gate runs `cargo clippy` and will reject the PR regardless of who introduced the warning. + +The same rule applies to Selene warnings on Lua code. If the linter flags it, fix it. + +Keep re-running the format script until the overall result is **PASS** with zero failures. + +### 3. Report Once formatting passes clean, provide a brief summary and confirm the final result. diff --git a/plugin/src/App/init.lua b/plugin/src/App/init.lua index a7334849..4452cfc6 100644 --- a/plugin/src/App/init.lua +++ b/plugin/src/App/init.lua @@ -1230,14 +1230,14 @@ function App:render() SyncbackConfirm = e(Theme.StudioProvider, nil, { e(StudioPluginGui, { id = "Atlas_SyncbackConfirm", - title = "Full Syncback", + title = "⚠️ Full Syncback (BETA) ⚠️", active = self.state.showingSyncbackConfirm == true, isEphemeral = true, initDockState = Enum.InitialDockState.Float, overridePreviousState = true, - floatingSize = Vector2.new(400, 150), - minimumSize = Vector2.new(300, 120), + floatingSize = Vector2.new(400, 250), + minimumSize = Vector2.new(300, 220), zIndexBehavior = Enum.ZIndexBehavior.Sibling, @@ -1266,7 +1266,7 @@ function App:render() VerticalAlignment = Enum.VerticalAlignment.Center, }), Message = e("TextLabel", { - Text = "This will overwrite your project files with the current Studio state. This cannot be undone.", + Text = "This will overwrite your project files with the current Studio state. This cannot be undone.\n\nNote: Live syncback produces slightly different formatting than CLI syncback (atlas syncback). This may cause minor git diffs even when the data is identical. Pick one method and stick with it to avoid unnecessary churn.", TextWrapped = true, FontFace = theme.Font.Main, TextSize = theme.TextSize.Body, diff --git a/vscode-rojo b/vscode-rojo index 6ad86728..e25d02ca 160000 --- a/vscode-rojo +++ b/vscode-rojo @@ -1 +1 @@ -Subproject commit 6ad86728c1b14af55e725e5f0698e8b5b94dfe9a +Subproject commit e25d02caea9afbac353e19a82e72189348306e1b