|
113 | 113 | // RUN: %FileCheck %s -check-prefix=WITH_GLOBAL_DECLS < %t.txt
|
114 | 114 | // RUN: %FileCheck %s -check-prefix=ACCESSORS_IN_MEMBER_FUNC_2 < %t.txt
|
115 | 115 |
|
| 116 | +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_OLDVALUE_COPIED | %FileCheck %s -check-prefix=IMPLICIT_OLDVALUE_COPIED |
| 117 | +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_OLDVALUE_MEMBER | %FileCheck %s -check-prefix=IMPLICIT_OLDVALUE_MEMBER |
| 118 | +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IMPLICIT_OLDVALUE_COPIEDMEMBER | %FileCheck %s -check-prefix=IMPLICIT_OLDVALUE_COPIEDMEMBER |
| 119 | +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_OLDVALUE_COPIED | %FileCheck %s -check-prefix=EXPLICIT_OLDVALUE_COPIED |
| 120 | +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_OLDVALUE_MEMBER | %FileCheck %s -check-prefix=EXPLICIT_OLDVALUE_MEMBER |
| 121 | +// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=EXPLICIT_OLDVALUE_COPIEDMEMBER | %FileCheck %s -check-prefix=EXPLICIT_OLDVALUE_COPIEDMEMBER |
| 122 | + |
116 | 123 | //===--- Helper types that are used in this test
|
117 | 124 |
|
118 | 125 | struct FooStruct {
|
@@ -247,18 +254,18 @@ willSet {
|
247 | 254 | }
|
248 | 255 |
|
249 | 256 | var globalAccessorDidSet1: Int {
|
250 |
| - didSet(oldValue) { |
| 257 | + didSet { |
251 | 258 | #^GLOBAL_ACCESSOR_DIDSET_1^#
|
252 | 259 | }
|
253 | 260 | }
|
254 | 261 | var globalAccessorDidSet2: Int {
|
255 |
| - didSet(oldValue) { |
| 262 | + didSet { |
256 | 263 | var fs = FooStruct()
|
257 | 264 | fs.#^GLOBAL_ACCESSOR_DIDSET_2^#
|
258 | 265 | }
|
259 | 266 | }
|
260 | 267 | var globalAccessorDidSet3 = 42 {
|
261 |
| -didSet(oldValue) { |
| 268 | +didSet { |
262 | 269 | #^GLOBAL_ACCESSOR_DIDSET_3^#
|
263 | 270 | }
|
264 | 271 | }
|
@@ -337,18 +344,18 @@ struct MemberAccessors {
|
337 | 344 | }
|
338 | 345 |
|
339 | 346 | var memberAccessorDidSet1: Int {
|
340 |
| - didSet(oldValue) { |
| 347 | + didSet { |
341 | 348 | #^MEMBER_ACCESSOR_DIDSET_1^#
|
342 | 349 | }
|
343 | 350 | }
|
344 | 351 | var memberAccessorDidSet2: Int {
|
345 |
| - didSet(oldValue) { |
| 352 | + didSet { |
346 | 353 | var fs = FooStruct()
|
347 | 354 | fs.#^MEMBER_ACCESSOR_DIDSET_2^#
|
348 | 355 | }
|
349 | 356 | }
|
350 | 357 | var memberAccessorDidSet3 = 42 {
|
351 |
| - didSet(oldValue) { |
| 358 | + didSet { |
352 | 359 | #^MEMBER_ACCESSOR_DIDSET_3^#
|
353 | 360 | }
|
354 | 361 | }
|
@@ -424,18 +431,18 @@ func accessorsInFunction(_ functionParam: Int) {
|
424 | 431 | }
|
425 | 432 |
|
426 | 433 | var memberAccessorDidSet1: Int {
|
427 |
| - didSet(oldValue) { |
| 434 | + didSet { |
428 | 435 | #^LOCAL_ACCESSOR_DIDSET_1^#
|
429 | 436 | }
|
430 | 437 | }
|
431 | 438 | var memberAccessorDidSet2: Int {
|
432 |
| - didSet(oldValue) { |
| 439 | + didSet { |
433 | 440 | var fs = FooStruct()
|
434 | 441 | fs.#^LOCAL_ACCESSOR_DIDSET_2^#
|
435 | 442 | }
|
436 | 443 | }
|
437 | 444 | var memberAccessorDidSet3: Int {
|
438 |
| - didSet(oldValue) { |
| 445 | + didSet { |
439 | 446 | #^LOCAL_ACCESSOR_DIDSET_3^#
|
440 | 447 | }
|
441 | 448 | }
|
@@ -481,3 +488,61 @@ struct AccessorsInMemberFunction {
|
481 | 488 | }
|
482 | 489 | }
|
483 | 490 | }
|
| 491 | + |
| 492 | +var testImplicitOldValue1: Int = 0 { |
| 493 | + didSet { |
| 494 | + var oldV = oldValue |
| 495 | + #^IMPLICIT_OLDVALUE_COPIED^# |
| 496 | +// IMPLICIT_OLDVALUE_COPIED: Begin completions |
| 497 | +// IMPLICIT_OLDVALUE_COPIED-DAG: Decl[LocalVar]/Local: oldV[#Int#]; |
| 498 | +// IMPLICIT_OLDVALUE_COPIED-DAG: Decl[LocalVar]/Local: oldValue[#Int#]; |
| 499 | +// IMPLICIT_OLDVALUE_COPIED: End completions |
| 500 | + } |
| 501 | +} |
| 502 | +var testImplicitOldValue2: Int = 0 { |
| 503 | + didSet { |
| 504 | + oldValue.#^IMPLICIT_OLDVALUE_MEMBER^# |
| 505 | +// IMPLICIT_OLDVALUE_MEMBER: Begin completions |
| 506 | +// IMPLICIT_OLDVALUE_MEMBER-DAG: Keyword[self]/CurrNominal: self[#Int#]; |
| 507 | +// IMPLICIT_OLDVALUE_MEMBER: End completions |
| 508 | + } |
| 509 | +} |
| 510 | +var testImplicitOldValue3: Int = 0 { |
| 511 | + didSet { |
| 512 | + var oldV = oldValue |
| 513 | + oldV.#^IMPLICIT_OLDVALUE_COPIEDMEMBER^# |
| 514 | +// IMPLICIT_OLDVALUE_COPIEDMEMBER: Begin completions |
| 515 | +// IMPLICIT_OLDVALUE_COPIEDMEMBER-DAG: Keyword[self]/CurrNominal: self[#Int#]; |
| 516 | +// IMPLICIT_OLDVALUE_COPIEDMEMBER: End completions |
| 517 | + } |
| 518 | +} |
| 519 | + |
| 520 | +var testExplicitOldValue1: Int = 0 { |
| 521 | + didSet(oldVal) { |
| 522 | + var oldV = oldVal |
| 523 | + #^EXPLICIT_OLDVALUE_COPIED^# |
| 524 | +// EXPLICIT_OLDVALUE_COPIED: Begin completions |
| 525 | +// EXPLICIT_OLDVALUE_COPIED-NOT: oldValue |
| 526 | +// EXPLICIT_OLDVALUE_COPIED-DAG: Decl[LocalVar]/Local: oldV[#Int#]; |
| 527 | +// EXPLICIT_OLDVALUE_COPIED-DAG: Decl[LocalVar]/Local: oldVal[#Int#]; |
| 528 | +// EXPLICIT_OLDVALUE_COPIED-NOT: oldValue |
| 529 | +// EXPLICIT_OLDVALUE_COPIED: End completions |
| 530 | + } |
| 531 | +} |
| 532 | +var testExplicitOldValue2: Int = 0 { |
| 533 | + didSet(oldVal) { |
| 534 | + oldVal.#^EXPLICIT_OLDVALUE_MEMBER^# |
| 535 | +// EXPLICIT_OLDVALUE_MEMBER: Begin completions |
| 536 | +// EXPLICIT_OLDVALUE_MEMBER-DAG: Keyword[self]/CurrNominal: self[#Int#]; |
| 537 | +// EXPLICIT_OLDVALUE_MEMBER: End completions |
| 538 | + } |
| 539 | +} |
| 540 | +var testExplicitOldValue3: Int = 0 { |
| 541 | + didSet(oldVal) { |
| 542 | + var oldV = oldVal |
| 543 | + oldV.#^EXPLICIT_OLDVALUE_COPIEDMEMBER^# |
| 544 | +// EXPLICIT_OLDVALUE_COPIEDMEMBER: Begin completions |
| 545 | +// EXPLICIT_OLDVALUE_COPIEDMEMBER-DAG: Keyword[self]/CurrNominal: self[#Int#]; |
| 546 | +// EXPLICIT_OLDVALUE_COPIEDMEMBER: End completions |
| 547 | + } |
| 548 | +} |
0 commit comments