[Clangd] Support Authority-less URIs

[malaperle-ericsson]

Summary

Clangd strips URIs by removing the file:// part but some clients can send file:
which is also valid according to RFC 3896. For example, if a client sends
file:///home/user, it gets converted to /home/user but if a client sends
file:/home/user, it is left untouched and problems arise.

[bkramer]

This is fine. Test case would be nice though.

[malaperle-ericsson]

Add test

[malaperle-ericsson]

Benjamin, I added a test, do you still think it's OK? Thanks!

[bkramer]

Still looking good. Will commit this soon.

[malaperle-ericsson]

Thanks a lot!

clang-tools-extra/trunk/clangd/Protocol.cpp

 #include "llvm/Support/Path.h"
 using namespace clang::clangd;
 
 
 URI URI::fromUri(llvm::StringRef uri) {
   URI Result;
   Result.uri = uri;
   uri.consume_front("file://");
+  // Also trim authority-less URIs
+  uri.consume_front("file:");
   // For Windows paths e.g. /X:
   if (uri.size() > 2 && uri[0] == '/' && uri[2] == ':')
     uri.consume_front("/");
   // Make sure that file paths are in native separators
   Result.file = llvm::sys::path::convert_to_slash(uri);
   return Result;
 }
 

clang-tools-extra/trunk/test/clangd/completion.test

 # The order of results returned by ASTUnit CodeComplete seems to be
 # nondeterministic, so we check regardless of order.
 #
 # CHECK: {"jsonrpc":"2.0","id":1,"result":[
 # CHECK-DAG: {"label":"a","kind":5}
 # CHECK-DAG: {"label":"bb","kind":5}
 # CHECK-DAG: {"label":"ccc","kind":5}
 # CHECK: ]}
+Content-Length: 146
+
+{"jsonrpc":"2.0","id":1,"method":"textDocument/completion","params":{"textDocument":{"uri":"file:/main.cpp"},"position":{"line":3,"character":5}}}
+# Test authority-less URI
+#
+# CHECK: {"jsonrpc":"2.0","id":1,"result":[
+# CHECK-DAG: {"label":"a","kind":5}
+# CHECK-DAG: {"label":"bb","kind":5}
+# CHECK-DAG: {"label":"ccc","kind":5}
+# CHECK: ]}
 Content-Length: 44
 
 {"jsonrpc":"2.0","id":3,"method":"shutdown"}