Skip to content

Add autocompleteBraces setting to Behavior configuration #365

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.

Sign up for GitHub

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

Open
William-Laverty wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add autocompleteBraces setting to Behavior configuration #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions Sources/CodeEditSourceEditor/Controller/TextViewController+TextFormation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,14 @@ extension TextViewController {

// Filters

setUpOpenPairFilters(pairs: BracketPairs.allValues)
if configuration.behavior.autocompleteBraces {
setUpOpenPairFilters(pairs: BracketPairs.allValues)
setUpDeletePairFilters(pairs: BracketPairs.allValues)
}
setUpTagFilter()
setUpNewlineTabFilters(indentOption: configuration.behavior.indentOption)
setUpDeletePairFilters(pairs: BracketPairs.allValues)
setUpDeleteWhitespaceFilter(indentOption: configuration.behavior.indentOption)

}

/// Returns a `TextualIndenter` based on available language configuration.
Expand Down
7 changes: 6 additions & 1 deletion ...s/CodeEditSourceEditor/SourceEditorConfiguration/SourceEditorConfiguration+Behavior.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ extension SourceEditorConfiguration {
/// false, the editor is selectable but not editable.
public var isSelectable: Bool = true

/// Controls whether opening brackets/braces are automatically completed with their closing counterpart.
public var autocompleteBraces: Bool = true

/// Determines what character(s) to insert when the tab key is pressed. Defaults to 4 spaces.
public var indentOption: IndentOption = .spaces(count: 4)

Expand All @@ -23,11 +26,13 @@ extension SourceEditorConfiguration {
public init(
isEditable: Bool = true,
isSelectable: Bool = true,
autocompleteBraces: Bool = true,
indentOption: IndentOption = .spaces(count: 4),
reformatAtColumn: Int = 80
) {
self.isEditable = isEditable
self.isSelectable = isSelectable
self.autocompleteBraces = autocompleteBraces
self.indentOption = indentOption
self.reformatAtColumn = reformatAtColumn
}
Expand All @@ -48,7 +53,7 @@ extension SourceEditorConfiguration {
controller.textView.isSelectable = isSelectable
}

if oldConfig?.indentOption != indentOption {
if oldConfig?.indentOption != indentOption || oldConfig?.autocompleteBraces != autocompleteBraces {
controller.setUpTextFormation()
}

Expand Down