Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into pr/20319
# Conflicts:
#	src/Compiler/SyntaxTree/LexFilter.fs
#	src/Compiler/xlf/FSComp.txt.cs.xlf
#	src/Compiler/xlf/FSComp.txt.de.xlf
#	src/Compiler/xlf/FSComp.txt.es.xlf
#	src/Compiler/xlf/FSComp.txt.fr.xlf
#	src/Compiler/xlf/FSComp.txt.it.xlf
#	src/Compiler/xlf/FSComp.txt.ja.xlf
#	src/Compiler/xlf/FSComp.txt.ko.xlf
#	src/Compiler/xlf/FSComp.txt.pl.xlf
#	src/Compiler/xlf/FSComp.txt.pt-BR.xlf
#	src/Compiler/xlf/FSComp.txt.ru.xlf
#	src/Compiler/xlf/FSComp.txt.tr.xlf
#	src/Compiler/xlf/FSComp.txt.zh-Hans.xlf
#	src/Compiler/xlf/FSComp.txt.zh-Hant.xlf
  • Loading branch information
T-Gro committed Aug 25, 2026
commit dc0d5e5cc2388b036434a158b59d1597343682ef
1 change: 0 additions & 1 deletion src/Compiler/SyntaxTree/LexFilter.fs
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,6 @@ type LexFilterImpl (
// Undentation rules
//--------------------------------------------------------------------------

let relaxWhitespace2 = lexbuf.SupportsFeature LanguageFeature.RelaxWhitespace2

let tryPushCtxt strict ignoreIndent tokenTup (newCtxt: Context) =
let rec undentationLimit strict stack =
Expand Down
55 changes: 50 additions & 5 deletions src/Compiler/xlf/FSComp.txt.cs.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.