diff --git a/lib/Parse/Lexer.cpp b/lib/Parse/Lexer.cpp
index 70c8bd8f343be..c9fd336c61dc5 100644
--- a/lib/Parse/Lexer.cpp
+++ b/lib/Parse/Lexer.cpp
@@ -1832,6 +1832,12 @@ void Lexer::diagnoseSingleQuoteStringLiteral(const char *TokStart,
       OutputPtr = Ptr;
       // Escape double quotes.
       replacement.append("\\\"");
+    } else if (Ptr[-1] == 0) {
+      // The string literal might contain a null byte if the code completion
+      // position is inside the string literal. Don't include the null byte in
+      // the replacement string.
+      replacement.append(OutputPtr, Ptr - 1);
+      OutputPtr = Ptr;
     }
   }
   assert(Ptr == TokEnd && Ptr[-1] == '\'');
diff --git a/test/SourceKit/CodeComplete/complete_in_single_quoted_string_literal.swift b/test/SourceKit/CodeComplete/complete_in_single_quoted_string_literal.swift
new file mode 100644
index 0000000000000..a5e5437905c37
--- /dev/null
+++ b/test/SourceKit/CodeComplete/complete_in_single_quoted_string_literal.swift
@@ -0,0 +1,4 @@
+fileprivate enum BundleComponent {
+  // RUN: %sourcekitd-test -req=complete -pos=%(line + 1):25 %s -- %s
+  case swiftVersions = 's'
+}