From 406df90fc9975f926a9ca436d4c3a7dad3485312 Mon Sep 17 00:00:00 2001 From: Paul Ebose Date: Tue, 23 Jul 2024 05:40:42 +0100 Subject: [PATCH 1/4] important fix to preview fileDocuments (using QuickLook) that have a utType but are neither images nor PDFs See #1783 --- CodeEdit/Features/Editor/Views/NonTextFileView.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CodeEdit/Features/Editor/Views/NonTextFileView.swift b/CodeEdit/Features/Editor/Views/NonTextFileView.swift index 3ff4a30f18..7523b384c8 100644 --- a/CodeEdit/Features/Editor/Views/NonTextFileView.swift +++ b/CodeEdit/Features/Editor/Views/NonTextFileView.swift @@ -32,6 +32,9 @@ struct NonTextFileView: View { } else if utType.conforms(to: .pdf) { PDFFileView(fileURL) .modifier(UpdateStatusBarInfo(withURL: fileURL)) + } else { + AnyFileView(fileURL) + .modifier(UpdateStatusBarInfo(withURL: fileURL)) } } else { AnyFileView(fileURL) From 0d28b86c8e3eda2a3b0ca148f86990323c85ef6c Mon Sep 17 00:00:00 2001 From: Paul Ebose Date: Tue, 23 Jul 2024 05:45:06 +0100 Subject: [PATCH 2/4] make `NonTextFileView` a bit more readable --- .../Editor/Views/NonTextFileView.swift | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/CodeEdit/Features/Editor/Views/NonTextFileView.swift b/CodeEdit/Features/Editor/Views/NonTextFileView.swift index 7523b384c8..8822219459 100644 --- a/CodeEdit/Features/Editor/Views/NonTextFileView.swift +++ b/CodeEdit/Features/Editor/Views/NonTextFileView.swift @@ -24,23 +24,16 @@ struct NonTextFileView: View { Group { if let fileURL = fileDocument.fileURL { - if let utType = fileDocument.utType { - - if utType.conforms(to: .image) { - ImageFileView(fileURL) - .modifier(UpdateStatusBarInfo(withURL: fileURL)) - } else if utType.conforms(to: .pdf) { - PDFFileView(fileURL) - .modifier(UpdateStatusBarInfo(withURL: fileURL)) - } else { - AnyFileView(fileURL) - .modifier(UpdateStatusBarInfo(withURL: fileURL)) - } + if fileDocument.utType != nil && fileDocument.utType!.conforms(to: .image) { + ImageFileView(fileURL) + .modifier(UpdateStatusBarInfo(withURL: fileURL)) + } else if fileDocument.utType != nil && fileDocument.utType!.conforms(to: .pdf) { + PDFFileView(fileURL) + .modifier(UpdateStatusBarInfo(withURL: fileURL)) } else { AnyFileView(fileURL) .modifier(UpdateStatusBarInfo(withURL: fileURL)) } - } else { ZStack { Text("Cannot retrieve URL to the file you opened.") From dab7e5bcb0512b1fba3befa3aa2050a130caa67d Mon Sep 17 00:00:00 2001 From: Paul Ebose Date: Fri, 26 Jul 2024 15:22:10 +0100 Subject: [PATCH 3/4] nest duplicate `utType` if checks in `NonTextFileView` --- .../Editor/Views/NonTextFileView.swift | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/CodeEdit/Features/Editor/Views/NonTextFileView.swift b/CodeEdit/Features/Editor/Views/NonTextFileView.swift index 8822219459..1dd933f6f6 100644 --- a/CodeEdit/Features/Editor/Views/NonTextFileView.swift +++ b/CodeEdit/Features/Editor/Views/NonTextFileView.swift @@ -21,15 +21,21 @@ struct NonTextFileView: View { @EnvironmentObject private var statusBarViewModel: StatusBarViewModel var body: some View { - Group { if let fileURL = fileDocument.fileURL { - if fileDocument.utType != nil && fileDocument.utType!.conforms(to: .image) { - ImageFileView(fileURL) - .modifier(UpdateStatusBarInfo(withURL: fileURL)) - } else if fileDocument.utType != nil && fileDocument.utType!.conforms(to: .pdf) { - PDFFileView(fileURL) - .modifier(UpdateStatusBarInfo(withURL: fileURL)) + if let utType = fileDocument.utType { + + if utType.conforms(to: .image) { + ImageFileView(fileURL) + .modifier(UpdateStatusBarInfo(withURL: fileURL)) + } else if utType.conforms(to: .pdf) { + PDFFileView(fileURL) + .modifier(UpdateStatusBarInfo(withURL: fileURL)) + } else { + AnyFileView(fileURL) + .modifier(UpdateStatusBarInfo(withURL: fileURL)) + } + } else { AnyFileView(fileURL) .modifier(UpdateStatusBarInfo(withURL: fileURL)) @@ -44,6 +50,5 @@ struct NonTextFileView: View { statusBarViewModel.dimensions = nil statusBarViewModel.fileSize = nil } - } } From 2efecb361ebff19d5f924c9aa4d368e7785ef04f Mon Sep 17 00:00:00 2001 From: Austin Condiff Date: Sat, 27 Jul 2024 09:52:59 -0500 Subject: [PATCH 4/4] Update CodeEdit/Features/Editor/Views/NonTextFileView.swift --- CodeEdit/Features/Editor/Views/NonTextFileView.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/CodeEdit/Features/Editor/Views/NonTextFileView.swift b/CodeEdit/Features/Editor/Views/NonTextFileView.swift index 1dd933f6f6..b64302897e 100644 --- a/CodeEdit/Features/Editor/Views/NonTextFileView.swift +++ b/CodeEdit/Features/Editor/Views/NonTextFileView.swift @@ -35,7 +35,6 @@ struct NonTextFileView: View { AnyFileView(fileURL) .modifier(UpdateStatusBarInfo(withURL: fileURL)) } - } else { AnyFileView(fileURL) .modifier(UpdateStatusBarInfo(withURL: fileURL))