Commit 88abe99
fix(molang): prevent NaN diagnostic ranges from crashing the client (#588)
A degenerate molang node (e.g. an empty `{}` produced by the parser for
particle component objects) has an undefined `position`. The
Marker/default case in the molang syntax diagnoser passed that undefined
position straight to `diagnoser.add`, where `GetRange` resolved it via
`doc.positionAt(undefined)` to a `character: NaN`. That NaN serializes
to `null` over JSON-RPC, making the client's `asDiagnostics` reject the
entire diagnostic batch with 'Invalid arguments' and drop all
diagnostics for the file.
Fixes, in defense-in-depth layers:
- Guard the degenerate node's position with a finite fallback in the
molang syntax diagnoser.
- Clamp non-finite/out-of-bounds offsets to the document bounds in
GetRange and GetPosition so no caller can produce a NaN range.
Adds regression tests for both layers.
Co-authored-by: Claude <noreply@anthropic.com>1 parent 5cafa16 commit 88abe99
4 files changed
Lines changed: 88 additions & 6 deletions
File tree
- ide/base/server/src/util
- packages/bedrock-diagnoser
- src/diagnostics/molang
- test/lib/diagnostics/molang
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
| 5 | + | |
4 | 6 | | |
5 | 7 | | |
6 | 8 | | |
| |||
11 | 13 | | |
12 | 14 | | |
13 | 15 | | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
14 | 50 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
6 | 24 | | |
7 | 25 | | |
8 | 26 | | |
| |||
23 | 41 | | |
24 | 42 | | |
25 | 43 | | |
26 | | - | |
27 | | - | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
28 | 48 | | |
29 | 49 | | |
30 | 50 | | |
| 51 | + | |
31 | 52 | | |
32 | 53 | | |
33 | 54 | | |
| |||
64 | 85 | | |
65 | 86 | | |
66 | 87 | | |
67 | | - | |
| 88 | + | |
68 | 89 | | |
69 | | - | |
| 90 | + | |
70 | 91 | | |
71 | 92 | | |
72 | 93 | | |
| |||
Lines changed: 5 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
173 | 173 | | |
174 | 174 | | |
175 | 175 | | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
176 | 180 | | |
177 | | - | |
| 181 | + | |
178 | 182 | | |
179 | 183 | | |
180 | 184 | | |
| |||
Lines changed: 21 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
0 commit comments