Commit 349cf6d
committed
Merge castwide#1266: structurally verify RBS interface-typed expectations
Two conflicts resolved:
lib/solargraph/complex_type/conformance.rb: HEAD's intersection-type
check (from castwide#1231, `conforms_to_intersection_expectation?`) and castwide#1266's
new `interface_bypass_verdict` mechanism both needed to run, in that
order — an expectation of `A & B` where either conjunct is an RBS
interface must still resolve the interface question per-conjunct, not
skip it. `interface_bypass_verdict` replaces the old blanket
`:allow_unmatched_interface` short-circuit with a 3-way verdict
(true/false/nil) based on `structural_interface_verdict`, deferring to
the old blanket bypass only when no structural verdict can be reached.
spec/complex_type/conforms_to_spec.rb:
- Dropped a `pending 'nil does not yet simplify to NilClass (issue
castwide#1196, fixed by PR castwide#1223)'` marker after confirming directly
(`inf.conforms_to?(api_map, exp, :method_call)` => true) that castwide#1223,
already merged into this branch, fixes it.
- Combined HEAD's `context 'with intersection types'` (castwide#1231) and
castwide#1266's `context 'with RBS interface types'` as sibling contexts
rather than choosing one; kept castwide#1266's two `pending` markers for
issue castwide#1267 (structural interface checks don't yet verify return
types/arity) as-is since those are castwide#1266's own honest, still-open
limitations.
Verified: spec/complex_type/conforms_to_spec.rb + spec/complex_type
(56 examples, 0 failures, 4 pending), and a broader safety net —
spec/type_checker, spec/source_map/clip_spec.rb,
spec/parser/flow_sensitive_typing_spec.rb (539 examples, 0 failures,
17 pending) — all passing locally.2 files changed
Lines changed: 133 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | | - | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
51 | 53 | | |
52 | 54 | | |
53 | 55 | | |
| |||
107 | 109 | | |
108 | 110 | | |
109 | 111 | | |
110 | | - | |
111 | | - | |
112 | | - | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
113 | 140 | | |
114 | 141 | | |
115 | 142 | | |
| |||
148 | 175 | | |
149 | 176 | | |
150 | 177 | | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
151 | 198 | | |
152 | 199 | | |
153 | 200 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
355 | 355 | | |
356 | 356 | | |
357 | 357 | | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
| 435 | + | |
| 436 | + | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
358 | 440 | | |
359 | 441 | | |
360 | 442 | | |
| |||
0 commit comments