Skip to content

Commit 5d93405

Browse files
kishikawakatsumikishikawakatsumi
committed
Refactor
1 parent 4e6f1e4 commit 5d93405

File tree

6 files changed

+81
-81
lines changed

6 files changed

+81
-81
lines changed

‎Resources/branch_main/Sources/parser/TokenVisitor.swift‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ final class TokenVisitor: SyntaxRewriter {
4343

4444
list.append(
4545
"<span class='\(className)' " +
46-
"data-title='\("\(node.trimmed)".htmlEscaped().displayInvisibles())' " +
47-
"data-content='\(content.htmlEscaped().substituteInvisibles())' " +
48-
"data-type='\(type.htmlEscaped())' " +
46+
"data-title='\("\(node.trimmed)".escapeHTML().replaceInvisiblesWithSymbols())' " +
47+
"data-content='\(content.escapeHTML().replaceInvisiblesWithHTML())' " +
48+
"data-type='\(type.escapeHTML())' " +
4949
#"data-range='{"startRow":\#(start.line),"startColumn":\#(start.column),"endRow":\#(end.line),"endColumn":\#(end.column)}'>"#
5050
)
5151

@@ -146,9 +146,9 @@ final class TokenVisitor: SyntaxRewriter {
146146
override func visit(_ token: TokenSyntax) -> TokenSyntax {
147147
current.text = token
148148
.text
149-
.htmlEscaped()
150-
.substituteInvisibles()
151-
.transformWhitespaces()
149+
.escapeHTML()
150+
.replaceInvisiblesWithHTML()
151+
.replaceHTMLWhitespacesToSymbols()
152152
if token.presence == .missing {
153153
current.class = "\(token.presence)"
154154
}
@@ -157,13 +157,13 @@ final class TokenVisitor: SyntaxRewriter {
157157
token.leadingTrivia.forEach { (piece) in
158158
let trivia = processTriviaPiece(piece)
159159
list.append(trivia)
160-
current.token?.leadingTrivia += trivia.transformWhitespaces()
160+
current.token?.leadingTrivia += trivia.replaceHTMLWhitespacesToSymbols()
161161
}
162162
processToken(token)
163163
token.trailingTrivia.forEach { (piece) in
164164
let trivia = processTriviaPiece(piece)
165165
list.append(trivia)
166-
current.token?.trailingTrivia += trivia.transformWhitespaces()
166+
current.token?.trailingTrivia += trivia.replaceHTMLWhitespacesToSymbols()
167167
}
168168

169169
return token
@@ -192,21 +192,21 @@ final class TokenVisitor: SyntaxRewriter {
192192
let end = sourceRange.end
193193
let text = token.presence == .present || showMissingTokens ? token.text : ""
194194
list.append(
195-
"<span class='token \(kind.htmlEscaped()) \(token.presence)' " +
196-
"data-title='\("\(token.trimmed)".htmlEscaped().displayInvisibles())' " +
197-
"data-content='\("\(token.tokenKind)".htmlEscaped().substituteInvisibles())' " +
195+
"<span class='token \(kind.escapeHTML()) \(token.presence)' " +
196+
"data-title='\("\(token.trimmed)".escapeHTML().replaceInvisiblesWithSymbols())' " +
197+
"data-content='\("\(token.tokenKind)".escapeHTML().replaceInvisiblesWithHTML())' " +
198198
"data-type='Token' " +
199199
#"data-range='{"startRow":\#(start.line),"startColumn":\#(start.column),"endRow":\#(end.line),"endColumn":\#(end.column)}'>"# +
200-
"\(text.htmlEscaped().substituteInvisibles())</span>"
200+
"\(text.escapeHTML().replaceInvisiblesWithHTML())</span>"
201201
)
202202
}
203203

204204
private func processTriviaPiece(_ piece: TriviaPiece) -> String {
205205
func wrapWithSpanTag(class c: String, text: String) -> String {
206-
"<span class='\(c.htmlEscaped())' " +
207-
"data-title='\("\(piece)".htmlEscaped().displayInvisibles())' " +
208-
"data-content='\(c.htmlEscaped().substituteInvisibles())' " +
209-
"data-type='Trivia'>\(text.htmlEscaped().substituteInvisibles())</span>"
206+
"<span class='\(c.escapeHTML())' " +
207+
"data-title='\("\(piece)".escapeHTML().replaceInvisiblesWithSymbols())' " +
208+
"data-content='\(c.escapeHTML().replaceInvisiblesWithHTML())' " +
209+
"data-type='Trivia'>\(text.escapeHTML().replaceInvisiblesWithHTML())</span>"
210210
}
211211

212212
var trivia = ""
@@ -241,7 +241,7 @@ final class TokenVisitor: SyntaxRewriter {
241241
}
242242

243243
private extension String {
244-
func htmlEscaped() -> String {
244+
func escapeHTML() -> String {
245245
var string = self
246246
let specialCharacters = [
247247
("&", "&amp;"),
@@ -256,19 +256,19 @@ private extension String {
256256
return string
257257
}
258258

259-
func substituteInvisibles() -> String {
259+
func replaceInvisiblesWithHTML() -> String {
260260
self
261261
.replacingOccurrences(of: " ", with: "&nbsp;")
262262
.replacingOccurrences(of: "\n", with: "<br/>")
263263
}
264264

265-
func displayInvisibles() -> String {
265+
func replaceInvisiblesWithSymbols() -> String {
266266
self
267267
.replacingOccurrences(of: " ", with: "␣")
268268
.replacingOccurrences(of: "\n", with: "↲")
269269
}
270270

271-
func transformWhitespaces() -> String {
271+
func replaceHTMLWhitespacesToSymbols() -> String {
272272
self
273273
.replacingOccurrences(of: "&nbsp;", with: "␣")
274274
.replacingOccurrences(of: "<br/>", with: "↲<br/>")

‎Resources/branch_main/Sources/parser/TreeNode.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ final class TreeNode: Codable {
1313

1414
init(id: Int, text: String, range: Range, type: SyntaxType) {
1515
self.id = id
16-
self.text = text.htmlEscaped()
16+
self.text = text.escapeHTML()
1717
self.range = range
1818
self.type = type
1919
}
@@ -73,9 +73,9 @@ struct StructureProperty: Codable, Equatable {
7373
let ref: String?
7474

7575
init(name: String, value: StructureValue? = nil, ref: String? = nil) {
76-
self.name = name.htmlEscaped()
76+
self.name = name.escapeHTML()
7777
self.value = value
78-
self.ref = ref?.htmlEscaped()
78+
self.ref = ref?.escapeHTML()
7979
}
8080
}
8181

@@ -96,8 +96,8 @@ struct StructureValue: Codable, Equatable {
9696
let kind: String?
9797

9898
init(text: String, kind: String? = nil) {
99-
self.text = text.htmlEscaped()
100-
self.kind = kind?.htmlEscaped()
99+
self.text = text.escapeHTML()
100+
self.kind = kind?.escapeHTML()
101101
}
102102
}
103103

@@ -127,7 +127,7 @@ struct Token: Codable, Equatable {
127127
var trailingTrivia: String
128128

129129
init(kind: String, leadingTrivia: String, trailingTrivia: String) {
130-
self.kind = kind.htmlEscaped()
130+
self.kind = kind.escapeHTML()
131131
self.leadingTrivia = leadingTrivia
132132
self.trailingTrivia = trailingTrivia
133133
}
@@ -146,7 +146,7 @@ extension Token: CustomStringConvertible {
146146
}
147147

148148
private extension String {
149-
func htmlEscaped() -> String {
149+
func escapeHTML() -> String {
150150
var string = self
151151
let specialCharacters = [
152152
("&", "&amp;"),

‎Resources/branch_release-5.9/Sources/parser/TokenVisitor.swift‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ final class TokenVisitor: SyntaxRewriter {
4343

4444
list.append(
4545
"<span class='\(className)' " +
46-
"data-title='\("\(node.trimmed)".htmlEscaped().displayInvisibles())' " +
47-
"data-content='\(content.htmlEscaped().substituteInvisibles())' " +
48-
"data-type='\(type.htmlEscaped())' " +
46+
"data-title='\("\(node.trimmed)".escapeHTML().replaceInvisiblesWithSymbols())' " +
47+
"data-content='\(content.escapeHTML().replaceInvisiblesWithHTML())' " +
48+
"data-type='\(type.escapeHTML())' " +
4949
#"data-range='{"startRow":\#(start.line),"startColumn":\#(start.column),"endRow":\#(end.line),"endColumn":\#(end.column)}'>"#
5050
)
5151

@@ -146,9 +146,9 @@ final class TokenVisitor: SyntaxRewriter {
146146
override func visit(_ token: TokenSyntax) -> TokenSyntax {
147147
current.text = token
148148
.text
149-
.htmlEscaped()
150-
.substituteInvisibles()
151-
.transformWhitespaces()
149+
.escapeHTML()
150+
.replaceInvisiblesWithHTML()
151+
.replaceHTMLWhitespacesToSymbols()
152152
if token.presence == .missing {
153153
current.class = "\(token.presence)"
154154
}
@@ -157,13 +157,13 @@ final class TokenVisitor: SyntaxRewriter {
157157
token.leadingTrivia.forEach { (piece) in
158158
let trivia = processTriviaPiece(piece)
159159
list.append(trivia)
160-
current.token?.leadingTrivia += trivia.transformWhitespaces()
160+
current.token?.leadingTrivia += trivia.replaceHTMLWhitespacesToSymbols()
161161
}
162162
processToken(token)
163163
token.trailingTrivia.forEach { (piece) in
164164
let trivia = processTriviaPiece(piece)
165165
list.append(trivia)
166-
current.token?.trailingTrivia += trivia.transformWhitespaces()
166+
current.token?.trailingTrivia += trivia.replaceHTMLWhitespacesToSymbols()
167167
}
168168

169169
return token
@@ -192,21 +192,21 @@ final class TokenVisitor: SyntaxRewriter {
192192
let end = sourceRange.end
193193
let text = token.presence == .present || showMissingTokens ? token.text : ""
194194
list.append(
195-
"<span class='token \(kind.htmlEscaped()) \(token.presence)' " +
196-
"data-title='\("\(token.trimmed)".htmlEscaped().displayInvisibles())' " +
197-
"data-content='\("\(token.tokenKind)".htmlEscaped().substituteInvisibles())' " +
195+
"<span class='token \(kind.escapeHTML()) \(token.presence)' " +
196+
"data-title='\("\(token.trimmed)".escapeHTML().replaceInvisiblesWithSymbols())' " +
197+
"data-content='\("\(token.tokenKind)".escapeHTML().replaceInvisiblesWithHTML())' " +
198198
"data-type='Token' " +
199199
#"data-range='{"startRow":\#(start.line),"startColumn":\#(start.column),"endRow":\#(end.line),"endColumn":\#(end.column)}'>"# +
200-
"\(text.htmlEscaped().substituteInvisibles())</span>"
200+
"\(text.escapeHTML().replaceInvisiblesWithHTML())</span>"
201201
)
202202
}
203203

204204
private func processTriviaPiece(_ piece: TriviaPiece) -> String {
205205
func wrapWithSpanTag(class c: String, text: String) -> String {
206-
"<span class='\(c.htmlEscaped())' " +
207-
"data-title='\("\(piece)".htmlEscaped().displayInvisibles())' " +
208-
"data-content='\(c.htmlEscaped().substituteInvisibles())' " +
209-
"data-type='Trivia'>\(text.htmlEscaped().substituteInvisibles())</span>"
206+
"<span class='\(c.escapeHTML())' " +
207+
"data-title='\("\(piece)".escapeHTML().replaceInvisiblesWithSymbols())' " +
208+
"data-content='\(c.escapeHTML().replaceInvisiblesWithHTML())' " +
209+
"data-type='Trivia'>\(text.escapeHTML().replaceInvisiblesWithHTML())</span>"
210210
}
211211

212212
var trivia = ""
@@ -241,7 +241,7 @@ final class TokenVisitor: SyntaxRewriter {
241241
}
242242

243243
private extension String {
244-
func htmlEscaped() -> String {
244+
func escapeHTML() -> String {
245245
var string = self
246246
let specialCharacters = [
247247
("&", "&amp;"),
@@ -256,19 +256,19 @@ private extension String {
256256
return string
257257
}
258258

259-
func substituteInvisibles() -> String {
259+
func replaceInvisiblesWithHTML() -> String {
260260
self
261261
.replacingOccurrences(of: " ", with: "&nbsp;")
262262
.replacingOccurrences(of: "\n", with: "<br/>")
263263
}
264264

265-
func displayInvisibles() -> String {
265+
func replaceInvisiblesWithSymbols() -> String {
266266
self
267267
.replacingOccurrences(of: " ", with: "␣")
268268
.replacingOccurrences(of: "\n", with: "↲")
269269
}
270270

271-
func transformWhitespaces() -> String {
271+
func replaceHTMLWhitespacesToSymbols() -> String {
272272
self
273273
.replacingOccurrences(of: "&nbsp;", with: "␣")
274274
.replacingOccurrences(of: "<br/>", with: "↲<br/>")

‎Resources/branch_release-5.9/Sources/parser/TreeNode.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ final class TreeNode: Codable {
1313

1414
init(id: Int, text: String, range: Range, type: SyntaxType) {
1515
self.id = id
16-
self.text = text.htmlEscaped()
16+
self.text = text.escapeHTML()
1717
self.range = range
1818
self.type = type
1919
}
@@ -73,9 +73,9 @@ struct StructureProperty: Codable, Equatable {
7373
let ref: String?
7474

7575
init(name: String, value: StructureValue? = nil, ref: String? = nil) {
76-
self.name = name.htmlEscaped()
76+
self.name = name.escapeHTML()
7777
self.value = value
78-
self.ref = ref?.htmlEscaped()
78+
self.ref = ref?.escapeHTML()
7979
}
8080
}
8181

@@ -96,8 +96,8 @@ struct StructureValue: Codable, Equatable {
9696
let kind: String?
9797

9898
init(text: String, kind: String? = nil) {
99-
self.text = text.htmlEscaped()
100-
self.kind = kind?.htmlEscaped()
99+
self.text = text.escapeHTML()
100+
self.kind = kind?.escapeHTML()
101101
}
102102
}
103103

@@ -127,7 +127,7 @@ struct Token: Codable, Equatable {
127127
var trailingTrivia: String
128128

129129
init(kind: String, leadingTrivia: String, trailingTrivia: String) {
130-
self.kind = kind.htmlEscaped()
130+
self.kind = kind.escapeHTML()
131131
self.leadingTrivia = leadingTrivia
132132
self.trailingTrivia = trailingTrivia
133133
}
@@ -146,7 +146,7 @@ extension Token: CustomStringConvertible {
146146
}
147147

148148
private extension String {
149-
func htmlEscaped() -> String {
149+
func escapeHTML() -> String {
150150
var string = self
151151
let specialCharacters = [
152152
("&", "&amp;"),

0 commit comments

Comments
 (0)