Skip to content

Avoid creating multiple instances of DefaultTheme. #380

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
mc-public wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Avoid creating multiple instances of DefaultTheme. #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f06aac2
# Fix Theme Re-Create
mc-public Jun 10, 2024
2e0af85
Merge remote-tracking branch 'refs/remotes/origin/main'
mc-public Aug 19, 2024
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
2 changes: 1 addition & 1 deletion Sources/Runestone/StringSyntaxHighlighter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public final class StringSyntaxHighlighter {
/// - language: The language to use when parsing the text
/// - languageProvider: Object that can provide embedded languages on demand. A strong reference will be stored to the language provider..
public init(
theme: Theme = DefaultTheme(),
theme: Theme = DefaultTheme.share,
language: TreeSitterLanguage,
languageProvider: TreeSitterLanguageProvider? = nil
) {
Expand Down
2 changes: 2 additions & 0 deletions Sources/Runestone/TextView/Appearance/DefaultTheme.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ public final class DefaultTheme: Runestone.Theme {
public let selectionColor = UIColor(themeColorNamed: "selection")

public init() {}

public static let share = DefaultTheme()

// swiftlint:disable:next cyclomatic_complexity
public func textColor(for highlightName: String) -> UIColor? {
Expand Down
2 changes: 1 addition & 1 deletion Sources/Runestone/TextView/Core/LayoutManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ final class LayoutManager {
}
}
}
var theme: Theme = DefaultTheme() {
var theme: Theme = DefaultTheme.share {
didSet {
if theme !== oldValue {
gutterBackgroundView.backgroundColor = theme.gutterBackgroundColor
Expand Down
2 changes: 1 addition & 1 deletion Sources/Runestone/TextView/Core/TextView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ open class TextView: UIScrollView {
/// Create a new text view.
/// - Parameter frame: The frame rectangle of the text view.
override public init(frame: CGRect) {
textInputView = TextInputView(theme: DefaultTheme())
textInputView = TextInputView(theme: DefaultTheme.share)
super.init(frame: frame)
backgroundColor = .white
textInputView.delegate = self
Expand Down
2 changes: 1 addition & 1 deletion Sources/Runestone/TextView/LineController/LineController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ final class LineController {
}
}
}
var theme: Theme = DefaultTheme() {
var theme: Theme = DefaultTheme.share {
didSet {
syntaxHighlighter?.theme = theme
applyThemeToAllLineFragmentControllers()
Expand Down
2 changes: 1 addition & 1 deletion ...Runestone/TextView/SyntaxHighlighting/Internal/PlainText/PlainTextSyntaxHighlighter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import CoreGraphics
import Foundation

final class PlainTextSyntaxHighlighter: LineSyntaxHighlighter {
var theme: Theme = DefaultTheme()
var theme: Theme = DefaultTheme.share
var kern: CGFloat = 0
var canHighlight: Bool {
false
Expand Down
2 changes: 1 addition & 1 deletion ...nestone/TextView/SyntaxHighlighting/Internal/TreeSitter/TreeSitterSyntaxHighlighter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ enum TreeSitterSyntaxHighlighterError: LocalizedError {
}

final class TreeSitterSyntaxHighlighter: LineSyntaxHighlighter {
var theme: Theme = DefaultTheme()
var theme: Theme = DefaultTheme.share
var kern: CGFloat = 0
var canHighlight: Bool {
languageMode.canHighlight
Expand Down