b3510c4254
Summary:
Make completion behave consistently no matter if it is run at the
start, in the middle or at the end of an identifier that happens to
be a keyword or a macro name. Since completion is often ran on
incomplete identifiers, they may turn into keywords by accident.
For example, we should produce same results for all of these
completion points:
// ^ is completion point.
^class
cla^ss
class^
Previously clang produced different results for the last case (as if
the completion point was after a space: `class ^`).
This change also updates some offsets in tests that (unintentionally?)
relied on the old behavior.
Reviewers: sammccall, bkramer, arphaman, aaron.ballman
Reviewed By: sammccall
Subscribers: cfe-commits
Differential Revision: https://reviews.llvm.org/D45887
llvm-svn: 330717
47 lines
1.5 KiB
C
47 lines
1.5 KiB
C
enum Color {
|
|
Red, Green, Blue
|
|
};
|
|
|
|
struct Point {
|
|
float x, y, z;
|
|
enum Color color;
|
|
};
|
|
|
|
void test(struct Point *p) {
|
|
// RUN: %clang_cc1 -include %S/Inputs/macros.h -fsyntax-only -code-completion-macros -code-completion-at=%s:12:14 %s -o - | FileCheck -check-prefix=CC1 %s
|
|
switch (p->IDENTITY(color)) {
|
|
// RUN: %clang_cc1 -include %S/Inputs/macros.h -fsyntax-only -code-completion-macros -code-completion-at=%s:14:10 %s -o - | FileCheck -check-prefix=CC2 %s
|
|
case
|
|
}
|
|
// RUN: %clang_cc1 -include %S/Inputs/macros.h -fsyntax-only -code-completion-macros -code-completion-at=%s:17:8 %s -o - | FileCheck -check-prefix=CC3 %s
|
|
#ifdef Q
|
|
#endif
|
|
|
|
// Run the same tests, this time with macros loaded from the PCH file.
|
|
// RUN: %clang_cc1 -emit-pch -o %t %S/Inputs/macros.h
|
|
// RUN: %clang_cc1 -include-pch %t -fsyntax-only -code-completion-macros -code-completion-at=%s:12:14 %s -o - | FileCheck -check-prefix=CC1 %s
|
|
// RUN: %clang_cc1 -include-pch %t -fsyntax-only -code-completion-macros -code-completion-at=%s:14:10 %s -o - | FileCheck -check-prefix=CC2 %s
|
|
// RUN: %clang_cc1 -include-pch %t -fsyntax-only -code-completion-macros -code-completion-at=%s:17:8 %s -o - | FileCheck -check-prefix=CC3 %s
|
|
|
|
// CC1: color
|
|
// CC1: x
|
|
// CC1: y
|
|
// CC1: z
|
|
|
|
// CC2: BAR(<#X#>, <#Y#>)
|
|
// CC2: Blue
|
|
// CC2: FOO
|
|
// CC2: Green
|
|
// CC2: IDENTITY(<#X#>)
|
|
// CC2: MACRO_WITH_HISTORY(<#X#>, <#Y#>)
|
|
// CC2: Red
|
|
// CC2: WIBBLE
|
|
|
|
// CC3: BAR
|
|
// CC3: DEAD_MACRO
|
|
// CC3: FOO
|
|
// CC3: IDENTITY
|
|
// CC3: MACRO_WITH_HISTORY
|
|
// CC3: WIBBLE
|
|
}
|