Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add encoding setting #1203

Closed
wants to merge 34 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
ea5bcb5
Add encoding preference
pythonista5 Mar 25, 2023
55f8dc6
(hopefully) fix swiftlint error
pythonista5 Mar 25, 2023
ed5e88f
Update TextEditingPreferences.swift
luah5 Mar 25, 2023
a070433
Update TextEditingPreferencesView.swift
luah5 Mar 25, 2023
429cfcc
Update CodeFile.swift
luah5 Mar 25, 2023
439fb1b
Update TextEditingPreferences.swift
luah5 Mar 25, 2023
1dda0c6
Update TextEditingPreferencesView.swift
luah5 Mar 25, 2023
28b54d6
Update TextEditingPreferencesView.swift
luah5 Mar 25, 2023
897a3f5
Fix comment
luah5 Mar 25, 2023
cee727b
Resolve most of @lukepistrol's review comments
luah5 Mar 25, 2023
b2380f6
Renaming
luah5 Mar 25, 2023
4f04fe9
respond to @lukepistrol's comments
pythonista5 Mar 25, 2023
25d0208
fixes
pythonista5 Mar 25, 2023
948d46c
Update CodeEdit/Features/AppPreferences/Model/Text Editing/TextEditin…
luah5 Mar 25, 2023
bdb36c6
Update CodeEdit/Features/AppPreferences/Model/Text Editing/TextEditin…
luah5 Mar 25, 2023
8235cf9
Update CodeEdit/Features/AppPreferences/Model/Text Editing/TextEditin…
luah5 Mar 25, 2023
a8a70c7
Update CodeEdit/Features/AppPreferences/Model/Text Editing/TextEditin…
luah5 Mar 25, 2023
a39a902
Update CodeEdit/Features/AppPreferences/Model/Text Editing/TextEditin…
luah5 Mar 25, 2023
48f8e97
Update CodeEdit/Features/AppPreferences/Model/Text Editing/TextEditin…
luah5 Mar 25, 2023
9154679
Merge branch 'CodeEditApp:main' into encoding-preference
luah5 Mar 25, 2023
7494704
fixing remaining issues
lukepistrol Mar 25, 2023
61730d3
fix lint error
lukepistrol Mar 25, 2023
7b8e04c
cleanup String+Encoding extension
lukepistrol Mar 25, 2023
32567b1
Merge branch 'CodeEditApp:main' into encoding-preference
luah5 Mar 29, 2023
c33ce38
Merge branch 'CodeEditApp:main' into encoding-preference
luah5 Apr 5, 2023
642b66e
Merge branch 'CodeEditApp:main' into encoding-preference
luah5 Apr 8, 2023
4219154
Merge branch 'CodeEditApp:main' into encoding-preference
luah5 Apr 12, 2023
4f58c1f
Merge branch 'CodeEditApp:main' into encoding-preference
luah5 Apr 17, 2023
1f2ff21
partially fix merge conflict
luah5 Apr 30, 2023
e02b963
fix merge conflict
luah5 Apr 30, 2023
05ec6eb
reimplement UI and fix remaining problems
luah5 Apr 30, 2023
2723ee9
fix tests
luah5 Apr 30, 2023
f67407c
resolve review comments
luah5 May 1, 2023
e1a6488
Merge branch 'CodeEditApp:main' into encoding-preference
luah5 May 1, 2023
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
4 changes: 4 additions & 0 deletions CodeEdit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
283BDCBD2972EEBD002AFF81 /* Package.resolved in Resources */ = {isa = PBXBuildFile; fileRef = 283BDCBC2972EEBD002AFF81 /* Package.resolved */; };
283BDCC52972F236002AFF81 /* AcknowledgementsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 283BDCC42972F236002AFF81 /* AcknowledgementsTests.swift */; };
2847019E27FDDF7600F87B6B /* OutlineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2847019D27FDDF7600F87B6B /* OutlineView.swift */; };
284D384E29CF6CC500E37E86 /* String+Encoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 284D384D29CF6CC500E37E86 /* String+Encoding.swift */; };
284DC84F2978B7B400BF2770 /* ContributorsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 284DC84E2978B7B400BF2770 /* ContributorsView.swift */; };
284DC8512978BA2600BF2770 /* .all-contributorsrc in Resources */ = {isa = PBXBuildFile; fileRef = 284DC8502978BA2600BF2770 /* .all-contributorsrc */; };
285FEC7027FE4B9800E57D53 /* OutlineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 285FEC6F27FE4B9800E57D53 /* OutlineTableViewCell.swift */; };
Expand Down Expand Up @@ -450,6 +451,7 @@
283BDCBC2972EEBD002AFF81 /* Package.resolved */ = {isa = PBXFileReference; lastKnownFileType = text; name = Package.resolved; path = CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved; sourceTree = "<group>"; };
283BDCC42972F236002AFF81 /* AcknowledgementsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AcknowledgementsTests.swift; sourceTree = "<group>"; };
2847019D27FDDF7600F87B6B /* OutlineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutlineView.swift; sourceTree = "<group>"; };
284D384D29CF6CC500E37E86 /* String+Encoding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Encoding.swift"; sourceTree = "<group>"; };
284DC84E2978B7B400BF2770 /* ContributorsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContributorsView.swift; sourceTree = "<group>"; };
284DC8502978BA2600BF2770 /* .all-contributorsrc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ".all-contributorsrc"; sourceTree = "<group>"; };
285FEC6D27FE4B4A00E57D53 /* OutlineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutlineViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1851,6 +1853,7 @@
isa = PBXGroup;
children = (
58D01C8E293167DC00C5B6B4 /* String+MD5.swift */,
284D384D29CF6CC500E37E86 /* String+Encoding.swift */,
D7E201AD27E8B3C000CB86D0 /* String+Ranges.swift */,
58D01C8D293167DC00C5B6B4 /* String+RemoveOccurrences.swift */,
58D01C8C293167DC00C5B6B4 /* String+SHA256.swift */,
Expand Down Expand Up @@ -2549,6 +2552,7 @@
587B9DA029300ABD00AC7927 /* PanelDivider.swift in Sources */,
58822534292C280D00E83CDE /* CursorLocation.swift in Sources */,
201169E52837B40300F92B46 /* SourceControlNavigatorRepositoriesView.swift in Sources */,
284D384E29CF6CC500E37E86 /* String+Encoding.swift in Sources */,
587B9E6A29301D8F00AC7927 /* GitLabPermissions.swift in Sources */,
B6EA1FF529DA380E001BF195 /* TextEditingSettingsView.swift in Sources */,
D7DC4B76298FFBE900D6C83D /* OutlintViewController+OutlineTableViewCellDelegate.swift in Sources */,
Expand Down
7 changes: 6 additions & 1 deletion CodeEdit/Features/CodeFile/CodeFile.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ final class CodeFileDocument: NSDocument, ObservableObject, QLPreviewItem {
@Published
var content = ""

@AppSettings(\.textEditing.defaultTextEncoding) var defaultTextEncoding

/*
This is the main type of the document.
For example, if the file is end with '.png', it will be an image,
Expand Down Expand Up @@ -96,7 +98,10 @@ final class CodeFileDocument: NSDocument, ObservableObject, QLPreviewItem {
/// This function is used for decoding files.
/// It should not throw error as unsupported files can still be opened by QLPreviewView.
override func read(from data: Data, ofType _: String) throws {
guard let content = String(data: data, encoding: .utf8) else { return }
guard let content = String(
data: data,
encoding: defaultTextEncoding
) else { return }
self.content = content
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ extension SettingsData {
/// A multiplier for setting the line height. Defaults to `1.45`
var lineHeightMultiple: Double = 1.45

/// The default text encoding used, defaults to `.utf8`
var defaultTextEncoding: String.Encoding = .utf8

/// Default initializer
init() {
self.populateCommands()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ struct TextEditingSettingsView: View {
Section {
autocompleteBraces
enableTypeOverCompletion
textEncoding
}
}
}
Expand Down Expand Up @@ -90,4 +91,15 @@ private extension TextEditingSettingsView {
.foregroundColor(.secondary)
}
}

private var textEncoding: some View {
Picker("Default Text Encoding", selection: $textEditing.defaultTextEncoding) {
ForEach(String.Encoding.allGroups, id: \.self) { group in
ForEach(group, id: \.rawValue) { encoding in
Text(encoding.description)
.tag(encoding)
}
}
}
}
}
73 changes: 73 additions & 0 deletions CodeEdit/Utils/Extensions/String/String+Encoding.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
//
// String+Encoding.swift
// CodeEdit
//
// Created by Lukas Pistrol on 25.03.23.
//

import Foundation

extension String.Encoding: Codable {
static var allGroups: [[String.Encoding]] {
[
Self.allUnicodes,
Self.allAscii,
Self.allLatin,
Self.allJapanese,
Self.allWindows,
Self.others
]
}

static var allAscii: [String.Encoding] {
[
.ascii,
.nonLossyASCII
]
}

static var allJapanese: [String.Encoding] {
[
.iso2022JP,
.japaneseEUC
]
}

static var allLatin: [String.Encoding] {
[
.isoLatin1,
.isoLatin2,
.macOSRoman
]
}

static var allUnicodes: [String.Encoding] {
[
.utf8,
.utf16,
.utf16BigEndian,
.utf16LittleEndian,
.utf32,
.utf32BigEndian,
.utf32LittleEndian
]
}

static var allWindows: [String.Encoding] {
[
.windowsCP1250,
.windowsCP1251,
.windowsCP1252,
.windowsCP1253,
.windowsCP1254
]
}

static var others: [String.Encoding] {
[
.nextstep,
.shiftJIS,
.symbol
]
}
}