diff --git a/clang-tools-extra/clangd/RIFF.cpp b/clang-tools-extra/clangd/RIFF.cpp
--- a/clang-tools-extra/clangd/RIFF.cpp
+++ b/clang-tools-extra/clangd/RIFF.cpp
@@ -14,13 +14,13 @@
 namespace riff {
 
 static llvm::Error makeError(const char *Msg) {
-  return llvm::createStringError(llvm::inconvertibleErrorCode(), Msg);
+    return llvm::createStringError(llvm::inconvertibleErrorCode(), Msg);
 }
 
 llvm::Expected<Chunk> readChunk(llvm::StringRef &Stream) {
-  if (Stream.size() < 8)
-    return makeError("incomplete chunk header");
   Chunk C;
+    if (Stream.size() < 8)
+    return makeError("incomplete chunk header");
   std::copy(Stream.begin(), Stream.begin() + 4, C.ID.begin());
   Stream = Stream.drop_front(4);
   uint32_t Len = llvm::support::endian::read32le(Stream.take_front(4).begin());
@@ -82,5 +82,5 @@
 }
 
 } // namespace riff
-} // namespace clangd
+}
 } // namespace clang
diff --git a/clang-tools-extra/clangd/test/trace.test b/clang-tools-extra/clangd/test/trace.test
--- a/clang-tools-extra/clangd/test/trace.test
+++ b/clang-tools-extra/clangd/test/trace.test
@@ -10,7 +10,7 @@
 # CHECK:       "ph": "X",
 # CHECK:       "name": "BuildPreamble",
 # CHECK:       "args": {
-# CHECK:         "File": "{{.*(/|\\)}}foo.c"
+# CHECK:         "File": "{{.*(/|\\)}}bar.c"
 # CHECK:       },
 # CHECK:     }
 # CHECK:     {