Author: dgregor
Date: Tue Jul 17 18:24:47 2012
New Revision: 160407
URL: http://llvm.org/viewvc/llvm-project?rev=160407&view=rev
Log:
Remove unnecessary spacing around Objective-C object literal code
completions. Fixes <rdar://problem/11889572>.
Modified:
cfe/trunk/lib/Sema/SemaCodeComplete.cpp
cfe/trunk/test/CodeCompletion/objc-expr.m
cfe/trunk/test/Index/complete-exprs.m
Modified: cfe/trunk/lib/Sema/SemaCodeComplete.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaCodeComplete.cpp?rev=160407&r1=160406&r2=160407&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaCodeComplete.cpp (original)
+++ cfe/trunk/lib/Sema/SemaCodeComplete.cpp Tue Jul 17 18:24:47 2012
@@ -4465,34 +4465,28 @@
Builder.AddTextChunk("\"");
Results.AddResult(Result(Builder.TakeString()));
- // @[ objects, ... ]
+ // @[objects, ...]
Builder.AddResultTypeChunk("NSArray *");
Builder.AddTypedTextChunk(OBJC_AT_KEYWORD_NAME(NeedAt,"["));
- Builder.AddChunk(CodeCompletionString::CK_HorizontalSpace);
Builder.AddPlaceholderChunk("objects, ...");
- Builder.AddChunk(CodeCompletionString::CK_HorizontalSpace);
Builder.AddChunk(CodeCompletionString::CK_RightBracket);
Results.AddResult(Result(Builder.TakeString()));
- // @{ key : object, ... }
+ // @{key : object, ...}
Builder.AddResultTypeChunk("NSDictionary *");
Builder.AddTypedTextChunk(OBJC_AT_KEYWORD_NAME(NeedAt,"{"));
- Builder.AddChunk(CodeCompletionString::CK_HorizontalSpace);
Builder.AddPlaceholderChunk("key");
Builder.AddChunk(CodeCompletionString::CK_HorizontalSpace);
Builder.AddChunk(CodeCompletionString::CK_Colon);
Builder.AddChunk(CodeCompletionString::CK_HorizontalSpace);
Builder.AddPlaceholderChunk("object, ...");
- Builder.AddChunk(CodeCompletionString::CK_HorizontalSpace);
Builder.AddChunk(CodeCompletionString::CK_RightBrace);
Results.AddResult(Result(Builder.TakeString()));
- // @( expression )
+ // @(expression)
Builder.AddResultTypeChunk("id");
Builder.AddTypedTextChunk(OBJC_AT_KEYWORD_NAME(NeedAt, "("));
- Builder.AddChunk(CodeCompletionString::CK_HorizontalSpace);
Builder.AddPlaceholderChunk("expression");
- Builder.AddChunk(CodeCompletionString::CK_HorizontalSpace);
Builder.AddChunk(CodeCompletionString::CK_RightParen);
Results.AddResult(Result(Builder.TakeString()));
}
Modified: cfe/trunk/test/CodeCompletion/objc-expr.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeCompletion/objc-expr.m?rev=160407&r1=160406&r2=160407&view=diff
==============================================================================
--- cfe/trunk/test/CodeCompletion/objc-expr.m (original)
+++ cfe/trunk/test/CodeCompletion/objc-expr.m Tue Jul 17 18:24:47 2012
@@ -6,12 +6,12 @@
// RUN: %clang_cc1 -fsyntax-only -code-completion-patterns
-code-completion-at=%s:4:11 %s -fno-const-strings -o - | FileCheck
-check-prefix=AT %s
// CHECK-AT: COMPLETION: Pattern : [#NSString *#]"<#string#>"
-// CHECK-AT: COMPLETION: Pattern : [#id#]( <#expression#> )
-// CHECK-AT: COMPLETION: Pattern : [#NSArray *#][ <#objects, ...#> ]
+// CHECK-AT: COMPLETION: Pattern : [#id#](<#expression#>)
+// CHECK-AT: COMPLETION: Pattern : [#NSArray *#][<#objects, ...#>]
// CHECK-AT: COMPLETION: Pattern : [#char[]#]encode(<#type-name#>)
// CHECK-AT: COMPLETION: Pattern : [#Protocol *#]protocol(<#protocol-name#>)
// CHECK-AT: COMPLETION: Pattern : [#SEL#]selector(<#selector#>)
-// CHECK-AT: COMPLETION: Pattern : [#NSDictionary *#]{ <#key#> : <#object,
...#> }
+// CHECK-AT: COMPLETION: Pattern : [#NSDictionary *#]{<#key#> : <#object,
...#>}
// RUN: %clang_cc1 -fsyntax-only -code-completion-patterns
-code-completion-at=%s:4:11 %s -fconst-strings -o - | FileCheck
-check-prefix=CONST-STRINGS %s
// CHECK-CONST-STRINGS: COMPLETION: Pattern : [#const
char[]#]encode(<#type-name#>)
Modified: cfe/trunk/test/Index/complete-exprs.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/complete-exprs.m?rev=160407&r1=160406&r2=160407&view=diff
==============================================================================
--- cfe/trunk/test/Index/complete-exprs.m (original)
+++ cfe/trunk/test/Index/complete-exprs.m Tue Jul 17 18:24:47 2012
@@ -19,9 +19,9 @@
// RUN: c-index-test -code-completion-at=%s:13:2 %s | FileCheck
-check-prefix=CHECK-CC1 %s
// CHECK-CC1: NotImplemented:{ResultType NSString *}{TypedText @"}{Placeholder
string}{Text "} (40)
-// CHECK-CC1: NotImplemented:{ResultType id}{TypedText @(}{HorizontalSpace
}{Placeholder expression}{HorizontalSpace }{RightParen )} (40)
-// CHECK-CC1: NotImplemented:{ResultType NSArray *}{TypedText
@[}{HorizontalSpace }{Placeholder objects, ...}{HorizontalSpace
}{RightBracket ]} (40)
-// CHECK-CC1: NotImplemented:{ResultType NSDictionary *}{TypedText
@{}{HorizontalSpace }{Placeholder key}{HorizontalSpace }{Colon
:}{HorizontalSpace }{Placeholder object, ...}{HorizontalSpace }{RightBrace }}
(40)
+// CHECK-CC1: NotImplemented:{ResultType id}{TypedText @(}{Placeholder
expression}{RightParen )} (40)
+// CHECK-CC1: NotImplemented:{ResultType NSArray *}{TypedText @[}{Placeholder
objects, ...}{RightBracket ]} (40)
+// CHECK-CC1: NotImplemented:{ResultType NSDictionary *}{TypedText
@{}{Placeholder key}{HorizontalSpace }{Colon :}{HorizontalSpace }{Placeholder
object, ...}{RightBrace }} (40)
// CHECK-CC1: NotImplemented:{ResultType SEL}{TypedText _cmd} (80)
// CHECK-CC1: TypedefDecl:{TypedText BOOL} (50)
// CHECK-CC1: macro definition:{TypedText bool} (51)
@@ -42,8 +42,8 @@
// RUN: c-index-test -code-completion-at=%s:15:5 %s | FileCheck
-check-prefix=CHECK-CC4 %s
// RUN: c-index-test -code-completion-at=%s:16:5 %s | FileCheck
-check-prefix=CHECK-CC4 %s
// RUN: c-index-test -code-completion-at=%s:16:14 %s | FileCheck
-check-prefix=CHECK-CC4 %s
-// CHECK-CC4: NotImplemented:{ResultType NSArray *}{TypedText
@[}{HorizontalSpace }{Placeholder objects, ...}{HorizontalSpace
}{RightBracket ]} (40)
-// CHECK-CC4: NotImplemented:{ResultType NSDictionary *}{TypedText
@{}{HorizontalSpace }{Placeholder key}{HorizontalSpace }{Colon
:}{HorizontalSpace }{Placeholder object, ...}{HorizontalSpace }{RightBrace }}
(40)
+// CHECK-CC4: NotImplemented:{ResultType NSArray *}{TypedText @[}{Placeholder
objects, ...}{RightBracket ]} (40)
+// CHECK-CC4: NotImplemented:{ResultType NSDictionary *}{TypedText
@{}{Placeholder key}{HorizontalSpace }{Colon :}{HorizontalSpace }{Placeholder
object, ...}{RightBrace }} (40)
// CHECK-CC4: NotImplemented:{ResultType SEL}{TypedText _cmd} (80)
// CHECK-CC4: macro definition:{TypedText bool} (51)
// CHECK-CC4: macro definition:{TypedText NO} (65)
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
