Improve property naming and readability

Author: pro100filipp

CodeEdit/Features/Editor/TabBar/Tabs/Tab/EditorTabView.swift

@@ -57,25 +57,25 @@ struct EditorTabView: View {
 
     @EnvironmentObject private var editor: Editor
 
-    /// The item associated with the current tab.
+    /// The file item associated with the current tab.
     ///
     /// You can get tab-related information from here, like `label`, `icon`, etc.
-    private let item: CEWorkspaceFile
+    private let tabFile: CEWorkspaceFile
 
     var index: Int
 
     private var isTemporary: Bool {
-        editor.temporaryTab?.file == item
+        editor.temporaryTab?.file == tabFile
     }
 
     /// Is the current tab the active tab.
     private var isActive: Bool {
-        item == editor.selectedTab?.file
+        tabFile == editor.selectedTab?.file
     }
 
     /// Is the current tab being dragged.
     private var isDragging: Bool {
-        draggingTabId == item.id
+        draggingTabId == tabFile.id
     }
 
     /// Is the current tab being held (by click and hold, not drag).
@@ -89,9 +89,9 @@ struct EditorTabView: View {
     private func switchAction() {
         // Only set the `selectedId` when they are not equal to avoid performance issue for now.
         editorManager.activeEditor = editor
-        if editor.selectedTab?.file != item {
-            let tabItem = EditorInstance(file: item)
-            editor.setSelectedTab(item)
+        if editor.selectedTab?.file != tabFile {
+            let tabItem = EditorInstance(file: tabFile)
+            editor.setSelectedTab(tabFile)
             editor.clearFuture()
             editor.addToHistory(tabItem)
         }
@@ -100,22 +100,22 @@ struct EditorTabView: View {
     /// Close the current tab.
     func closeAction() {
         isAppeared = false
-        editor.closeTab(file: item)
+        editor.closeTab(file: tabFile)
     }
 
     init(
-        item: CEWorkspaceFile,
+        file: CEWorkspaceFile,
         index: Int,
         draggingTabId: CEWorkspaceFile.ID?,
         onDragTabId: CEWorkspaceFile.ID?,
         closeButtonGestureActive: Binding<Bool>
     ) {
-        self.item = item
+        self.tabFile = file
         self.index = index
         self.draggingTabId = draggingTabId
         self.onDragTabId = onDragTabId
         self._closeButtonGestureActive = closeButtonGestureActive
-        self._fileObserver = StateObject(wrappedValue: EditorTabFileObserver(item: item))
+        self._fileObserver = StateObject(wrappedValue: EditorTabFileObserver(file: file))
     }
 
     @ViewBuilder var content: some View {
@@ -126,15 +126,15 @@ struct EditorTabView: View {
                 )
             // Tab content (icon and text).
             HStack(alignment: .center, spacing: 3) {
-                Image(nsImage: item.nsIcon)
+                Image(nsImage: tabFile.nsIcon)
                     .frame(width: 16, height: 16)
                     .foregroundColor(
                         fileIconStyle == .color
                         && activeState != .inactive && isActiveEditor
-                        ? item.iconColor
+                        ? tabFile.iconColor
                         : .secondary
                     )
-                Text(item.name)
+                Text(tabFile.name)
                     .font(
                         isTemporary
                         ? .system(size: 11.0).italic()
@@ -146,7 +146,7 @@ struct EditorTabView: View {
             .frame(maxHeight: .infinity) // To max-out the parent (tab bar) area.
             .accessibilityElement(children: .ignore)
             .accessibilityAddTraits(.isStaticText)
-            .accessibilityLabel(item.name)
+            .accessibilityLabel(tabFile.name)
             .padding(.horizontal, 20)
             .overlay {
                 ZStack {
@@ -157,7 +157,7 @@ struct EditorTabView: View {
                         isDragging: draggingTabId != nil || onDragTabId != nil,
                         closeAction: closeAction,
                         closeButtonGestureActive: $closeButtonGestureActive,
-                        item: item,
+                        item: tabFile,
                         isHoveringClose: $isHoveringClose
                     )
                 }
@@ -234,8 +234,8 @@ struct EditorTabView: View {
             // This padding is to avoid background color overlapping with top divider.
             .padding(.top, 1)
             .zIndex(isActive ? 2 : (isDragging ? 3 : (isPressing ? 1 : 0)))
-            .id(item.id)
-            .tabBarContextMenu(item: item, isTemporary: isTemporary)
+            .id(tabFile.id)
+            .tabBarContextMenu(item: tabFile, isTemporary: isTemporary)
             .accessibilityElement(children: .contain)
             .onAppear {
                 workspace.workspaceFileManager?.addObserver(fileObserver)

CodeEdit/Features/Editor/TabBar/Tabs/Tab/Models/EditorTabFileObserver.swift

@@ -12,19 +12,15 @@ import SwiftUI
 final class EditorTabFileObserver: ObservableObject, CEWorkspaceFileManagerObserver {
     @Published private(set) var isDeleted = false
 
-    private let item: CEWorkspaceFile
+    private let tabFile: CEWorkspaceFile
 
-    init(item: CEWorkspaceFile) {
-        self.item = item
+    init(file: CEWorkspaceFile) {
+        self.tabFile = file
     }
 
     func fileManagerUpdated(updatedItems: Set<CEWorkspaceFile>) {
-        guard let parent = item.parent else {
-            return
-        }
-
-        if updatedItems.contains(parent) {
-            isDeleted = item.doesExist == false
+        if let parent = tabFile.parent, updatedItems.contains(parent) {
+            isDeleted = tabFile.doesExist == false
         }
     }
 }

CodeEdit/Features/Editor/TabBar/Tabs/Views/EditorTabs.swift

@@ -261,7 +261,7 @@ struct EditorTabs: View {
                         ForEach(Array(openedTabs.enumerated()), id: \.element) { index, id in
                             if let item = editor.tabs.first(where: { $0.file.id == id }) {
                                 EditorTabView(
-                                    item: item.file,
+                                    file: item.file,
                                     index: index,
                                     draggingTabId: draggingTabId,
                                     onDragTabId: onDragTabId,