Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Fix Tasks Not Saving#2034

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.

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

Already on GitHub?Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,8 @@ final class CEWorkspaceSettings: ObservableObject {

private(set) var folderURL: URL

privatevar settingsURL: URL {
folderURL.appending(path: "settings").appending(path:"json")
var settingsURL: URL {
folderURL.appending(path: "settings").appendingPathExtension("json")
}

init(workspaceURL: URL) {
Expand DownExpand Up@@ -54,7 +54,17 @@ final class CEWorkspaceSettings: ObservableObject {
/// Save``CEWorkspaceSettingsManager`` model to `.codeedit/settings.json`
func savePreferences() throws {
// If the user doesn't have any settings to save, don't save them.
guard !settings.isEmpty() else { return }
guard !settings.isEmpty() else {
// Settings is empty, remove the file & directory if it's empty.
if fileManager.fileExists(atPath: settingsURL.path()) {
try fileManager.removeItem(at: settingsURL)

if try fileManager.contentsOfDirectory(atPath: folderURL.path()).isEmpty {
try fileManager.removeItem(at: folderURL)
}
}
return
}

if !fileManager.fileExists(atPath: folderURL.path()) {
try fileManager.createDirectory(at: folderURL, withIntermediateDirectories: true)
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ struct CETaskFormView: View {
@ObservedObject var task: CETask
@State private var selectedEnvID: UUID?

@StateObject var settingsViewModel = SettingsViewModel()
var body: some View {
Form {
Section {
Expand DownExpand Up@@ -85,7 +84,6 @@ struct CETaskFormView: View {
}
}
.formStyle(.grouped)
.environmentObject(settingsViewModel)
}

func removeSelectedEnv() {
Expand All@@ -100,7 +98,3 @@ struct CETaskFormView: View {
})
}
}

// #Preview {
// CETaskFormView()
// }
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@ struct CEWorkspaceSettingsView: View {
@EnvironmentObject var workspaceSettingsManager: CEWorkspaceSettings
@EnvironmentObject var workspace: WorkspaceDocument

@StateObject var settingsViewModel = SettingsViewModel()

@State var selectedTaskID: UUID?
@State var showAddTaskSheet: Bool = false

Expand DownExpand Up@@ -68,7 +66,6 @@ struct CEWorkspaceSettingsView: View {
}
.padding()
}
.environmentObject(settingsViewModel)
.sheet(isPresented: $showAddTaskSheet) {
if let selectedTaskIndex = workspaceSettingsManager.settings.tasks.firstIndex(where: {
$0.id == selectedTaskID
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,12 +23,16 @@ struct EditCETaskView: View {
Divider()
HStack {
Button(role: .destructive) {
workspaceSettingsManager.settings.tasks.removeAll(where: {
$0.id == task.id
})
try? workspaceSettingsManager.savePreferences()
taskManager.deleteTask(taskID: task.id)
self.dismiss()
do {
workspaceSettingsManager.settings.tasks.removeAll(where: {
$0.id == task.id
})
try workspaceSettingsManager.savePreferences()
taskManager.deleteTask(taskID: task.id)
self.dismiss()
} catch {
NSAlert(error: error).runModal()
}
} label: {
Text("Delete")
.foregroundStyle(.red)
Expand All@@ -38,8 +42,12 @@ struct EditCETaskView: View {
Spacer()

Button {
try? workspaceSettingsManager.savePreferences()
self.dismiss()
do {
try workspaceSettingsManager.savePreferences()
self.dismiss()
} catch {
NSAlert(error: error).runModal()
}
} label: {
Text("Done")
.frame(minWidth: 56)
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
//
// CEWorkspaceSettingsTests.swift
// CodeEditTests
//
// Created by Khan Winter on 4/21/25.
//

import Foundation
import Testing
@testable import CodeEdit

struct CEWorkspaceSettingsTests {
let settings: CEWorkspaceSettings = CEWorkspaceSettings(workspaceURL: URL(filePath: "/"))

@Test
func settingsURLNoSpace() async throws {
#expect(settings.folderURL.lastPathComponent == ".codeedit")
#expect(settings.settingsURL.lastPathComponent == "settings.json")
}
}
[8]ページ先頭
©2009-2025 Movatter.jp