Jakob Linke
8b1c7ea6f6
Code completion was a no-op inside `__builtin_offsetof`: a cursor at ` __builtin_offsetof(T, ^)` or `__builtin_offsetof(T, a.^)` fell through to ordinary-name completion instead of suggesting fields. Route the code_completion token to a new SemaCodeCompletion entry point that walks the designator path so far, resolves the subobject's type, and enumerates its members. Methods are filtered out, inherited fields are included, indirect fields from anonymous unions and structs are peeled, and `using Base::field` resolves through its UsingShadowDecl. A code_completion token past a complete component (right after `]` or at the end of the chain) is dropped rather than offering fields the user can't paste without first typing `.`. The offsetof and designated-initializer type walkers are folded into one helper parameterized by a field-lookup callback, which incidentally fixes reference-field and indirect-field traversal in designated-initializer completion too. Tests: lit cases in offsetof.cpp covering empty/dot/array/inheritance/ reference/anonymous/using-shadow/macro forms, extended desig-init.cpp walker cases, and a clangd unit test exercising the IDE path. Context: #195126 and #194407 This work was AI assisted but human-reviewed. The followup for the added FIXME is at https://github.com/llvm/llvm-project/compare/main...schuay:llvm-project:refactor-offsetof-component-to-designation
126 lines
5.5 KiB
C++
126 lines
5.5 KiB
C++
struct Base {
|
|
int t;
|
|
};
|
|
struct Foo : public Base {
|
|
int x;
|
|
Base b;
|
|
void foo();
|
|
};
|
|
|
|
void foo() {
|
|
Foo F{.x = 2, .b.t = 0};
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-patterns -code-completion-at=%s:%(line-1):10 %s -o - -std=c++2a | FileCheck -check-prefix=CHECK-CC1 %s
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-patterns -code-completion-at=%s:%(line-2):18 %s -o - -std=c++2a | FileCheck -check-prefix=CHECK-CC1 %s
|
|
// CHECK-CC1: COMPLETION: b : [#Base#]b
|
|
// CHECK-CC1-NEXT: COMPLETION: x : [#int#]x
|
|
// CHECK-CC1-NOT: foo
|
|
// CHECK-CC1-NOT: t
|
|
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-patterns -code-completion-at=%s:%(line-8):20 %s -o - | FileCheck -check-prefix=CHECK-NESTED %s
|
|
// CHECK-NESTED: COMPLETION: t : [#int#]t
|
|
|
|
Base B = {.t = 2};
|
|
auto z = [](Base B) {};
|
|
z({.t = 1});
|
|
z(Base{.t = 2});
|
|
z((Base){.t = 2});
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-patterns -code-completion-at=%s:%(line-5):14 %s -o - -std=c++2a | FileCheck -check-prefix=CHECK-CC2 %s
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-patterns -code-completion-at=%s:%(line-4):7 %s -o - -std=c++2a | FileCheck -check-prefix=CHECK-CC2 %s
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-patterns -code-completion-at=%s:%(line-4):11 %s -o - -std=c++2a | FileCheck -check-prefix=CHECK-CC2 %s
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-patterns -code-completion-at=%s:%(line-4):13 %s -o - -std=c++2a | FileCheck -check-prefix=CHECK-CC2 %s
|
|
// CHECK-CC2: COMPLETION: t : [#int#]t
|
|
auto zr = [](const Base &B) {};
|
|
zr({.t = 1});
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-patterns -code-completion-at=%s:%(line-1):8 %s -o - -std=c++2a | FileCheck -check-prefix=CHECK-REF %s
|
|
// CHECK-REF: COMPLETION: t : [#int#]t
|
|
|
|
Foo G1{.b = {.t = 0}};
|
|
Foo G2{.b{.t = 0}};
|
|
Foo G3{b: {.t = 0}};
|
|
// RUN: %clang_cc1 -code-completion-at=%s:%(line-3):17 -fsyntax-only -code-completion-patterns %s -o - -std=c++2a | FileCheck -check-prefix=CHECK-NESTED-2 %s
|
|
// RUN: %clang_cc1 -code-completion-at=%s:%(line-3):14 -fsyntax-only -code-completion-patterns %s -o - -std=c++2a | FileCheck -check-prefix=CHECK-NESTED-2 %s
|
|
// RUN: %clang_cc1 -code-completion-at=%s:%(line-3):15 -fsyntax-only -code-completion-patterns %s -o - -std=c++2a | FileCheck -check-prefix=CHECK-NESTED-2 %s
|
|
// CHECK-NESTED-2: COMPLETION: t : [#int#]t
|
|
}
|
|
|
|
// Handle templates
|
|
template <typename T>
|
|
struct Test { T x; };
|
|
template <>
|
|
struct Test<int> {
|
|
int x;
|
|
char y;
|
|
};
|
|
void bar() {
|
|
Test<char> T{.x = 2};
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-patterns -code-completion-at=%s:%(line-1):17 %s -o - -std=c++2a | FileCheck -check-prefix=CHECK-CC3 %s
|
|
// CHECK-CC3: COMPLETION: x : [#T#]x
|
|
Test<int> X{.x = 2};
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-patterns -code-completion-at=%s:%(line-1):16 %s -o - -std=c++2a | FileCheck -check-prefix=CHECK-CC4 %s
|
|
// CHECK-CC4: COMPLETION: x : [#int#]x
|
|
// CHECK-CC4-NEXT: COMPLETION: y : [#char#]y
|
|
}
|
|
|
|
template <typename T>
|
|
void aux() {
|
|
Test<T> X{.x = T(2)};
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-patterns -code-completion-at=%s:%(line-1):14 %s -o - -std=c++2a | FileCheck -check-prefix=CHECK-CC3 %s
|
|
}
|
|
|
|
namespace signature_regression {
|
|
// Verify that an old bug is gone: passing an init-list as a constructor arg
|
|
// would emit overloads as a side-effect.
|
|
struct S{int x;};
|
|
int wrongFunction(S);
|
|
int rightFunction();
|
|
int dummy = wrongFunction({1});
|
|
int x = rightFunction();
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:%(line-1):25 %s -o - -std=c++2a | FileCheck -check-prefix=CHECK-SIGNATURE-REGRESSION %s
|
|
// CHECK-SIGNATURE-REGRESSION-NOT: OVERLOAD: [#int#]wrongFunction
|
|
// CHECK-SIGNATURE-REGRESSION: OVERLOAD: [#int#]rightFunction
|
|
// CHECK-SIGNATURE-REGRESSION-NOT: OVERLOAD: [#int#]wrongFunction
|
|
}
|
|
|
|
struct WithAnon {
|
|
int outer;
|
|
struct { int inner; };
|
|
};
|
|
auto TestWithAnon = WithAnon { .inner = 2 };
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-patterns -code-completion-at=%s:%(line-1):33 %s -o - -std=c++2a | FileCheck -check-prefix=CHECK-CC5 %s
|
|
// CHECK-CC5: COMPLETION: inner : [#int#]inner
|
|
// CHECK-CC5: COMPLETION: outer : [#int#]outer
|
|
|
|
// Field designator that traverses an anonymous struct: the IndirectFieldDecl
|
|
// branch in the lookup callback is required to resolve `anon` here.
|
|
struct WithAnonRecord {
|
|
struct Inner {
|
|
int leaf;
|
|
int other;
|
|
};
|
|
struct {
|
|
Inner anon;
|
|
};
|
|
};
|
|
auto TestWithAnonRecord = WithAnonRecord { .anon.leaf = 2 };
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-patterns -code-completion-at=%s:%(line-1):50 %s -o - -std=c++2a | FileCheck -check-prefix=CHECK-CC6 %s
|
|
// CHECK-CC6: COMPLETION: leaf : [#int#]leaf
|
|
// CHECK-CC6: COMPLETION: other : [#int#]other
|
|
|
|
// Array element traversal: `Context.getAsArrayType` strips sugar so the
|
|
// element type is reached cleanly.
|
|
struct WithArrayField {
|
|
Base bases[2];
|
|
};
|
|
auto TestWithArrayField = WithArrayField { .bases[0].t = 2 };
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-patterns -code-completion-at=%s:%(line-1):54 %s -o - -std=c++2a | FileCheck -check-prefix=CHECK-CC8 %s
|
|
// CHECK-CC8: COMPLETION: t : [#int#]t
|
|
|
|
// Reference-typed field: `getNonReferenceType()` on the resolved field type
|
|
// lets the path continue into the referent's record.
|
|
struct WithRefField {
|
|
Base &ref;
|
|
};
|
|
auto TestWithRefField = WithRefField { .ref.t = 2 };
|
|
// RUN: %clang_cc1 -fsyntax-only -code-completion-patterns -code-completion-at=%s:%(line-1):45 %s -o - -std=c++2a | FileCheck -check-prefix=CHECK-CC7 %s
|
|
// CHECK-CC7: COMPLETION: t : [#int#]t
|