coteditor/CotEditor
1
0
Fork 0
mirror of https://github.com/coteditor/CotEditor.git synced 2024-09-11 11:25:57 +03:00
Code Issues Projects Releases Wiki Activity

Ignore ill-formatted file mapping in syntax definition (fix #1625)

Browse Source
This commit is contained in:
1024jp 2024-04-28 19:47:34 +09:00
parent c1dea1aac5
commit 6f2b88afd8
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@
### Fixes
- Fix syntax highlighting for simple words.
- Fix an issue on CotEditor 4.8.0 that custom syntaxes could be ignored when it contains ill-formed file mapping definitions.

10
CotEditor/Sources/Syntax+Codable.swift
View File

@ -56,7 +56,7 @@ extension Syntax: Codable {
private struct KeyString: Codable {
var keyString: String
var keyString: String?
}
@ -78,11 +78,11 @@ extension Syntax: Codable {
self.commentDelimiters = try values.decodeIfPresent(Comment.self, forKey: .commentDelimiters) ?? .init()
self.outlines = try values.decodeIfPresent([Outline].self, forKey: .outlines) ?? []
self.completions = try values.decodeIfPresent([KeyString].self, forKey: .completions)?.map(\.keyString) ?? []
self.completions = try values.decodeIfPresent([KeyString].self, forKey: .completions)?.compactMap(\.keyString) ?? []
self.filenames = try values.decodeIfPresent([KeyString].self, forKey: .filenames)?.map(\.keyString) ?? []
self.extensions = try values.decodeIfPresent([KeyString].self, forKey: .extensions)?.map(\.keyString) ?? []
self.interpreters = try values.decodeIfPresent([KeyString].self, forKey: .interpreters)?.map(\.keyString) ?? []
self.filenames = try values.decodeIfPresent([KeyString].self, forKey: .filenames)?.compactMap(\.keyString) ?? []
self.extensions = try values.decodeIfPresent([KeyString].self, forKey: .extensions)?.compactMap(\.keyString) ?? []
self.interpreters = try values.decodeIfPresent([KeyString].self, forKey: .interpreters)?.compactMap(\.keyString) ?? []
self.metadata = try values.decodeIfPresent(Metadata.self, forKey: .metadata) ?? .init()
}

8
SyntaxMap/Sources/SyntaxMap/SyntaxMap.swift
View File

@ -65,9 +65,9 @@ public struct SyntaxMap: Equatable, Codable {
let syntaxName = url.deletingPathExtension().lastPathComponent
map[syntaxName] = SyntaxMap(
extensions: syntax.extensions?.map(\.keyString) ?? [],
filenames: syntax.filenames?.map(\.keyString) ?? [],
interpreters: syntax.interpreters?.map(\.keyString) ?? []
extensions: syntax.extensions?.compactMap(\.keyString) ?? [],
filenames: syntax.filenames?.compactMap(\.keyString) ?? [],
interpreters: syntax.interpreters?.compactMap(\.keyString) ?? []
)
}
}
@ -78,7 +78,7 @@ private struct Syntax: Codable {
struct KeyString: Codable {
var keyString: String
var keyString: String?
}
var extensions: [KeyString]?