Skip to content

Commit 9b44de3

Browse files
committed
Update to use new SourceEditor API
1 parent ce8d702 commit 9b44de3

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

CodeEdit/Features/Editor/Views/CodeFileView.swift

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ struct CodeFileView: View {
5757
var reformatAtColumn
5858
@AppSettings(\.textEditing.showReformattingGuide)
5959
var showReformattingGuide
60+
@AppSettings(\.textEditing.invisibleCharacters)
61+
var invisibleCharactersConfiguration
62+
@AppSettings(\.textEditing.warningCharacters)
63+
var warningCharacters
6064

6165
@Environment(\.colorScheme)
6266
private var colorScheme
@@ -139,8 +143,8 @@ struct CodeFileView: View {
139143
showMinimap: showMinimap,
140144
showReformattingGuide: showReformattingGuide,
141145
showFoldingRibbon: showFoldingRibbon,
142-
invisibleCharactersConfiguration: .empty,
143-
warningCharacters: []
146+
invisibleCharactersConfiguration: invisibleCharactersConfiguration.textViewOption(),
147+
warningCharacters: Set(warningCharacters.characters.keys)
144148
)
145149
),
146150
state: $editorState,
@@ -208,3 +212,14 @@ private extension SettingsData.TextEditingSettings.IndentOption {
208212
}
209213
}
210214
}
215+
216+
private extension SettingsData.TextEditingSettings.InvisibleCharactersConfig {
217+
func textViewOption() -> InvisibleCharactersConfiguration {
218+
guard self.enabled else { return .empty }
219+
return InvisibleCharactersConfiguration(
220+
showSpaces: self.showSpaces,
221+
showTabs: self.showTabs,
222+
showLineEndings: self.showLineEndings
223+
)
224+
}
225+
}

0 commit comments

Comments
 (0)