Skip to content

[AST] Visit TypeValueExpr's TypeRepr in ASTWalker #83113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 17, 2025
Merged

[AST] Visit TypeValueExpr's TypeRepr in ASTWalker #83113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions lib/AST/ASTWalker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1461,6 +1461,10 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*,
}

Expr *visitTypeValueExpr(TypeValueExpr *E) {
if (auto *TR = E->getRepr()) {
if (doIt(TR))
return nullptr;
}
return E;
}

Expand Down
13 changes: 13 additions & 0 deletions test/Index/index_generic_params.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,3 +165,16 @@ _ = C.Nested(value: 1)
// CHECK-NEXT: [[@LINE+2]]:7 | struct/Swift | Nested | [[C_Nested_USR]] | Ref | rel: 0
// CHECK-NEXT: [[@LINE+1]]:14 | constructor/Swift | init(value:) | [[C_Nested_init_USR]] | Ref,Call | rel: 0
_ = C.Nested.init(value: 1)

// MARK: - Test value generic parameters

struct HasValueGenericParam<let Param: Int> {
// CHECK: [[@LINE-1]]:33 | type-alias/generic-type-param/Swift | Param | s:14swift_ide_test20HasValueGenericParamV0G0xmfp | Def,RelChild | rel: 1
// CHECK-NEXT: RelChild | struct/Swift | HasValueGenericParam
func foo() {
_ = Param
// CHECK: [[@LINE-1]]:9 | type-alias/generic-type-param/Swift | Param | s:14swift_ide_test20HasValueGenericParamV0G0xmfp | Ref,RelCont | rel: 1
// CHECK-NEXT: RelCont | instance-method/Swift | foo()
}
}

10 changes: 10 additions & 0 deletions test/SourceKit/CursorInfo/cursor_generics.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ public protocol Proto<Assoc> {
associatedtype Assoc
}

struct HasValueGenericParam<let Param: Int> {
func foo() {
_ = Param
}
}

// RUN: %sourcekitd-test -req=cursor -pos=1:10 %s -- %s | %FileCheck -check-prefix=CHECK1 %s
// CHECK1: <Declaration>func testGenerics&lt;T&gt;(x: <Type usr="s:15cursor_generics12testGenerics1xyx_tlF1TL_xmfp">T</Type>)</Declaration>

Expand Down Expand Up @@ -69,3 +75,7 @@ public protocol Proto<Assoc> {
// CHECK_ASSOC_COMMON-NEXT: source.refactoring.kind.rename.global
// CHECK_ASSOC_COMMON-NEXT: Global Rename
// CHECK_ASSOC_COMMON-NEXT: ACTIONS END

// RUN: %sourcekitd-test -req=cursor -pos=39:9 %s -- %s | %FileCheck -check-prefix=CHECK_VALUE_GENERIC %s
// CHECK_VALUE_GENERIC: source.lang.swift.ref.generic_type_param (37:33-37:38)
// CHECK_VALUE_GENERIC: <Declaration>let Param : <Type usr="s:Si">Int</Type></Declaration>