Skip to content

Commit 2f62477

Browse files
kishikawakatsumikishikawakatsumi
authored
Merge pull request #363 from SwiftFiddle/revert-362-string-width
Revert "Fix string width"
2 parents 7cb7d1c + bd4c111 commit 2f62477

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+7
-8190
lines changed

‎Public/js/editor.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@ export class Editor {
5252

5353
setSelection(range) {
5454
this.editor.setSelection(
55-
{ ch: range.graphemeStartColumn - 1, line: range.startRow - 1 },
56-
{ ch: range.graphemeEndColumn - 1, line: range.endRow - 1 },
55+
{ ch: range.startColumn - 1, line: range.startRow - 1 },
56+
{ ch: range.endColumn - 1, line: range.endRow - 1 },
5757
{ scroll: false }
5858
);
5959
}
6060

6161
markText(range) {
6262
return this.editor.markText(
63-
{ ch: range.graphemeStartColumn - 1, line: range.startRow - 1 },
64-
{ ch: range.graphemeEndColumn - 1, line: range.endRow - 1 },
63+
{ ch: range.startColumn - 1, line: range.startRow - 1 },
64+
{ ch: range.endColumn - 1, line: range.endRow - 1 },
6565
{
6666
className: "editor-marker",
6767
startStyle: "editor-marker-start",

‎Resources/parsers/50800/Package.resolved

-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
{
22
"pins" : [
3-
{
4-
"identity" : "stringwidth",
5-
"kind" : "remoteSourceControl",
6-
"location" : "https://github.com/kishikawakatsumi/StringWidth.git",
7-
"state" : {
8-
"branch" : "main",
9-
"revision" : "5cdd9a3f11758364ea920635992c9d54aa14c9bd"
10-
}
11-
},
123
{
134
"identity" : "swift-syntax",
145
"kind" : "remoteSourceControl",

‎Resources/parsers/50800/Package.swift

-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ let package = Package(
88
],
99
dependencies: [
1010
.package(url: "https://github.com/apple/swift-syntax", from: "508.0.1"),
11-
.package(url: "https://github.com/kishikawakatsumi/StringWidth.git", branch: "main"),
1211
],
1312
targets: [
1413
.executableTarget(
@@ -17,7 +16,6 @@ let package = Package(
1716
.product(name: "SwiftSyntax", package: "swift-syntax"),
1817
.product(name: "SwiftOperators", package: "swift-syntax"),
1918
.product(name: "SwiftParser", package: "swift-syntax"),
20-
.product(name: "StringWidth", package: "StringWidth"),
2119
],
2220
swiftSettings: [
2321
.unsafeFlags(["-cross-module-optimization"], .when(configuration: .release))

‎Resources/parsers/50800/Sources/parser/TokenVisitor.swift

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import Foundation
22
import SwiftSyntax
3-
import StringWidth
43

54
final class TokenVisitor: SyntaxRewriter {
65
var list = [String]()
@@ -52,19 +51,6 @@ final class TokenVisitor: SyntaxRewriter {
5251
let endRow = end.line ?? 1
5352
let endColumn = end.column ?? 1
5453

55-
let graphemeStartColumn: Int
56-
if let prefix = String(locationConverter.sourceLines[startRow - 1].utf8.prefix(startColumn - 1)) {
57-
graphemeStartColumn = stringWidth(prefix) + 1
58-
} else {
59-
graphemeStartColumn = startColumn
60-
}
61-
let graphemeEndColumn: Int
62-
if let prefix = String(locationConverter.sourceLines[endRow - 1].utf8.prefix(endColumn - 1)) {
63-
graphemeEndColumn = stringWidth(prefix) + 1
64-
} else {
65-
graphemeEndColumn = endColumn
66-
}
67-
6854
list.append(
6955
"<span class='\(className)' " +
7056
"data-title='\(title.escapeHTML().replaceInvisiblesWithSymbols())' " +
@@ -93,10 +79,8 @@ final class TokenVisitor: SyntaxRewriter {
9379
range: Range(
9480
startRow: startRow,
9581
startColumn: startColumn,
96-
graphemeStartColumn: graphemeStartColumn,
9782
endRow: endRow,
98-
endColumn: endColumn,
99-
graphemeEndColumn: graphemeEndColumn
83+
endColumn: endColumn
10084
),
10185
type: syntaxType
10286
)

‎Resources/parsers/50800/Sources/parser/TreeNode.swift

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ final class TreeNode: Codable {
55
var parent: Int?
66

77
var text: String
8-
var range = Range(startRow: 0, startColumn: 0, graphemeStartColumn: 0, endRow: 0, endColumn: 0, graphemeEndColumn: 0)
8+
var range = Range(startRow: 0, startColumn: 0, endRow: 0, endColumn: 0)
99
var structure = [StructureProperty]()
1010
var type: SyntaxType
1111
var token: Token?
@@ -50,10 +50,8 @@ extension TreeNode: CustomStringConvertible {
5050
struct Range: Codable, Equatable {
5151
let startRow: Int
5252
let startColumn: Int
53-
let graphemeStartColumn: Int
5453
let endRow: Int
5554
let endColumn: Int
56-
let graphemeEndColumn: Int
5755
}
5856

5957
extension Range: CustomStringConvertible {

‎Resources/parsers/50800/Tests/Tests/Fixtures/test-1-1.json

-28
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
"range": {
55
"endColumn": 15,
66
"endRow": 1,
7-
"graphemeEndColumn": 15,
8-
"graphemeStartColumn": 1,
97
"startColumn": 1,
108
"startRow": 1
119
},
@@ -52,8 +50,6 @@
5250
"range": {
5351
"endColumn": 15,
5452
"endRow": 1,
55-
"graphemeEndColumn": 15,
56-
"graphemeStartColumn": 1,
5753
"startColumn": 1,
5854
"startRow": 1
5955
},
@@ -80,8 +76,6 @@
8076
"range": {
8177
"endColumn": 15,
8278
"endRow": 1,
83-
"graphemeEndColumn": 15,
84-
"graphemeStartColumn": 1,
8579
"startColumn": 1,
8680
"startRow": 1
8781
},
@@ -139,8 +133,6 @@
139133
"range": {
140134
"endColumn": 15,
141135
"endRow": 1,
142-
"graphemeEndColumn": 15,
143-
"graphemeStartColumn": 1,
144136
"startColumn": 1,
145137
"startRow": 1
146138
},
@@ -211,8 +203,6 @@
211203
"range": {
212204
"endColumn": 4,
213205
"endRow": 1,
214-
"graphemeEndColumn": 4,
215-
"graphemeStartColumn": 1,
216206
"startColumn": 1,
217207
"startRow": 1
218208
},
@@ -231,8 +221,6 @@
231221
"range": {
232222
"endColumn": 15,
233223
"endRow": 1,
234-
"graphemeEndColumn": 15,
235-
"graphemeStartColumn": 5,
236224
"startColumn": 5,
237225
"startRow": 1
238226
},
@@ -259,8 +247,6 @@
259247
"range": {
260248
"endColumn": 15,
261249
"endRow": 1,
262-
"graphemeEndColumn": 15,
263-
"graphemeStartColumn": 5,
264250
"startColumn": 5,
265251
"startRow": 1
266252
},
@@ -343,8 +329,6 @@
343329
"range": {
344330
"endColumn": 11,
345331
"endRow": 1,
346-
"graphemeEndColumn": 11,
347-
"graphemeStartColumn": 5,
348332
"startColumn": 5,
349333
"startRow": 1
350334
},
@@ -378,8 +362,6 @@
378362
"range": {
379363
"endColumn": 11,
380364
"endRow": 1,
381-
"graphemeEndColumn": 11,
382-
"graphemeStartColumn": 5,
383365
"startColumn": 5,
384366
"startRow": 1
385367
},
@@ -398,8 +380,6 @@
398380
"range": {
399381
"endColumn": 15,
400382
"endRow": 1,
401-
"graphemeEndColumn": 15,
402-
"graphemeStartColumn": 12,
403383
"startColumn": 12,
404384
"startRow": 1
405385
},
@@ -446,8 +426,6 @@
446426
"range": {
447427
"endColumn": 13,
448428
"endRow": 1,
449-
"graphemeEndColumn": 13,
450-
"graphemeStartColumn": 12,
451429
"startColumn": 12,
452430
"startRow": 1
453431
},
@@ -466,8 +444,6 @@
466444
"range": {
467445
"endColumn": 15,
468446
"endRow": 1,
469-
"graphemeEndColumn": 15,
470-
"graphemeStartColumn": 14,
471447
"startColumn": 14,
472448
"startRow": 1
473449
},
@@ -501,8 +477,6 @@
501477
"range": {
502478
"endColumn": 15,
503479
"endRow": 1,
504-
"graphemeEndColumn": 15,
505-
"graphemeStartColumn": 14,
506480
"startColumn": 14,
507481
"startRow": 1
508482
},
@@ -521,8 +495,6 @@
521495
"range": {
522496
"endColumn": 15,
523497
"endRow": 1,
524-
"graphemeEndColumn": 15,
525-
"graphemeStartColumn": 15,
526498
"startColumn": 15,
527499
"startRow": 1
528500
},

0 commit comments

Comments
 (0)