diff --git a/clang-tools-extra/clangd/ParsedAST.h b/clang-tools-extra/clangd/ParsedAST.h
--- a/clang-tools-extra/clangd/ParsedAST.h
+++ b/clang-tools-extra/clangd/ParsedAST.h
@@ -21,8 +21,8 @@
 #define LLVM_CLANG_TOOLS_EXTRA_CLANGD_PARSEDAST_H
 
 #include "CollectMacros.h"
-#include "Compiler.h"
 #include "Diagnostics.h"
+#include "Compiler.h"
 #include "Headers.h"
 #include "Preamble.h"
 #include "index/CanonicalIncludes.h"
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
@@ -43,8 +43,7 @@
   llvm::support::endian::write32le(Size, C.Data.size());
   OS.write(Size, sizeof(Size));
   OS << C.Data;
-  if (C.Data.size() % 2)
-    OS.write(0);
+  if (C.Data.size() % 2) OS.write(0);
   return OS;
 }
 
@@ -82,5 +81,5 @@
 }
 
 } // namespace riff
-} // namespace clangd
+} 
 } // namespace clang
diff --git a/clang-tools-extra/clangd/test/code-action-request.test b/clang-tools-extra/clangd/test/code-action-request.test
--- a/clang-tools-extra/clangd/test/code-action-request.test
+++ b/clang-tools-extra/clangd/test/code-action-request.test
@@ -18,7 +18,7 @@
             },
             "end": {
                 "line": 0,
-                "character": 4
+                "character": 6
             }
         },
         "context": {