Commit 4cb1636
committed
fix: isInTryCatchBlock — use nestedDepth counter to correctly
track whether we are inside nested blocks within a catch
Previous logic used catchBlockEndLine = braceDepth - 1 with a < check,
which failed when a nested block closed at the same depth as the catch
itself (both would give braceDepth < catchBlockEndLine = false).
The fix uses a nestedDepth counter: increment on each { inside catch,
decrement on each }. Only exit the catch when closing a } while
nestedDepth === 0 (no nested blocks currently open). The exit check
happens BEFORE the decrement so we can distinguish catch-close from
nested-block-close at equal depth.
Also addresses rare same-line '} catch(e) {' case by storing catchDepth
correctly before setting inCatchBlock.1 parent 5333ebd commit 4cb1636
2 files changed
Lines changed: 8 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
917 | 917 | | |
918 | 918 | | |
919 | 919 | | |
920 | | - | |
| 920 | + | |
921 | 921 | | |
922 | 922 | | |
923 | 923 | | |
| |||
927 | 927 | | |
928 | 928 | | |
929 | 929 | | |
930 | | - | |
| 930 | + | |
931 | 931 | | |
932 | 932 | | |
933 | 933 | | |
| |||
936 | 936 | | |
937 | 937 | | |
938 | 938 | | |
939 | | - | |
| 939 | + | |
940 | 940 | | |
941 | 941 | | |
942 | 942 | | |
943 | 943 | | |
944 | | - | |
| 944 | + | |
945 | 945 | | |
946 | 946 | | |
947 | 947 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
776 | 776 | | |
777 | 777 | | |
778 | 778 | | |
779 | | - | |
| 779 | + | |
780 | 780 | | |
781 | 781 | | |
782 | 782 | | |
783 | 783 | | |
784 | 784 | | |
785 | 785 | | |
786 | 786 | | |
787 | | - | |
| 787 | + | |
788 | 788 | | |
789 | 789 | | |
790 | 790 | | |
791 | 791 | | |
792 | 792 | | |
793 | 793 | | |
794 | 794 | | |
795 | | - | |
| 795 | + | |
796 | 796 | | |
797 | 797 | | |
798 | 798 | | |
799 | 799 | | |
800 | | - | |
| 800 | + | |
801 | 801 | | |
802 | 802 | | |
803 | 803 | | |
| |||
0 commit comments