Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Simplify Swift linting and math parsing

Manav Rathiedbe0ad3f5e1
diff --git a/apple/.swiftlint.yml b/apple/.swiftlint.yml
index 00baf1b3a7..a69abc4b2b 100644
--- a/apple/.swiftlint.yml
+++ b/apple/.swiftlint.yml
@@ -16,6 +16,5 @@ empty_count:
only_after_dot: true
excluded:
- - apps/ensu/Ensu/Generated/ensu.swift
- - apps/cast/Cast/Generated/cast.swift
+ - "apps/*/*/Generated"
- .build
diff --git a/apple/apps/ensu/Ensu/Chat/MessageList/MessageListComponents.swift b/apple/apps/ensu/Ensu/Chat/MessageList/MessageListComponents.swift
index b6a652faf4..8bed17b3cb 100644
--- a/apple/apps/ensu/Ensu/Chat/MessageList/MessageListComponents.swift
+++ b/apple/apps/ensu/Ensu/Chat/MessageList/MessageListComponents.swift
@@ -860,12 +860,6 @@ private let messageInlineFonts = InlineFontSet(
mathSize: 15
)
-// swift-format-ignore: NeverUseForceTry
-private let inlineMathPattern = try! NSRegularExpression(
- pattern: #"(?<!\\)\$(?!\$)(?:[^$\n\\]|\\.)+?(?<!\\)\$(?!\$)|\\\((?:[^\n\\]|\\.)+?\\\)"#,
- options: []
-)
-
private func parseInlineSegments(_ text: String) -> [InlineSegment] {
let characters = Array(text)
var segments: [InlineSegment] = []
@@ -881,7 +875,9 @@ private func parseInlineSegments(_ text: String) -> [InlineSegment] {
}
while index < characters.count {
- if let mathMatch = findInlineMathMatch(characters, startIndex: index) {
+ if currentStyle != .code,
+ let mathMatch = findInlineMathMatch(characters, startIndex: index)
+ {
flushBuffer()
segments.append(.math(mathMatch.latex))
index = mathMatch.endIndex
@@ -960,6 +956,7 @@ private func findInlineMathMatch(_ characters: [Character], startIndex: Int) ->
return nil
}
if characters[index + 1] == ")" {
+ guard index > startIndex + 2 else { return nil }
return InlineMathMatch(
latex: String(characters[(startIndex + 2)..<index]),
endIndex: index + 2
@@ -973,7 +970,10 @@ private func findInlineMathMatch(_ characters: [Character], startIndex: Int) ->
return nil
}
- if characters[startIndex] != "$" || (startIndex > 0 && characters[startIndex - 1] == "\\") {
+ if characters[startIndex] != "$"
+ || (startIndex > 0
+ && (characters[startIndex - 1] == "\\" || characters[startIndex - 1] == "$"))
+ {
return nil
}
if startIndex + 1 < characters.count && characters[startIndex + 1] == "$" {
@@ -985,10 +985,10 @@ private func findInlineMathMatch(_ characters: [Character], startIndex: Int) ->
if characters[index] == "\n" {
return nil
}
- if characters[index] == "$" && characters[index - 1] != "\\"
- && (index + 1 >= characters.count || characters[index + 1] != "$")
- {
- if index == startIndex + 1 {
+ if characters[index] == "$" && characters[index - 1] != "\\" {
+ if index == startIndex + 1
+ || (index + 1 < characters.count && characters[index + 1] == "$")
+ {
return nil
}
return InlineMathMatch(
@@ -1041,9 +1041,10 @@ private func hasClosingSingleAsterisk(_ characters: [Character], startIndex: Int
}
private func containsInlineMath(_ text: String) -> Bool {
- let nsText = text as NSString
- return inlineMathPattern.firstMatch(
- in: text, range: NSRange(location: 0, length: nsText.length)) != nil
+ parseInlineSegments(text).contains {
+ if case .math = $0 { return true }
+ return false
+ }
}
private func styledInlineText(
diff --git a/apple/apps/ensu/Ensu/Settings/LogsView.swift b/apple/apps/ensu/Ensu/Settings/LogsView.swift
index b0e8bd8862..ad05b86e03 100644
--- a/apple/apps/ensu/Ensu/Settings/LogsView.swift
+++ b/apple/apps/ensu/Ensu/Settings/LogsView.swift
@@ -133,20 +133,16 @@ struct LogsView: View {
for line in text.components(separatedBy: .newlines) {
guard !line.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else { continue }
- if let match = logLineRegex.firstMatch(
- in: line, options: [], range: NSRange(line.startIndex..., in: line)),
- let tagRange = Range(match.range(at: 1), in: line),
- let levelRange = Range(match.range(at: 2), in: line),
- let timestampRange = Range(match.range(at: 3), in: line),
- let messageRange = Range(match.range(at: 4), in: line)
+ if let match = line.wholeMatch(
+ of: #/\[(.+?)\]\[(.+?)\] \[(.+?)\] (.*)/#.matchingSemantics(.unicodeScalar))
{
+ let (_, tag, level, timestamp, message) = match.output
entries.append(
EnsuLogEntry(
- timestamp: logLineFormatter.date(from: String(line[timestampRange]))
- ?? Date(),
- level: EnsuLogLevel(rawValue: String(line[levelRange])) ?? .info,
- tag: String(line[tagRange]),
- message: String(line[messageRange]),
+ timestamp: logLineFormatter.date(from: String(timestamp)) ?? Date(),
+ level: EnsuLogLevel(rawValue: String(level)) ?? .info,
+ tag: String(tag),
+ message: String(message),
details: nil
)
)
@@ -324,12 +320,6 @@ private let logLineFormatter: DateFormatter = {
return formatter
}()
-private let logLineRegex: NSRegularExpression = {
- let pattern = "^\\[(.+?)\\]\\[(.+?)\\] \\[(.+?)\\] (.*)$"
- // swift-format-ignore: NeverUseForceTry
- return try! NSRegularExpression(pattern: pattern, options: [])
-}()
-
import UIKit
struct ActivityView: UIViewControllerRepresentable {
diff --git a/apple/scripts/lint.sh b/apple/scripts/lint.sh
index a4451c4f9c..d3cb1d8137 100755
--- a/apple/scripts/lint.sh
+++ b/apple/scripts/lint.sh
@@ -3,6 +3,5 @@ set -eo pipefail
cd "$(dirname "$0")/.."
-git ls-files -z --cached --others --exclude-standard -- '*.swift' |
- xargs -0 swift format lint --strict
+swift format lint --recursive --strict .
swift package plugin --allow-writing-to-package-directory swiftlint lint --strict
diff --git a/rust/tools/codegen/src/main.rs b/rust/tools/codegen/src/main.rs
index 86b8b74de8..641d740cc9 100644
--- a/rust/tools/codegen/src/main.rs
+++ b/rust/tools/codegen/src/main.rs
@@ -478,8 +478,7 @@ fn sanitize_generated_swift_bindings(swift_file: &Path, crate_name: &str) -> Res
.map_err(|error| format!("failed to read {}: {error}", swift_file.display()))?;
let free_call_prefix = format!("try! rustCall {{ uniffi_{crate_name}_fn_free_");
- let mut rewritten = String::with_capacity(original.len());
- let mut replaced = false;
+ let mut rewritten = String::from("// swift-format-ignore-file\n");
for segment in original.split_inclusive('\n') {
let line = segment.strip_suffix('\n').unwrap_or(segment);
@@ -494,16 +493,13 @@ fn sanitize_generated_swift_bindings(swift_file: &Path, crate_name: &str) -> Res
if segment.ends_with('\n') {
rewritten.push('\n');
}
- replaced = true;
} else {
rewritten.push_str(segment);
}
}
- if replaced {
- fs::write(swift_file, rewritten)
- .map_err(|error| format!("failed to write {}: {error}", swift_file.display()))?;
- }
+ fs::write(swift_file, rewritten)
+ .map_err(|error| format!("failed to write {}: {error}", swift_file.display()))?;
Ok(())
}