From: Alexander Kornienko Date: Wed, 11 Sep 2013 18:10:30 +0000 (+0000) Subject: Test for correct usage of columnWidth in clang fixit hints. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8524ed123989512b98ef57fe1c10fe727ea40ac2;p=clang Test for correct usage of columnWidth in clang fixit hints. Summary: This test only works on systems capable of outputting UTF-8 encoded text on the standard output (tested on linux and OS X, should XFAIL on windows, if I haven't messed up the XFAIL line). Reviewers: jordan_rose Reviewed By: jordan_rose CC: cfe-commits Differential Revision: http://llvm-reviews.chandlerc.com/D1607 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@190537 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/FixIt/fixit-unicode-with-utf8-output.c b/test/FixIt/fixit-unicode-with-utf8-output.c new file mode 100644 index 0000000000..70cd7ad01f --- /dev/null +++ b/test/FixIt/fixit-unicode-with-utf8-output.c @@ -0,0 +1,25 @@ +// This test is an additional set of checks for the fixit-unicode.c test for +// systems capable of outputting Unicode characters to the standard output in +// the UTF-8 encoding. +// XFAIL: mingw32,win32,win64 +// RUN: not %clang_cc1 -fsyntax-only %S/fixit-unicode.c 2>&1 | FileCheck -strict-whitespace %s + +// CHECK: warning: format specifies type 'int' but the argument has type 'long' +// CHECK: {{^ printf\("∆: %d", 1L\);}} +// CHECK: {{^ ~~ \^~}} + +// CHECK: error: use of undeclared identifier 'กsss'; did you mean 'กssss'? +// CHECK: {{^ \^}} +// CHECK: {{^ กssss}} + +// CHECK: error: use of undeclared identifier 'ssกs'; did you mean 'ssกss'? +// CHECK: {{^ \^}} +// CHECK: {{^ ssกss}} + +// CHECK: error: use of undeclared identifier 'ss一二三'; did you mean 's一二三'? +// CHECK: {{^ \^~~~~~~~}} +// CHECK: {{^ s一二三}} + +// CHECK: error: use of undeclared identifier 'sssssssss'; did you mean 'sssssssssก'? +// CHECK: {{^ \^}} +// CHECK: {{^ sssssssssก}} diff --git a/test/FixIt/fixit-unicode.c b/test/FixIt/fixit-unicode.c index 12f45ea180..360ac69574 100644 --- a/test/FixIt/fixit-unicode.c +++ b/test/FixIt/fixit-unicode.c @@ -1,3 +1,7 @@ +// This file contains code and checks, that should work on any platform. +// There's a set of additional checks for systems with proper support of UTF-8 +// on the standard output in fixit-unicode-with-utf8-output.c. + // RUN: not %clang_cc1 -fsyntax-only %s 2>&1 | FileCheck -strict-whitespace %s // RUN: not %clang_cc1 -fsyntax-only -fdiagnostics-parseable-fixits %s 2>&1 | FileCheck -check-prefix=CHECK-MACHINE %s @@ -16,8 +20,8 @@ void test1() { // CHECK: {{^ \^}} // CHECK: {{^ ;}} -// CHECK-MACHINE: fix-it:"{{.*}}fixit-unicode.c":{[[@LINE-8]]:15-[[@LINE-8]]:18}:"" -// CHECK-MACHINE: fix-it:"{{.*}}fixit-unicode.c":{[[@LINE-9]]:15-[[@LINE-9]]:15}:";" +// CHECK-MACHINE: fix-it:"{{.*}}":{[[@LINE-8]]:15-[[@LINE-8]]:18}:"" +// CHECK-MACHINE: fix-it:"{{.*}}":{[[@LINE-9]]:15-[[@LINE-9]]:15}:";" } @@ -32,7 +36,7 @@ void test2() { // because different systems will render the delta differently (either as a // character, or as .) The fixit should line up with the %d regardless. -// CHECK-MACHINE: fix-it:"{{.*}}fixit-unicode.c":{[[@LINE-9]]:16-[[@LINE-9]]:18}:"%ld" +// CHECK-MACHINE: fix-it:"{{.*}}":{[[@LINE-9]]:16-[[@LINE-9]]:18}:"%ld" } void test3() { @@ -48,6 +52,11 @@ void test3() { // CHECK: {{^ ss.+ss}} // CHECK-MACHINE: fix-it:"{{.*}}":{[[@LINE-3]]:11-[[@LINE-3]]:17}:"ss\340\270\201ss" + int s一二三 = 42; + int b一二三四五六七 = ss一二三; // expected-error{{use of undeclared identifier 'ss一二三'; did you mean 's一二三'?}} +// CHECK-MACHINE: fix-it:"{{.*}}":{[[@LINE-1]]:32-[[@LINE-1]]:43}:"s\344\270\200\344\272\214\344\270\211" + + int sssssssssก = 42; int c = sssssssss; // expected-error{{use of undeclared identifier 'sssssssss'; did you mean 'sssssssssก'?}} // CHECK: {{^ \^}}