From: Douglas Gregor Date: Thu, 16 Sep 2010 16:21:35 +0000 (+0000) Subject: Swap the priorities of constants and types, so that we prefer types. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d754d5546ef1faa4216298fd95bc6a7f15808fd2;p=clang Swap the priorities of constants and types, so that we prefer types. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@114086 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Sema/CodeCompleteConsumer.h b/include/clang/Sema/CodeCompleteConsumer.h index 452a184250..9a388a294b 100644 --- a/include/clang/Sema/CodeCompleteConsumer.h +++ b/include/clang/Sema/CodeCompleteConsumer.h @@ -49,10 +49,10 @@ enum { CCP_CodePattern = 30, /// \brief Priority for a non-type declaration. CCP_Declaration = 50, - /// \brief Priority for a constant value (e.g., enumerator). - CCP_Constant = 60, /// \brief Priority for a type. - CCP_Type = 65, + CCP_Type = 60, + /// \brief Priority for a constant value (e.g., enumerator). + CCP_Constant = 65, /// \brief Priority for a preprocessor macro. CCP_Macro = 70, /// \brief Priority for a nested-name-specifier. diff --git a/test/Index/code-completion.cpp b/test/Index/code-completion.cpp index a0f0d3e70c..3dceec9e72 100644 --- a/test/Index/code-completion.cpp +++ b/test/Index/code-completion.cpp @@ -58,8 +58,8 @@ Z::operator int() const { // CHECK-OVERLOAD: NotImplemented:{ResultType double &}{Text overloaded}{LeftParen (}{Text float f}{Comma , }{CurrentParameter int second}{RightParen )} // RUN: c-index-test -code-completion-at=%s:37:10 %s | FileCheck -check-prefix=CHECK-EXPR %s -// CHECK-EXPR: NotImplemented:{TypedText int} (65) -// CHECK-EXPR: NotImplemented:{TypedText long} (65) +// CHECK-EXPR: NotImplemented:{TypedText int} (60) +// CHECK-EXPR: NotImplemented:{TypedText long} (60) // CHECK-EXPR: FieldDecl:{ResultType double}{TypedText member} (10) // CHECK-EXPR: FieldDecl:{ResultType int}{Text X::}{TypedText member} (5) // CHECK-EXPR: FieldDecl:{ResultType float}{Text Y::}{TypedText member} (11) diff --git a/test/Index/complete-declarators.cpp b/test/Index/complete-declarators.cpp index 8fba4db2f9..3c1ba8f914 100644 --- a/test/Index/complete-declarators.cpp +++ b/test/Index/complete-declarators.cpp @@ -34,6 +34,6 @@ struct Z { // CHECK-CC4: Namespace:{TypedText N}{Text ::} (75) // CHECK-CC4: NotImplemented:{TypedText operator} (30) // CHECK-CC4: NotImplemented:{TypedText volatile} (30) -// CHECK-CC4: StructDecl:{TypedText Y} (65) +// CHECK-CC4: StructDecl:{TypedText Y} (60) // CHECK-CC4: StructDecl:{TypedText Z} (20) diff --git a/test/Index/complete-exprs.c b/test/Index/complete-exprs.c index c2b373f3a4..17c4a4d7e1 100644 --- a/test/Index/complete-exprs.c +++ b/test/Index/complete-exprs.c @@ -26,7 +26,7 @@ void f5(float f) { // RUN: c-index-test -code-completion-at=%s:7:9 -Xclang -code-completion-patterns %s | FileCheck -check-prefix=CHECK-CC1 %s // RUN: env CINDEXTEST_EDITING=1 c-index-test -code-completion-at=%s:7:9 -Xclang -code-completion-patterns %s | FileCheck -check-prefix=CHECK-CC1 %s -// CHECK-CC1: NotImplemented:{TypedText __PRETTY_FUNCTION__} (60) +// CHECK-CC1: NotImplemented:{TypedText __PRETTY_FUNCTION__} (65) // CHECK-CC1: macro definition:{TypedText __VERSION__} (70) // CHECK-CC1: FunctionDecl:{ResultType int}{TypedText f}{LeftParen (}{Placeholder int}{RightParen )} (12) (unavailable) // CHECK-CC1-NOT: NotImplemented:{TypedText float} (65) @@ -37,7 +37,7 @@ void f5(float f) { // RUN: env CINDEXTEST_EDITING=1 c-index-test -code-completion-at=%s:7:14 -Xclang -code-completion-patterns %s | FileCheck -check-prefix=CHECK-CC3 %s // CHECK-CC3: macro definition:{TypedText __VERSION__} (70) // CHECK-CC3: FunctionDecl:{ResultType int}{TypedText f}{LeftParen (}{Placeholder int}{RightParen )} (50) -// CHECK-CC3-NOT: NotImplemented:{TypedText float} (65) +// CHECK-CC3-NOT: NotImplemented:{TypedText float} // CHECK-CC3: ParmDecl:{ResultType int}{TypedText j} (8) // CHECK-CC3: NotImplemented:{TypedText sizeof}{LeftParen (}{Placeholder expressio @@ -46,7 +46,7 @@ void f5(float f) { // RUN: c-index-test -code-completion-at=%s:7:2 -Xclang -code-completion-patterns %s | FileCheck -check-prefix=CHECK-CC2 %s // CHECK-CC2: macro definition:{TypedText __VERSION__} (70) // CHECK-CC2: FunctionDecl:{ResultType int}{TypedText f}{LeftParen (}{Placeholder int}{RightParen )} (50) -// CHECK-CC2: NotImplemented:{TypedText float} (65) +// CHECK-CC2: NotImplemented:{TypedText float} (60) // CHECK-CC2: ParmDecl:{ResultType int}{TypedText j} (8) // CHECK-CC2: NotImplemented:{TypedText sizeof}{LeftParen (}{Placeholder expression-or-type}{RightParen )} (30) // RUN: c-index-test -code-completion-at=%s:11:16 -Xclang -code-completion-patterns %s | FileCheck -check-prefix=CHECK-CC4 %s @@ -55,8 +55,8 @@ void f5(float f) { // RUN: c-index-test -code-completion-at=%s:19:3 -Xclang -code-completion-patterns %s | FileCheck -check-prefix=CHECK-CC6 %s // CHECK-CC6: FunctionDecl:{ResultType void}{TypedText f3}{LeftParen (}{Placeholder const char *, ...}{Text , NULL}{RightParen )} (45) -// CHECK-CC6: NotImplemented:{TypedText void} (65) -// CHECK-CC6: NotImplemented:{TypedText volatile} (65) +// CHECK-CC6: NotImplemented:{TypedText void} (60) +// CHECK-CC6: NotImplemented:{TypedText volatile} (60) // RUN: c-index-test -code-completion-at=%s:24:4 -Xclang -code-completion-patterns %s | FileCheck -check-prefix=CHECK-CC7 %s // RUN: env CINDEXTEST_EDITING=1 c-index-test -code-completion-at=%s:24:4 -Xclang -code-completion-patterns %s | FileCheck -check-prefix=CHECK-CC7 %s diff --git a/test/Index/complete-hiding.c b/test/Index/complete-hiding.c index e22e8cb3d5..937a16d844 100644 --- a/test/Index/complete-hiding.c +++ b/test/Index/complete-hiding.c @@ -25,8 +25,8 @@ void f() { // CHECK-CC1: VarDecl:{ResultType int}{TypedText ValueB} (50) // RUN: c-index-test -code-completion-at=%s:16:10 %s > %t // RUN: FileCheck -check-prefix=CHECK-CC2 -input-file=%t %s -// CHECK-CC2: StructDecl:{TypedText StructA} (65) -// CHECK-CC2-NOT: StructDecl:{TypedText StructB} (65) -// CHECK-CC2: StructDecl:{TypedText StructC} (65) +// CHECK-CC2: StructDecl:{TypedText StructA} (60) +// CHECK-CC2-NOT: StructDecl:{TypedText StructB} (60) +// CHECK-CC2: StructDecl:{TypedText StructC} (60) // RUN: env CINDEXTEST_EDITING=1 CINDEXTEST_COMPLETION_CACHING=1 c-index-test -code-completion-at=%s:16:10 %s > %t // RUN: FileCheck -check-prefix=CHECK-CC2 -input-file=%t %s diff --git a/test/Index/complete-macros.c b/test/Index/complete-macros.c index 26a63b151b..eff42cad75 100644 --- a/test/Index/complete-macros.c +++ b/test/Index/complete-macros.c @@ -21,7 +21,7 @@ void f2() { // RUN: c-index-test -code-completion-at=%s:13:13 %s | FileCheck -check-prefix=CHECK-CC2 %s // RUN: c-index-test -code-completion-at=%s:14:8 %s | FileCheck -check-prefix=CHECK-CC2 %s // RUN: env CINDEXTEST_EDITING=1 CINDEXTEST_COMPLETION_CACHING=1 c-index-test -code-completion-at=%s:14:8 %s | FileCheck -check-prefix=CHECK-CC2 %s -// CHECK-CC2: macro definition:{TypedText nil} (30) +// CHECK-CC2: macro definition:{TypedText nil} (32) // RUN: c-index-test -code-completion-at=%s:15:5 %s | FileCheck -check-prefix=CHECK-CC3 %s // RUN: env CINDEXTEST_EDITING=1 CINDEXTEST_COMPLETION_CACHING=1 c-index-test -code-completion-at=%s:15:5 %s | FileCheck -check-prefix=CHECK-CC3 %s -// CHECK-CC3: macro definition:{TypedText nil} (60) +// CHECK-CC3: macro definition:{TypedText nil} (65) diff --git a/test/Index/complete-method-decls.m b/test/Index/complete-method-decls.m index 1324ae4a69..d0fb0e0c89 100644 --- a/test/Index/complete-method-decls.m +++ b/test/Index/complete-method-decls.m @@ -121,39 +121,39 @@ // CHECK-CCE: ObjCInstanceMethodDecl:{ResultType id}{Informative first:}{Informative second2:}{TypedText third:}{Text (double)z} (20) // CHECK-CCE: ObjCInstanceMethodDecl:{ResultType int}{Informative first:}{Informative second2:}{TypedText third:}{Text (double)z} (5) // RUN: c-index-test -code-completion-at=%s:60:4 %s | FileCheck -check-prefix=CHECK-CCF %s -// CHECK-CCF: ObjCInterfaceDecl:{TypedText A} (65) -// CHECK-CCF: ObjCInterfaceDecl:{TypedText B} (65) +// CHECK-CCF: ObjCInterfaceDecl:{TypedText A} (60) +// CHECK-CCF: ObjCInterfaceDecl:{TypedText B} (60) // CHECK-CCF: NotImplemented:{TypedText bycopy} (30) // CHECK-CCF: NotImplemented:{TypedText byref} (30) // CHECK-CCF: NotImplemented:{TypedText in} (30) // CHECK-CCF: NotImplemented:{TypedText inout} (30) // CHECK-CCF: NotImplemented:{TypedText oneway} (30) // CHECK-CCF: NotImplemented:{TypedText out} (30) -// CHECK-CCF: NotImplemented:{TypedText unsigned} (65) -// CHECK-CCF: NotImplemented:{TypedText void} (65) -// CHECK-CCF: NotImplemented:{TypedText volatile} (65) +// CHECK-CCF: NotImplemented:{TypedText unsigned} (60) +// CHECK-CCF: NotImplemented:{TypedText void} (60) +// CHECK-CCF: NotImplemented:{TypedText volatile} (60) // RUN: c-index-test -code-completion-at=%s:60:11 %s | FileCheck -check-prefix=CHECK-CCG %s -// CHECK-CCG: ObjCInterfaceDecl:{TypedText A} (65) -// CHECK-CCG: ObjCInterfaceDecl:{TypedText B} (65) +// CHECK-CCG: ObjCInterfaceDecl:{TypedText A} (60) +// CHECK-CCG: ObjCInterfaceDecl:{TypedText B} (60) // CHECK-CCG-NOT: NotImplemented:{TypedText bycopy} (30) // CHECK-CCG-NOT: NotImplemented:{TypedText byref} (30) // CHECK-CCG: NotImplemented:{TypedText in} (30) // CHECK-CCG: NotImplemented:{TypedText inout} (30) // CHECK-CCG-NOT: NotImplemented:{TypedText oneway} (30) // CHECK-CCG: NotImplemented:{TypedText out} (30) -// CHECK-CCG: NotImplemented:{TypedText unsigned} (65) -// CHECK-CCG: NotImplemented:{TypedText void} (65) -// CHECK-CCG: NotImplemented:{TypedText volatile} (65) +// CHECK-CCG: NotImplemented:{TypedText unsigned} (60) +// CHECK-CCG: NotImplemented:{TypedText void} (60) +// CHECK-CCG: NotImplemented:{TypedText volatile} (60) // RUN: c-index-test -code-completion-at=%s:60:24 %s | FileCheck -check-prefix=CHECK-CCF %s // RUN: c-index-test -code-completion-at=%s:60:26 %s | FileCheck -check-prefix=CHECK-CCH %s -// CHECK-CCH: ObjCInterfaceDecl:{TypedText A} (65) -// CHECK-CCH: ObjCInterfaceDecl:{TypedText B} (65) +// CHECK-CCH: ObjCInterfaceDecl:{TypedText A} (60) +// CHECK-CCH: ObjCInterfaceDecl:{TypedText B} (60) // CHECK-CCH: NotImplemented:{TypedText bycopy} (30) // CHECK-CCH: NotImplemented:{TypedText byref} (30) // CHECK-CCH-NOT: NotImplemented:{TypedText in} (30) // CHECK-CCH: NotImplemented:{TypedText inout} (30) // CHECK-CCH: NotImplemented:{TypedText oneway} (30) // CHECK-CCH: NotImplemented:{TypedText out} (30) -// CHECK-CCH: NotImplemented:{TypedText unsigned} (65) -// CHECK-CCH: NotImplemented:{TypedText void} (65) -// CHECK-CCH: NotImplemented:{TypedText volatile} (65) +// CHECK-CCH: NotImplemented:{TypedText unsigned} (60) +// CHECK-CCH: NotImplemented:{TypedText void} (60) +// CHECK-CCH: NotImplemented:{TypedText volatile} (60) diff --git a/test/Index/complete-preprocessor.m b/test/Index/complete-preprocessor.m index 1873dad6f3..73b8441020 100644 --- a/test/Index/complete-preprocessor.m +++ b/test/Index/complete-preprocessor.m @@ -61,16 +61,16 @@ FOO(in,t) value; // CHECK-CC4: macro definition:{TypedText BAR} (70) // CHECK-CC4: macro definition:{TypedText FOO}{LeftParen (}{Placeholder a}{Comma , }{Placeholder b}{RightParen )} (70) // RUN: c-index-test -code-completion-at=%s:14:5 %s | FileCheck -check-prefix=CHECK-CC5 %s -// CHECK-CC5: NotImplemented:{TypedText const} (65) -// CHECK-CC5: NotImplemented:{TypedText double} (65) -// CHECK-CC5: NotImplemented:{TypedText enum} (65) +// CHECK-CC5: NotImplemented:{TypedText const} (60) +// CHECK-CC5: NotImplemented:{TypedText double} (60) +// CHECK-CC5: NotImplemented:{TypedText enum} (60) // CHECK-CC5: NotImplemented:{TypedText extern} (30) -// CHECK-CC5: NotImplemented:{TypedText float} (65) +// CHECK-CC5: NotImplemented:{TypedText float} (60) // CHECK-CC5: macro definition:{TypedText FOO}{LeftParen (}{Placeholder a}{Comma , }{Placeholder b}{RightParen )} (70) -// CHECK-CC5: TypedefDecl:{TypedText id} (65) +// CHECK-CC5: TypedefDecl:{TypedText id} (60) // CHECK-CC5: NotImplemented:{TypedText inline} (30) -// CHECK-CC5: NotImplemented:{TypedText int} (65) -// CHECK-CC5: NotImplemented:{TypedText long} (65) +// CHECK-CC5: NotImplemented:{TypedText int} (60) +// CHECK-CC5: NotImplemented:{TypedText long} (60) // Same tests as above, but with completion caching. // RUN: env CINDEXTEST_EDITING=1 CINDEXTEST_COMPLETION_CACHING=1 c-index-test -code-completion-at=%s:4:2 %s | FileCheck -check-prefix=CHECK-CC1 %s diff --git a/test/Index/complete-type-factors.m b/test/Index/complete-type-factors.m index 2048cd3523..96f5874c20 100644 --- a/test/Index/complete-type-factors.m +++ b/test/Index/complete-type-factors.m @@ -27,81 +27,81 @@ enum Priority test1(enum Priority priority, enum Color color, int integer) { // infrastructure yet. // RUN: c-index-test -code-completion-at=%s:16:11 -Xclang -code-completion-patterns %s | FileCheck -check-prefix=CHECK-CC1 %s -// CHECK-CC1: EnumConstantDecl:{ResultType enum Color}{TypedText Blue} (30) +// CHECK-CC1: EnumConstantDecl:{ResultType enum Color}{TypedText Blue} (32) // CHECK-CC1: ParmDecl:{ResultType enum Color}{TypedText color} (4) // CHECK-CC1: FunctionDecl:{ResultType int}{TypedText func1}{LeftParen (}{Placeholder enum Color}{RightParen )} (12) // CHECK-CC1: FunctionDecl:{ResultType enum Priority}{TypedText func2}{LeftParen (}{Placeholder int}{RightParen )} (25) -// CHECK-CC1: EnumConstantDecl:{ResultType enum Color}{TypedText Green} (30) -// CHECK-CC1: EnumConstantDecl:{ResultType enum Priority}{TypedText High} (30) +// CHECK-CC1: EnumConstantDecl:{ResultType enum Color}{TypedText Green} (32) +// CHECK-CC1: EnumConstantDecl:{ResultType enum Priority}{TypedText High} (32) // CHECK-CC1: VarDecl:{ResultType int}{TypedText i} (2) // CHECK-CC1: ParmDecl:{ResultType int}{TypedText integer} (2) -// CHECK-CC1: EnumConstantDecl:{ResultType enum Priority}{TypedText Low} (30) +// CHECK-CC1: EnumConstantDecl:{ResultType enum Priority}{TypedText Low} (32) // CHECK-CC1: ParmDecl:{ResultType enum Priority}{TypedText priority} (4) -// CHECK-CC1: EnumConstantDecl:{ResultType enum Color}{TypedText Red} (30) +// CHECK-CC1: EnumConstantDecl:{ResultType enum Color}{TypedText Red} (32) // CHECK-CC1: NotImplemented:{TypedText sizeof}{LeftParen (}{Placeholder expression-or-type}{RightParen )} (30) // CHECK-CC1: FunctionDecl:{ResultType enum Priority}{TypedText test1}{LeftParen (}{Placeholder enum Priority priority}{Comma , }{Placeholder enum Color color}{Comma , }{Placeholder int integer}{RightParen )} (25) // RUN: c-index-test -code-completion-at=%s:17:18 -Xclang -code-completion-patterns %s | FileCheck -check-prefix=CHECK-CC2 %s -// CHECK-CC2: EnumConstantDecl:{ResultType enum Color}{TypedText Blue} (15) +// CHECK-CC2: EnumConstantDecl:{ResultType enum Color}{TypedText Blue} (16) // CHECK-CC2: VarDecl:{ResultType enum Color}{TypedText c} (2) // CHECK-CC2: ParmDecl:{ResultType enum Color}{TypedText color} (2) // CHECK-CC2: FunctionDecl:{ResultType int}{TypedText func1}{LeftParen (}{Placeholder enum Color}{RightParen )} (25) // CHECK-CC2: FunctionDecl:{ResultType enum Priority}{TypedText func2}{LeftParen (}{Placeholder int}{RightParen )} (50) -// CHECK-CC2: EnumConstantDecl:{ResultType enum Color}{TypedText Green} (15) -// CHECK-CC2: EnumConstantDecl:{ResultType enum Priority}{TypedText High} (60) +// CHECK-CC2: EnumConstantDecl:{ResultType enum Color}{TypedText Green} (16) +// CHECK-CC2: EnumConstantDecl:{ResultType enum Priority}{TypedText High} (65) // CHECK-CC2: VarDecl:{ResultType int}{TypedText i} (4) // CHECK-CC2: ParmDecl:{ResultType int}{TypedText integer} (4) -// CHECK-CC2: EnumConstantDecl:{ResultType enum Priority}{TypedText Low} (60) +// CHECK-CC2: EnumConstantDecl:{ResultType enum Priority}{TypedText Low} (65) // CHECK-CC2: ParmDecl:{ResultType enum Priority}{TypedText priority} (8) -// CHECK-CC2: EnumConstantDecl:{ResultType enum Color}{TypedText Red} (15) +// CHECK-CC2: EnumConstantDecl:{ResultType enum Color}{TypedText Red} (16) // CHECK-CC2: NotImplemented:{TypedText sizeof}{LeftParen (}{Placeholder expression-or-type}{RightParen )} (30) // CHECK-CC2: FunctionDecl:{ResultType enum Priority}{TypedText test1}{LeftParen (}{Placeholder enum Priority priority}{Comma , }{Placeholder enum Color color}{Comma , }{Placeholder int integer}{RightParen )} (50) // RUN: c-index-test -code-completion-at=%s:18:10 -Xclang -code-completion-patterns %s | FileCheck -check-prefix=CHECK-CC3 %s -// CHECK-CC3: EnumConstantDecl:{ResultType enum Color}{TypedText Blue} (60) +// CHECK-CC3: EnumConstantDecl:{ResultType enum Color}{TypedText Blue} (65) // CHECK-CC3: VarDecl:{ResultType enum Color}{TypedText c} (8) // CHECK-CC3: ParmDecl:{ResultType enum Color}{TypedText color} (8) // CHECK-CC3: FunctionDecl:{ResultType int}{TypedText func1}{LeftParen (}{Placeholder enum Color}{RightParen )} (25) // CHECK-CC3: FunctionDecl:{ResultType enum Priority}{TypedText func2}{LeftParen (}{Placeholder int}{RightParen )} (12) // CHECK-CC3: FunctionDecl:{ResultType void}{TypedText func3}{LeftParen (}{Placeholder float}{RightParen )} (50) -// CHECK-CC3: EnumConstantDecl:{ResultType enum Color}{TypedText Green} (60) -// CHECK-CC3: EnumConstantDecl:{ResultType enum Priority}{TypedText High} (15) +// CHECK-CC3: EnumConstantDecl:{ResultType enum Color}{TypedText Green} (65) +// CHECK-CC3: EnumConstantDecl:{ResultType enum Priority}{TypedText High} (16) // CHECK-CC3: VarDecl:{ResultType int}{TypedText i} (4) // CHECK-CC3: ParmDecl:{ResultType int}{TypedText integer} (4) -// CHECK-CC3: EnumConstantDecl:{ResultType enum Priority}{TypedText Low} (15) +// CHECK-CC3: EnumConstantDecl:{ResultType enum Priority}{TypedText Low} (16) // CHECK-CC3: ParmDecl:{ResultType enum Priority}{TypedText priority} (2) -// CHECK-CC3: EnumConstantDecl:{ResultType enum Color}{TypedText Red} (60) +// CHECK-CC3: EnumConstantDecl:{ResultType enum Color}{TypedText Red} (65) // CHECK-CC3: NotImplemented:{TypedText sizeof}{LeftParen (}{Placeholder expression-or-type}{RightParen )} (30) // CHECK-CC3: FunctionDecl:{ResultType enum Priority}{TypedText test1}{LeftParen (}{Placeholder enum Priority priority}{Comma , }{Placeholder enum Color color}{Comma , }{Placeholder int integer}{RightParen )} (12) // RUN: c-index-test -code-completion-at=%s:19:9 -Xclang -code-completion-patterns %s | FileCheck -check-prefix=CHECK-CC4 %s -// CHECK-CC4: EnumConstantDecl:{ResultType enum Color}{TypedText Blue} (15) +// CHECK-CC4: EnumConstantDecl:{ResultType enum Color}{TypedText Blue} (16) // CHECK-CC4: VarDecl:{ResultType enum Color}{TypedText c} (2) // CHECK-CC4: ParmDecl:{ResultType enum Color}{TypedText color} (2) // CHECK-CC4: FunctionDecl:{ResultType int}{TypedText func1}{LeftParen (}{Placeholder enum Color}{RightParen )} (25) // CHECK-CC4: FunctionDecl:{ResultType enum Priority}{TypedText func2}{LeftParen (}{Placeholder int}{RightParen )} (50) // CHECK-CC4: FunctionDecl:{ResultType void}{TypedText func3}{LeftParen (}{Placeholder float}{RightParen )} (50) -// CHECK-CC4: EnumConstantDecl:{ResultType enum Color}{TypedText Green} (15) -// CHECK-CC4: EnumConstantDecl:{ResultType enum Priority}{TypedText High} (60) +// CHECK-CC4: EnumConstantDecl:{ResultType enum Color}{TypedText Green} (16) +// CHECK-CC4: EnumConstantDecl:{ResultType enum Priority}{TypedText High} (65) // CHECK-CC4: VarDecl:{ResultType int}{TypedText i} (4) // CHECK-CC4: ParmDecl:{ResultType int}{TypedText integer} (4) -// CHECK-CC4: EnumConstantDecl:{ResultType enum Priority}{TypedText Low} (60) +// CHECK-CC4: EnumConstantDecl:{ResultType enum Priority}{TypedText Low} (65) // CHECK-CC4: ParmDecl:{ResultType enum Priority}{TypedText priority} (8) -// CHECK-CC4: EnumConstantDecl:{ResultType enum Color}{TypedText Red} (15) +// CHECK-CC4: EnumConstantDecl:{ResultType enum Color}{TypedText Red} (16) // CHECK-CC4: NotImplemented:{TypedText sizeof}{LeftParen (}{Placeholder expression-or-type}{RightParen )} (30) // CHECK-CC4: FunctionDecl:{ResultType enum Priority}{TypedText test1}{LeftParen (}{Placeholder enum Priority priority}{Comma , }{Placeholder enum Color color}{Comma , }{Placeholder int integer}{RightParen )} (50) // RUN: c-index-test -code-completion-at=%s:21:9 -Xclang -code-completion-patterns %s | FileCheck -check-prefix=CHECK-CC4 %s // RUN: c-index-test -code-completion-at=%s:22:7 -Xclang -code-completion-patterns %s | FileCheck -check-prefix=CHECK-CC6 %s // CHECK-CC6: VarDecl:{ResultType void (^)(enum Color, int)}{TypedText block} (8) -// CHECK-CC6: EnumConstantDecl:{ResultType enum Color}{TypedText Blue} (15) +// CHECK-CC6: EnumConstantDecl:{ResultType enum Color}{TypedText Blue} (16) // CHECK-CC6: VarDecl:{ResultType enum Color}{TypedText c} (2) // CHECK-CC6: ParmDecl:{ResultType enum Color}{TypedText color} (2) // CHECK-CC6: FunctionDecl:{ResultType int}{TypedText func1}{LeftParen (}{Placeholder enum Color}{RightParen )} (25) // CHECK-CC6: FunctionDecl:{ResultType enum Priority}{TypedText func2}{LeftParen (}{Placeholder int}{RightParen )} (50) // CHECK-CC6: FunctionDecl:{ResultType void}{TypedText func3}{LeftParen (}{Placeholder float}{RightParen )} (50) -// CHECK-CC6: EnumConstantDecl:{ResultType enum Color}{TypedText Green} (15) -// CHECK-CC6: EnumConstantDecl:{ResultType enum Priority}{TypedText High} (60) +// CHECK-CC6: EnumConstantDecl:{ResultType enum Color}{TypedText Green} (16) +// CHECK-CC6: EnumConstantDecl:{ResultType enum Priority}{TypedText High} (65) // CHECK-CC6: VarDecl:{ResultType int}{TypedText i} (4) // CHECK-CC6: ParmDecl:{ResultType int}{TypedText integer} (4) -// CHECK-CC6: EnumConstantDecl:{ResultType enum Priority}{TypedText Low} (60) +// CHECK-CC6: EnumConstantDecl:{ResultType enum Priority}{TypedText Low} (65) // CHECK-CC6: ParmDecl:{ResultType enum Priority}{TypedText priority} (8) -// CHECK-CC6: EnumConstantDecl:{ResultType enum Color}{TypedText Red} (15) +// CHECK-CC6: EnumConstantDecl:{ResultType enum Color}{TypedText Red} (16) // CHECK-CC6: NotImplemented:{TypedText sizeof}{LeftParen (}{Placeholder expression-or-type}{RightParen )} (30) // CHECK-CC6: FunctionDecl:{ResultType enum Priority}{TypedText test1}{LeftParen (}{Placeholder enum Priority priority}{Comma , }{Placeholder enum Color color}{Comma , }{Placeholder int integer}{RightParen )} (50)