@kongyo2/ts-comment-scanner 1.21.0 → 1.22.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +240 -52
- package/dist/astgrep.d.ts +4 -2
- package/dist/astgrep.d.ts.map +1 -1
- package/dist/astgrep.js +7 -4
- package/dist/astgrep.js.map +1 -1
- package/dist/containers.d.ts +48 -0
- package/dist/containers.d.ts.map +1 -0
- package/dist/containers.js +82 -0
- package/dist/containers.js.map +1 -0
- package/dist/coverage.d.ts +45 -0
- package/dist/coverage.d.ts.map +1 -0
- package/dist/coverage.js +92 -0
- package/dist/coverage.js.map +1 -0
- package/dist/directives.d.ts +13 -3
- package/dist/directives.d.ts.map +1 -1
- package/dist/directives.js +6 -5
- package/dist/directives.js.map +1 -1
- package/dist/files.d.ts +5 -0
- package/dist/files.d.ts.map +1 -1
- package/dist/files.js +103 -41
- package/dist/files.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/lines.d.ts +11 -0
- package/dist/lines.d.ts.map +1 -1
- package/dist/lines.js +30 -0
- package/dist/lines.js.map +1 -1
- package/dist/remove.d.ts +16 -12
- package/dist/remove.d.ts.map +1 -1
- package/dist/remove.js +51 -638
- package/dist/remove.js.map +1 -1
- package/dist/run.d.ts.map +1 -1
- package/dist/run.js +11 -10
- package/dist/run.js.map +1 -1
- package/dist/scanner.d.ts +29 -0
- package/dist/scanner.d.ts.map +1 -1
- package/dist/scanner.js +122 -5
- package/dist/scanner.js.map +1 -1
- package/dist/shields.d.ts +72 -0
- package/dist/shields.d.ts.map +1 -0
- package/dist/shields.js +624 -0
- package/dist/shields.js.map +1 -0
- package/dist/splice.d.ts +40 -15
- package/dist/splice.d.ts.map +1 -1
- package/dist/splice.js +185 -69
- package/dist/splice.js.map +1 -1
- package/package.json +2 -1
- package/src/astgrep.ts +7 -5
- package/src/containers.ts +128 -0
- package/src/coverage.ts +110 -0
- package/src/directives.ts +16 -5
- package/src/files.ts +147 -53
- package/src/index.ts +1 -0
- package/src/lines.ts +33 -1
- package/src/remove.ts +58 -748
- package/src/run.ts +11 -10
- package/src/scanner.ts +160 -5
- package/src/shields.ts +701 -0
- package/src/splice.ts +216 -75
package/dist/splice.d.ts
CHANGED
|
@@ -16,20 +16,38 @@ export interface Edit extends Range {
|
|
|
16
16
|
* the empty line.
|
|
17
17
|
*/
|
|
18
18
|
blankLine?: boolean;
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* The lines (1-based, numbered as lineStartOffsets numbers them) that
|
|
22
|
+
* deleting ranges has to leave in place, each a line of its own, because a
|
|
23
|
+
* directive that stays covers them.
|
|
24
|
+
*/
|
|
25
|
+
export interface ShieldedLines {
|
|
26
|
+
/**
|
|
27
|
+
* The lines a directive covers. None is joined to another: with code on
|
|
28
|
+
* both sides of a deleted range that spans lines, one of them shielded, a
|
|
29
|
+
* line break of the range stays between them, wherever the range stands.
|
|
30
|
+
*/
|
|
31
|
+
shielded: ReadonlySet<number>;
|
|
19
32
|
/**
|
|
20
|
-
*
|
|
21
|
-
*
|
|
22
|
-
*
|
|
33
|
+
* Those of them the deletions empty that still have something below them
|
|
34
|
+
* (see heldLines). Each stays, as an empty line, so that what is below it
|
|
35
|
+
* moves up no line.
|
|
23
36
|
*/
|
|
24
|
-
|
|
37
|
+
held: ReadonlySet<number>;
|
|
25
38
|
}
|
|
26
39
|
/**
|
|
27
40
|
* Applies sorted, non-overlapping edits to the source, tidying the lines of
|
|
28
|
-
* deleted ranges
|
|
29
|
-
* line-state tracking, so the work
|
|
30
|
-
* comment-dense files.
|
|
41
|
+
* deleted ranges and leaving the shielded lines in place. Output is
|
|
42
|
+
* accumulated as segments with incremental line-state tracking, so the work
|
|
43
|
+
* stays linear in the source size even for comment-dense files.
|
|
44
|
+
*
|
|
45
|
+
* A deleted range takes line breaks along: its own, and where it empties
|
|
46
|
+
* lines, the ones around them. As many of them stay as there are lines left
|
|
47
|
+
* to end — the line of the code before the range, a line break that kept two
|
|
48
|
+
* tokens apart, the held lines — and which ones is stayingBreaks' choice.
|
|
31
49
|
*/
|
|
32
|
-
export declare function applyEdits(source: string, edits: readonly Edit[]): string;
|
|
50
|
+
export declare function applyEdits(source: string, edits: readonly Edit[], lines?: ShieldedLines): string;
|
|
33
51
|
/** Where blocks open and close besides brackets: JSX tags, whose children are laid out like a block's. */
|
|
34
52
|
export interface BlockTags {
|
|
35
53
|
/** Offsets just past every opening tag. */
|
|
@@ -37,6 +55,14 @@ export interface BlockTags {
|
|
|
37
55
|
/** Offsets of every closing tag. */
|
|
38
56
|
closingTagStarts: ReadonlySet<number>;
|
|
39
57
|
}
|
|
58
|
+
/**
|
|
59
|
+
* The shielded lines (1-based) that the deletions empty and that still have
|
|
60
|
+
* code, or a comment that stays, somewhere below them. Dropping such a line
|
|
61
|
+
* would move what is below it up into the directive's reach, so it stays, as
|
|
62
|
+
* an empty line (see ShieldedLines.held); below the last line that keeps
|
|
63
|
+
* anything there is nothing to move.
|
|
64
|
+
*/
|
|
65
|
+
export declare function heldLines(source: string, deletions: readonly Range[], comments: readonly Range[], shieldedLines: ReadonlySet<number>): Set<number>;
|
|
40
66
|
/**
|
|
41
67
|
* Deletions of the blank lines that removing whole comment lines would pile
|
|
42
68
|
* up. Where comment-only lines vanish, the blank lines around them close
|
|
@@ -50,12 +76,11 @@ export interface BlockTags {
|
|
|
50
76
|
* against that edge stay: the ones on the far side of the comment merely
|
|
51
77
|
* separated the comment from the code.
|
|
52
78
|
*
|
|
53
|
-
* `deletions` are the ranges about to be deleted, sorted
|
|
54
|
-
*
|
|
55
|
-
*
|
|
56
|
-
*
|
|
57
|
-
*
|
|
58
|
-
* among them stay, so no code moves into the directive's reach.
|
|
79
|
+
* `deletions` are the ranges about to be deleted, sorted. `shieldedLines`
|
|
80
|
+
* are the lines a surviving directive reaches (1-based): the blank lines
|
|
81
|
+
* among them stay, so no code moves into the directive's reach, and so do
|
|
82
|
+
* the `held` ones, which the deletions leave empty (see heldLines) — a held
|
|
83
|
+
* line counts among the blank lines its run is trimmed to.
|
|
59
84
|
*/
|
|
60
|
-
export declare function blankLineEdits(source: string, deletions: readonly Range[], comments: readonly Range[],
|
|
85
|
+
export declare function blankLineEdits(source: string, deletions: readonly Range[], comments: readonly Range[], { shielded, held }: ShieldedLines, tags: BlockTags): Edit[];
|
|
61
86
|
//# sourceMappingURL=splice.d.ts.map
|
package/dist/splice.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"splice.d.ts","sourceRoot":"","sources":["../src/splice.ts"],"names":[],"mappings":"AACA,OAAO,EAAgC,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AAEvE,6FAA6F;AAC7F,MAAM,WAAW,IAAK,SAAQ,KAAK;IACjC,iGAAiG;IACjG,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"splice.d.ts","sourceRoot":"","sources":["../src/splice.ts"],"names":[],"mappings":"AACA,OAAO,EAAgC,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AAEvE,6FAA6F;AAC7F,MAAM,WAAW,IAAK,SAAQ,KAAK;IACjC,iGAAiG;IACjG,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IACH,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC9B;;;;OAIG;IACH,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC3B;AAiDD;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,IAAI,EAAE,EAAE,KAAK,GAAE,aAAiC,GAAG,MAAM,CA0NnH;AAED,0GAA0G;AAC1G,MAAM,WAAW,SAAS;IACxB,2CAA2C;IAC3C,cAAc,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACpC,oCAAoC;IACpC,gBAAgB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CACvC;AA+BD;;;;;;GAMG;AACH,wBAAgB,SAAS,CACvB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,KAAK,EAAE,EAC3B,QAAQ,EAAE,SAAS,KAAK,EAAE,EAC1B,aAAa,EAAE,WAAW,CAAC,MAAM,CAAC,GACjC,GAAG,CAAC,MAAM,CAAC,CASb;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,KAAK,EAAE,EAC3B,QAAQ,EAAE,SAAS,KAAK,EAAE,EAC1B,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,aAAa,EACjC,IAAI,EAAE,SAAS,GACd,IAAI,EAAE,CA8ER"}
|
package/dist/splice.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { LINE_BREAK, LINE_TERMINATOR, isBlank, isHorizontalSpace, lineStartOffsets } from "./lines.js";
|
|
1
|
+
import { LINE_BREAK, LINE_TERMINATOR, isBlank, isHorizontalSpace, lineIndexAt, lineStartOffsets } from "./lines.js";
|
|
2
2
|
import { firstIndexAtOrAfter, rangeAt } from "./ranges.js";
|
|
3
3
|
// Brackets never merge with what follows them, nor punctuation with what
|
|
4
4
|
// precedes it, so removing a comment between them needs no space to keep
|
|
@@ -10,21 +10,28 @@ const CLOSING_PUNCTUATION = ")]},;";
|
|
|
10
10
|
function needsSpace(before, after) {
|
|
11
11
|
return !OPENING_BRACKETS.includes(before) && !CLOSING_PUNCTUATION.includes(after);
|
|
12
12
|
}
|
|
13
|
+
// Every line break of a text, CRLF as one.
|
|
14
|
+
const ALL_LINE_BREAKS = new RegExp(LINE_BREAK.source, "g");
|
|
13
15
|
/**
|
|
14
|
-
* The line
|
|
15
|
-
*
|
|
16
|
-
*
|
|
17
|
-
*
|
|
18
|
-
*
|
|
19
|
-
*
|
|
16
|
+
* The `count` line breaks that stay of those a deletion could take along —
|
|
17
|
+
* the ones inside the deleted range, and the ones around the lines it
|
|
18
|
+
* empties. Those ending in a line feed stay first: they end a line for
|
|
19
|
+
* every tool, where a lone CR, U+2028 or U+2029 ends one for tsc and ESLint
|
|
20
|
+
* but none for the tools that only count line feeds (tree-sitter, oxlint,
|
|
21
|
+
* Semgrep, c8), so the code on both sides stays on rows apart wherever a
|
|
22
|
+
* line feed held it apart. They stay in the order the source has them.
|
|
20
23
|
*/
|
|
21
|
-
function
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
24
|
+
function stayingBreaks(breaks, count) {
|
|
25
|
+
const staying = new Set();
|
|
26
|
+
for (const lineFeed of [true, false]) {
|
|
27
|
+
for (const [index, lineBreak] of breaks.entries()) {
|
|
28
|
+
if (staying.size < count && lineBreak.endsWith("\n") === lineFeed)
|
|
29
|
+
staying.add(index);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
return breaks.filter((_, index) => staying.has(index));
|
|
27
33
|
}
|
|
34
|
+
const NO_SHIELDED_LINES = { shielded: new Set(), held: new Set() };
|
|
28
35
|
// A global copy of the line-break matcher, so exec() can resume from a removal's end offset.
|
|
29
36
|
const NEXT_LINE_BREAK = new RegExp(LINE_BREAK.source, "g");
|
|
30
37
|
/** End offset (exclusive) of the last line break in the chunk, or -1 when it has none. */
|
|
@@ -37,18 +44,38 @@ function lastLineBreakEnd(chunk) {
|
|
|
37
44
|
}
|
|
38
45
|
/**
|
|
39
46
|
* Applies sorted, non-overlapping edits to the source, tidying the lines of
|
|
40
|
-
* deleted ranges
|
|
41
|
-
* line-state tracking, so the work
|
|
42
|
-
* comment-dense files.
|
|
47
|
+
* deleted ranges and leaving the shielded lines in place. Output is
|
|
48
|
+
* accumulated as segments with incremental line-state tracking, so the work
|
|
49
|
+
* stays linear in the source size even for comment-dense files.
|
|
50
|
+
*
|
|
51
|
+
* A deleted range takes line breaks along: its own, and where it empties
|
|
52
|
+
* lines, the ones around them. As many of them stay as there are lines left
|
|
53
|
+
* to end — the line of the code before the range, a line break that kept two
|
|
54
|
+
* tokens apart, the held lines — and which ones is stayingBreaks' choice.
|
|
43
55
|
*/
|
|
44
|
-
export function applyEdits(source, edits) {
|
|
56
|
+
export function applyEdits(source, edits, lines = NO_SHIELDED_LINES) {
|
|
45
57
|
const segments = [];
|
|
46
58
|
let cursor = 0;
|
|
59
|
+
const lineStarts = lines.shielded.size > 0 ? lineStartOffsets(source) : [];
|
|
60
|
+
/** The (1-based) line holding the offset; 0 where no line is shielded. */
|
|
61
|
+
const lineOf = (offset) => (lineStarts.length === 0 ? 0 : lineIndexAt(lineStarts, offset) + 1);
|
|
62
|
+
/** How many of the lines `from` to `to` (inclusive) are held. */
|
|
63
|
+
const heldAmong = (from, to) => {
|
|
64
|
+
let held = 0;
|
|
65
|
+
for (let line = from; line <= to; line += 1) {
|
|
66
|
+
if (lines.held.has(line))
|
|
67
|
+
held += 1;
|
|
68
|
+
}
|
|
69
|
+
return held;
|
|
70
|
+
};
|
|
47
71
|
/** Whether the output's current (unterminated) line is all whitespace so far. */
|
|
48
72
|
let lineIsBlank = true;
|
|
49
73
|
/** Last character of the output so far ("" while empty). */
|
|
50
74
|
let lastChar = "";
|
|
51
|
-
|
|
75
|
+
/** The character the output ends in ("" while empty), read off the segments where some were taken off its end. */
|
|
76
|
+
const outputEnd = () => segments.at(-1)?.slice(-1) ?? "";
|
|
77
|
+
/** Appends the chunk as it is. */
|
|
78
|
+
const append = (chunk) => {
|
|
52
79
|
if (chunk === "")
|
|
53
80
|
return;
|
|
54
81
|
segments.push(chunk);
|
|
@@ -57,27 +84,60 @@ export function applyEdits(source, edits) {
|
|
|
57
84
|
lastChar = chunk.slice(-1);
|
|
58
85
|
};
|
|
59
86
|
/**
|
|
60
|
-
*
|
|
61
|
-
*
|
|
62
|
-
*
|
|
87
|
+
* Appends the chunk, keeping the line breaks on both sides of the seam
|
|
88
|
+
* apart: a lone CR that a deletion leaves right in front of a line feed
|
|
89
|
+
* would read as one CRLF with it, a line break short, so the line feeds
|
|
90
|
+
* go in front of the CRs the output ends in.
|
|
63
91
|
*/
|
|
64
|
-
const
|
|
92
|
+
const push = (chunk) => {
|
|
93
|
+
let loneReturns = "";
|
|
94
|
+
while (lastChar === "\r" && chunk.startsWith("\n")) {
|
|
95
|
+
const last = segments.pop();
|
|
96
|
+
if (last.length > 1)
|
|
97
|
+
segments.push(last.slice(0, -1));
|
|
98
|
+
lastChar = outputEnd();
|
|
99
|
+
loneReturns += "\r";
|
|
100
|
+
}
|
|
101
|
+
const rest = loneReturns === "" ? chunk : chunk.replace(/^\n+/, "");
|
|
102
|
+
append(chunk.slice(0, chunk.length - rest.length) + loneReturns + rest);
|
|
103
|
+
};
|
|
104
|
+
/** Takes everything the output holds after its last line break out of it, and returns it. */
|
|
105
|
+
const takeCurrentLine = () => {
|
|
106
|
+
let taken = "";
|
|
65
107
|
while (segments.length > 0) {
|
|
66
108
|
const last = segments[segments.length - 1];
|
|
67
109
|
const breakEnd = lastLineBreakEnd(last);
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
110
|
+
taken = last.slice(breakEnd === -1 ? 0 : breakEnd) + taken;
|
|
111
|
+
if (breakEnd !== -1) {
|
|
112
|
+
segments[segments.length - 1] = last.slice(0, breakEnd);
|
|
113
|
+
break;
|
|
71
114
|
}
|
|
72
|
-
|
|
73
|
-
segments[segments.length - 1] = last.slice(0, tookBreak ? breakEnd - 1 : breakEnd);
|
|
74
|
-
lineIsBlank = !tookBreak;
|
|
75
|
-
lastChar = last.charAt(breakEnd - (tookBreak ? 2 : 1));
|
|
76
|
-
return tookBreak;
|
|
115
|
+
segments.pop();
|
|
77
116
|
}
|
|
78
117
|
lineIsBlank = true;
|
|
79
|
-
lastChar =
|
|
80
|
-
return
|
|
118
|
+
lastChar = outputEnd();
|
|
119
|
+
return taken;
|
|
120
|
+
};
|
|
121
|
+
/**
|
|
122
|
+
* Takes the line break the output ends in out of it, and returns it — none
|
|
123
|
+
* at the start of the output. Only called right after takeCurrentLine, and
|
|
124
|
+
* followed by a line break going back in, which sets the line state again.
|
|
125
|
+
*/
|
|
126
|
+
const takeBreak = () => {
|
|
127
|
+
const last = segments.pop();
|
|
128
|
+
if (last === undefined)
|
|
129
|
+
return [];
|
|
130
|
+
const lineBreak = last.endsWith("\r\n") ? "\r\n" : last.slice(-1);
|
|
131
|
+
const rest = last.slice(0, -lineBreak.length);
|
|
132
|
+
if (rest !== "")
|
|
133
|
+
segments.push(rest);
|
|
134
|
+
lastChar = outputEnd();
|
|
135
|
+
return [lineBreak];
|
|
136
|
+
};
|
|
137
|
+
/** Puts `count` of the line breaks back in (see stayingBreaks). */
|
|
138
|
+
const keep = (breaks, count) => {
|
|
139
|
+
for (const lineBreak of stayingBreaks(breaks, count))
|
|
140
|
+
push(lineBreak);
|
|
81
141
|
};
|
|
82
142
|
/**
|
|
83
143
|
* Deletes trailing spaces/tabs of the output's current line. Only called
|
|
@@ -123,45 +183,54 @@ export function applyEdits(source, edits) {
|
|
|
123
183
|
// goes in.
|
|
124
184
|
const lineFeed = source.slice(edit.start, lineEnd).includes("\r\n") ? "\r\n" : "\n";
|
|
125
185
|
if (lineIsBlank) {
|
|
126
|
-
|
|
186
|
+
takeCurrentLine();
|
|
127
187
|
if (lastChar !== "\n")
|
|
128
|
-
|
|
188
|
+
append(lineFeed);
|
|
129
189
|
}
|
|
130
190
|
else {
|
|
131
191
|
trimLineEnd();
|
|
132
|
-
|
|
192
|
+
append(lineFeed);
|
|
133
193
|
}
|
|
134
|
-
|
|
194
|
+
append(lineFeed);
|
|
135
195
|
cursor = isBlank(restContent) ? lineEnd : skipSpaces(cursor);
|
|
136
196
|
continue;
|
|
137
197
|
}
|
|
198
|
+
// The line breaks the range holds, the one after its last line, and the
|
|
199
|
+
// lines it starts and ends on.
|
|
200
|
+
const own = deleted.match(ALL_LINE_BREAKS) ?? [];
|
|
201
|
+
const after = lineBreak === null ? [] : [lineBreak[0]];
|
|
202
|
+
const first = lineOf(edit.start);
|
|
203
|
+
const last = lineOf(Math.max(edit.start, edit.end - 1));
|
|
138
204
|
if (lineIsBlank && isBlank(restContent)) {
|
|
139
|
-
// The range occupied whole line(s):
|
|
140
|
-
//
|
|
141
|
-
//
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
cursor =
|
|
205
|
+
// The range occupied whole line(s): they go, with their line breaks,
|
|
206
|
+
// but for the held ones, which stay as empty lines. One line break
|
|
207
|
+
// still ends the line in front of them.
|
|
208
|
+
takeCurrentLine();
|
|
209
|
+
const before = takeBreak();
|
|
210
|
+
keep([...before, ...own, ...after], before.length + heldAmong(first, last));
|
|
211
|
+
cursor = lineEnd;
|
|
146
212
|
}
|
|
147
213
|
else if (isBlank(restContent)) {
|
|
148
|
-
// Trailing after code: trim the gap
|
|
214
|
+
// Trailing after code: trim the gap; one line break ends the code's
|
|
215
|
+
// line. The lines the range empties below the code go, but for the
|
|
216
|
+
// held ones.
|
|
149
217
|
trimLineEnd();
|
|
150
|
-
|
|
218
|
+
keep([...own, ...after], after.length + heldAmong(first + 1, last));
|
|
151
219
|
cursor = lineEnd;
|
|
152
220
|
}
|
|
153
221
|
else if (!lineIsBlank &&
|
|
154
|
-
|
|
155
|
-
(
|
|
222
|
+
own.length > 0 &&
|
|
223
|
+
(isApart(first, last) || needsSpace(lastChar, source.charAt(cursor)))) {
|
|
156
224
|
// Code on both sides of a range that spans lines. Per ECMA-262 a
|
|
157
225
|
// multi-line comment acts as a line terminator for semicolon
|
|
158
|
-
// insertion, so
|
|
159
|
-
//
|
|
160
|
-
//
|
|
161
|
-
//
|
|
162
|
-
//
|
|
226
|
+
// insertion, so one of its line breaks takes its place instead of
|
|
227
|
+
// merging the lines. (Right after an opening bracket or before closing
|
|
228
|
+
// punctuation a line terminator changes nothing, so a multi-line
|
|
229
|
+
// comment there goes without one.) Where one of the two lines is
|
|
230
|
+
// shielded, a line break stays between them wherever the range stands,
|
|
231
|
+
// and the held lines between them stay as well.
|
|
163
232
|
trimLineEnd();
|
|
164
|
-
|
|
233
|
+
keep(own, heldAmong(first + 1, last - 1) + 1);
|
|
165
234
|
}
|
|
166
235
|
else if (lastChar !== "" && !isBlank(lastChar)) {
|
|
167
236
|
// Code right before the range, more on the same line after it.
|
|
@@ -180,7 +249,15 @@ export function applyEdits(source, edits) {
|
|
|
180
249
|
}
|
|
181
250
|
else {
|
|
182
251
|
// Whitespace (or the line start) right before the range: the
|
|
183
|
-
// whitespace after it collapses into that.
|
|
252
|
+
// whitespace after it collapses into that. Where the range opened its
|
|
253
|
+
// line, the lines it empties above the code after it go, but for the
|
|
254
|
+
// held ones, and one line break still ends the line in front of them.
|
|
255
|
+
if (lineIsBlank && own.length > 0) {
|
|
256
|
+
const indentation = takeCurrentLine();
|
|
257
|
+
const before = takeBreak();
|
|
258
|
+
keep([...before, ...own], before.length + heldAmong(first, last - 1));
|
|
259
|
+
push(indentation);
|
|
260
|
+
}
|
|
184
261
|
cursor = skipSpaces(cursor);
|
|
185
262
|
if (edit.jsx !== true && !lineIsBlank && CLOSING_PUNCTUATION.includes(source.charAt(cursor))) {
|
|
186
263
|
// `a /* x */)` — the space before only held the comment off the code.
|
|
@@ -190,6 +267,48 @@ export function applyEdits(source, edits) {
|
|
|
190
267
|
}
|
|
191
268
|
segments.push(source.slice(cursor));
|
|
192
269
|
return segments.join("");
|
|
270
|
+
/** Whether the lines a range starts and ends on have to stay apart: one is shielded, or held lines lie between. */
|
|
271
|
+
function isApart(first, last) {
|
|
272
|
+
return lines.shielded.has(first) || lines.shielded.has(last) || heldAmong(first + 1, last - 1) > 0;
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
/**
|
|
276
|
+
* What becomes of each line once the (sorted) `deletions` are made: a line
|
|
277
|
+
* vanishes when every non-whitespace character on it is deleted; a blank
|
|
278
|
+
* line holds nothing but spaces and tabs (a lone vertical tab or no-break
|
|
279
|
+
* space is content to tsc 7) and lies outside every comment; any other line
|
|
280
|
+
* holds code.
|
|
281
|
+
*/
|
|
282
|
+
function lineKinds(source, deletions, comments) {
|
|
283
|
+
const offsets = lineStartOffsets(source);
|
|
284
|
+
// A final line break ends the last line rather than opening an empty one.
|
|
285
|
+
const lineCount = offsets.length > 1 && offsets[offsets.length - 1] === source.length ? offsets.length - 1 : offsets.length;
|
|
286
|
+
const kinds = [];
|
|
287
|
+
for (let line = 0; line < lineCount; line += 1) {
|
|
288
|
+
const start = offsets[line];
|
|
289
|
+
const end = offsets[line + 1] ?? source.length;
|
|
290
|
+
kinds.push(lineKind(source, start, end, endOfContent(source, start, end), deletions, comments));
|
|
291
|
+
}
|
|
292
|
+
return { offsets, kinds };
|
|
293
|
+
}
|
|
294
|
+
/**
|
|
295
|
+
* The shielded lines (1-based) that the deletions empty and that still have
|
|
296
|
+
* code, or a comment that stays, somewhere below them. Dropping such a line
|
|
297
|
+
* would move what is below it up into the directive's reach, so it stays, as
|
|
298
|
+
* an empty line (see ShieldedLines.held); below the last line that keeps
|
|
299
|
+
* anything there is nothing to move.
|
|
300
|
+
*/
|
|
301
|
+
export function heldLines(source, deletions, comments, shieldedLines) {
|
|
302
|
+
const held = new Set();
|
|
303
|
+
if (shieldedLines.size === 0)
|
|
304
|
+
return held;
|
|
305
|
+
const { kinds } = lineKinds(source, deletions, comments);
|
|
306
|
+
const lastKept = kinds.lastIndexOf("code");
|
|
307
|
+
for (const line of shieldedLines) {
|
|
308
|
+
if (line <= lastKept && kinds[line - 1] === "vanishing")
|
|
309
|
+
held.add(line);
|
|
310
|
+
}
|
|
311
|
+
return held;
|
|
193
312
|
}
|
|
194
313
|
/**
|
|
195
314
|
* Deletions of the blank lines that removing whole comment lines would pile
|
|
@@ -204,23 +323,17 @@ export function applyEdits(source, edits) {
|
|
|
204
323
|
* against that edge stay: the ones on the far side of the comment merely
|
|
205
324
|
* separated the comment from the code.
|
|
206
325
|
*
|
|
207
|
-
* `deletions` are the ranges about to be deleted, sorted
|
|
208
|
-
*
|
|
209
|
-
*
|
|
210
|
-
*
|
|
211
|
-
*
|
|
212
|
-
* among them stay, so no code moves into the directive's reach.
|
|
326
|
+
* `deletions` are the ranges about to be deleted, sorted. `shieldedLines`
|
|
327
|
+
* are the lines a surviving directive reaches (1-based): the blank lines
|
|
328
|
+
* among them stay, so no code moves into the directive's reach, and so do
|
|
329
|
+
* the `held` ones, which the deletions leave empty (see heldLines) — a held
|
|
330
|
+
* line counts among the blank lines its run is trimmed to.
|
|
213
331
|
*/
|
|
214
|
-
export function blankLineEdits(source, deletions, comments,
|
|
215
|
-
const offsets =
|
|
216
|
-
|
|
217
|
-
const lineCount = offsets.length > 1 && offsets[offsets.length - 1] === source.length ? offsets.length - 1 : offsets.length;
|
|
332
|
+
export function blankLineEdits(source, deletions, comments, { shielded, held }, tags) {
|
|
333
|
+
const { offsets, kinds } = lineKinds(source, deletions, comments);
|
|
334
|
+
const lineCount = kinds.length;
|
|
218
335
|
const lineStart = (line) => offsets[line];
|
|
219
336
|
const lineContentEnd = (line) => endOfContent(source, lineStart(line), offsets[line + 1] ?? source.length);
|
|
220
|
-
const kinds = [];
|
|
221
|
-
for (let line = 0; line < lineCount; line += 1) {
|
|
222
|
-
kinds.push(lineKind(source, lineStart(line), offsets[line + 1] ?? source.length, lineContentEnd(line), deletions, comments));
|
|
223
|
-
}
|
|
224
337
|
/** Offset of the first (or last) character on the line that survives the deletions and is not whitespace. */
|
|
225
338
|
const survivingEdge = (line, fromEnd) => {
|
|
226
339
|
const start = lineStart(line);
|
|
@@ -252,12 +365,15 @@ export function blankLineEdits(source, deletions, comments, shieldedLines, tags)
|
|
|
252
365
|
continue;
|
|
253
366
|
}
|
|
254
367
|
const first = line;
|
|
368
|
+
// The lines of the run that are blank once the deletions are made.
|
|
255
369
|
const blanks = [];
|
|
256
370
|
// Blank lines between consecutive vanishing lines, from before the first to after the last.
|
|
257
371
|
const gaps = [0];
|
|
258
372
|
for (; line < lineCount && kinds[line] !== "code"; line += 1) {
|
|
259
373
|
if (kinds[line] === "vanishing") {
|
|
260
374
|
gaps.push(0);
|
|
375
|
+
if (held.has(line + 1))
|
|
376
|
+
blanks.push(line);
|
|
261
377
|
}
|
|
262
378
|
else {
|
|
263
379
|
blanks.push(line);
|
|
@@ -287,7 +403,7 @@ export function blankLineEdits(source, deletions, comments, shieldedLines, tags)
|
|
|
287
403
|
keep = gaps.reduce((widest, gap) => Math.max(widest, gap));
|
|
288
404
|
}
|
|
289
405
|
for (const [position, blank] of blanks.entries()) {
|
|
290
|
-
if (
|
|
406
|
+
if (shielded.has(blank + 1))
|
|
291
407
|
keep = Math.max(keep, position + 1);
|
|
292
408
|
}
|
|
293
409
|
for (const blank of blanks.slice(keep)) {
|
package/dist/splice.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"splice.js","sourceRoot":"","sources":["../src/splice.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"splice.js","sourceRoot":"","sources":["../src/splice.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kongyo2/ts-comment-scanner",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.22.0",
|
|
4
4
|
"description": "CLI to detect, report and safely remove comments across a TypeScript project.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"typescript",
|
|
@@ -76,6 +76,7 @@
|
|
|
76
76
|
"knip": "^6.38.0",
|
|
77
77
|
"oxlint": "^1.70.0",
|
|
78
78
|
"prettier": "^3.8.4",
|
|
79
|
+
"v8-to-istanbul": "^9.3.0",
|
|
79
80
|
"vitest": "^4.1.9"
|
|
80
81
|
}
|
|
81
82
|
}
|
package/src/astgrep.ts
CHANGED
|
@@ -74,8 +74,10 @@ export interface AstGrepReach {
|
|
|
74
74
|
* when deleted, so those ending on its row in front of it stay, as do those
|
|
75
75
|
* after it on its row and those touching the row its node starts on; when a
|
|
76
76
|
* release covers the next row, so do those starting there, and that row's
|
|
77
|
-
* lines stay (see nextRow). On the first row, the
|
|
78
|
-
*
|
|
77
|
+
* lines stay (see nextRow). On the first row, the node after the comment
|
|
78
|
+
* decides whether it covers the file: where that node starts less than two
|
|
79
|
+
* rows down, the unit it is stays, since whatever follows it could start
|
|
80
|
+
* further down.
|
|
79
81
|
* The releases this follows parse with tree-sitter 0.24 or later (ast-grep
|
|
80
82
|
* 0.31.1 on); before, comments in JSX braces read as standing alone.
|
|
81
83
|
*/
|
|
@@ -99,12 +101,12 @@ export function astGrepReach(
|
|
|
99
101
|
if (precedingRow !== undefined && precedingRow < row) {
|
|
100
102
|
breaking.push({ start: rowStart(precedingRow), end: rowStart(precedingRow + 1) });
|
|
101
103
|
}
|
|
102
|
-
const
|
|
103
|
-
|
|
104
|
+
const next = comment.end + text.slice(comment.end).search(TREE_SITTER_CONTENT);
|
|
105
|
+
const nextNode = opensFirstRow(text, comment.start) && next >= comment.end && next < rowStart(2) ? next : undefined;
|
|
104
106
|
return {
|
|
105
107
|
holds: (unit) =>
|
|
106
108
|
(unit.end > ownRow && unit.end <= comment.start && (unit.start >= preceding.tokenEnd || breaks(unit))) ||
|
|
107
|
-
|
|
109
|
+
unit.start === nextNode ||
|
|
108
110
|
(breaking.some((span) => unit.start < span.end && unit.end >= span.start) && breaks(unit)),
|
|
109
111
|
nextRow: coversNextRow ? { start: comment.end, end: rowStart(row + 2) } : undefined,
|
|
110
112
|
};
|