Formatting

Author: tspiller

Assets/Tests/InputSystem.Editor/InputActionsEditorTests.cs

@@ -57,18 +57,18 @@ IEnumerator WaitForActionMapRename(int index, bool isActive, double timeoutSecs
             return false;
         }, $"WaitForActionMapRename {index} {isActive}", timeoutSecs);
     }
-    
+
     IEnumerator WaitForActionRename(int index, bool isActive, double timeoutSecs = 5.0)
     {
         return WaitUntil(() =>
+        {
+            var actionItems = m_Window.rootVisualElement.Q("actions-container").Query<InputActionsTreeViewItem>().ToList();
+            if (actionItems.Count > index && actionItems[index].IsFocused == isActive)
             {
-                var actionItems = m_Window.rootVisualElement.Q("actions-container").Query<InputActionsTreeViewItem>().ToList();
-                if (actionItems.Count > index && actionItems[index].IsFocused == isActive)
-                {
-                    return true;
-                }
-                return false;
-            }, $"WaitForActionRename {index} {isActive}", timeoutSecs);
+                return true;
+            }
+            return false;
+        }, $"WaitForActionRename {index} {isActive}", timeoutSecs);
     }
 
     #endregion
@@ -189,7 +189,7 @@ public IEnumerator CanDeleteActionMap()
         Assert.That(m_Window.currentAssetInEditor.actionMaps[0].name, Is.EqualTo("First Name"));
         Assert.That(m_Window.currentAssetInEditor.actionMaps[1].name, Is.EqualTo("Third Name"));
     }
-    
+
     [UnityTest]
     public IEnumerator CanRenameAction()
     {
@@ -215,7 +215,7 @@ public IEnumerator CanRenameAction()
         {
             SimulateClickOn(actionItem[1]);
         }
-        
+
         // Get the element that has focus before rename
         var focusedElement = m_Window.rootVisualElement.Q<TreeView>("actions-tree-view").focusController.focusedElement;
 

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs

@@ -204,7 +204,7 @@ public override void RedrawUI(ViewState viewState)
         {
             // Store the current focus before Clear/Rebuild
             Focusable focusedElement = m_ActionsTreeView.focusController.focusedElement;
-            
+
             m_ActionsTreeView.Clear();
             m_ActionsTreeView.SetRootItems(viewState.treeViewData);
             m_ActionsTreeView.Rebuild();
@@ -218,10 +218,10 @@ public override void RedrawUI(ViewState viewState)
 
             // Don't want to show action properties if there's no actions.
             m_PropertiesScrollview.visible = m_ActionsTreeView.GetTreeCount() > 0;
-            
+
             // Rebuild causes the ActionsTreeView to lose focus; restore if there was focus before
             if (focusedElement != null)
-            { 
+            {
                 focusedElement.Focus();
             }
         }

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsTreeViewItem.cs

@@ -16,7 +16,7 @@ internal class InputActionsTreeViewItem : VisualElement
 
         private const string kRenameTextField = "rename-text-field";
         public event EventCallback<string> EditTextFinished;
-        
+
         // for testing purposes to know if the item is focused to accept input
         internal bool IsFocused { get; private set; } = false;