microsoft / microsoft/TypeScript

Include terminating line in folding ranges when last token has no trailing non-trivia

Offen
#64,235 0 Kommentare 0 Reaktionen 1 zugewiesene Person Auf GitHub ansehen

@gabritto arbeitet bereits daran.

Seit 10.9.2026.

Domain: LS: Outlining Experimentation Needed Suggestion
Vorherrschende Sprache
Go
Sterne
111k
Forks
14.3k
Ø Merge
2 T. 4 Std.
Gemergte PRs (30 T.)
132

Beschreibung

With https://github.com/microsoft/typescript-go/pull/2772 (b81c7e9afd7f1e0b2ec2ac1fd581e09fe00df1af), we added support for lineFoldingOnly clients by consistently backing off a line; however, having a trailing } for every outlining span feels kind of unnecessary.

https://github.com/microsoft/vscode/issues/3352 has a lot of feedback, so maybe we can find a compromise. We discussed this a bit at #334371.

Instead of always backing off at these brace characters, maybe we should determine whether the terminating line has any non-trivia.

In other words...

else on line following }:
A-START | if (Math.random()) {
        |
A-END   | }
B-START | else if (Math.random()) {
        |
B-END   | }
else on same line as }:
A-START | if (Math.random()) {
A-END   |
B-START | } else if (Math.random()) {
        | 
B-END   | }
Statement on same line as }
A-START | if (Math.random()) {
A-END   |
        | } /*strange, but valid*/ console.log("hi there what're you doin' on this line?")
Contents on lines following }
A-START | if (Math.random()) {
        |
A-END   | }
        | /* Normal - this is totally normal code! That is why I am saying so! */
        | console.log("Hello world!");
Empty statement on same line as }

This one is odd, and maybe even undesirable - but I anticipate the implementation will be cleaner without any special-cases.

A-START | if (Math.random()) {
A-END   |
        | };
Comment on same line as }
A-START | if (Math.random()) {
        |
A-END   | } // finally out of that `if`
End-of-file is on the same line as }
A-START | if (Math.random()) {
        |
A-END   | } <EOF>

Should ensure that we have a test where EOF is on the same line and it works fine.

Beitragsleitfaden

Beitragsleitfaden öffnen

Erste Schritte

  1. Lies das ganze Issue und danach den Beitragsleitfaden des Projekts.
  2. Schreib ins Issue, dass du es übernimmst — das erspart doppelte Arbeit.
  3. Forke das Repository und arbeite in einem Branch.
  4. Öffne einen Pull Request, der die Issue-Nummer nennt.

Bewertung

Dieses Issue wurde noch nicht bewertet.

Neue Issues direkt in Ihr Postfach

Eine kurze Übersicht über anfängerfreundliche GitHub-Issues.