This is an archive of the discontinued LLVM Phabricator instance.

Differential D44294

[clangd] Fix diagnostic errors in the test code, NFC.
ClosedPublic

Authored by hokein on Mar 9 2018, 2:12 AM.

Details

Reviewers
ilya-biryukov
Commits
rG144b0c8036e1: [clangd] Fix diagnostic errors in the test code, NFC.
rL327293: [clangd] Fix diagnostic errors in the test code, NFC.
rCTE327293: [clangd] Fix diagnostic errors in the test code, NFC.

Diff Detail

Event Timeline

hokein created this revision.Mar 9 2018, 2:12 AM
Harbormaster completed remote builds in B15860: Diff 137709.Mar 9 2018, 2:12 AM
Herald added subscribers: ioeric, jkorous-apple, klimek. · View Herald TranscriptMar 9 2018, 2:12 AM
ilya-biryukov added inline comments.Mar 9 2018, 2:19 AM
unittests/clangd/XRefsTests.cpp
587

I would go with #pragma once in the test code, it adds less noise. WDYT?

hokein updated this revision to Diff 137712.Mar 9 2018, 2:54 AM
hokein marked an inline comment as done.

Use #program once

unittests/clangd/XRefsTests.cpp
587

I thought #pragma once is non-standard, but the diagnostic message also suggest this fix. Changed to it.

ilya-biryukov accepted this revision.Mar 12 2018, 7:47 AM
ilya-biryukov added inline comments.
unittests/clangd/XRefsTests.cpp
587

Thanks! It's non-standard, but supported on every modern compiler, so we should be fine :-)

This revision is now accepted and ready to land.Mar 12 2018, 7:47 AM
Closed by commit rCTE327293: [clangd] Fix diagnostic errors in the test code, NFC. (authored by hokein). · Explain WhyMar 12 2018, 9:51 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
unittests/
clangd/
6 lines

Diff 137709

unittests/clangd/XRefsTests.cpp

Show First 20 Lines • Show All 578 Lines • ▼ Show 20 LinesTEST(GoToInclude, All) {
int foo; int foo;
#in$5^clude "$6^foo.h"$7^ #in$5^clude "$6^foo.h"$7^
)cpp"; )cpp";
Annotations SourceAnnotations(SourceContents); Annotations SourceAnnotations(SourceContents);
FS.Files[FooCpp] = SourceAnnotations.code(); FS.Files[FooCpp] = SourceAnnotations.code();
auto FooH = testPath("foo.h"); auto FooH = testPath("foo.h");
auto FooHUri = URIForFile{FooH}; auto FooHUri = URIForFile{FooH};
const char *HeaderContents = R"cpp([[]]int a;)cpp"; const char *HeaderContents = R"cpp([[]]#ifndef TEST_H_
ilya-biryukovUnsubmitted
Done
ReplyInline Actions

I would go with #pragma once in the test code, it adds less noise. WDYT?

ilya-biryukov: I would go with `#pragma once` in the test code, it adds less noise. WDYT?
hokeinAuthorUnsubmitted
Not Done
ReplyInline Actions

I thought #pragma once is non-standard, but the diagnostic message also suggest this fix. Changed to it.

hokein: I thought `#pragma once` is non-standard, but the diagnostic message also suggest this fix.
ilya-biryukovUnsubmitted
Not Done
ReplyInline Actions

Thanks! It's non-standard, but supported on every modern compiler, so we should be fine :-)

ilya-biryukov: Thanks! It's non-standard, but supported on every modern compiler, so we should be fine :-)
#define TEST_H_
int a;
#endif
)cpp";
Annotations HeaderAnnotations(HeaderContents); Annotations HeaderAnnotations(HeaderContents);
FS.Files[FooH] = HeaderAnnotations.code(); FS.Files[FooH] = HeaderAnnotations.code();
Server.addDocument(FooH, HeaderAnnotations.code()); Server.addDocument(FooH, HeaderAnnotations.code());
Server.addDocument(FooCpp, SourceAnnotations.code()); Server.addDocument(FooCpp, SourceAnnotations.code());
// Test include in preamble. // Test include in preamble.
auto Locations = auto Locations =
Show All 39 Lines