[clangd] Cleanup: use index file instead of header in workspace symbols lit test.

Summary:
The full path of the input header depends on the execution environment
and may result in different behavior (e.g. when different URI schemes are used).

Reviewers: sammccall

Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, cfe-commits

Differential Revision: https://reviews.llvm.org/D54833

3 files changed, 22 insertions, 8 deletions

diff --git a/clang-tools-extra/test/clangd/Inputs/sstream.h b/clang-tools-extra/test/clangd/Inputs/sstream.h
deleted file mode 100644
index 980963ace62..00000000000
--- a/clang-tools-extra/test/clangd/Inputs/sstream.h
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace std {
-class basic_ostringstream {};
-}
diff --git a/clang-tools-extra/test/clangd/Inputs/symbols.test.yaml b/clang-tools-extra/test/clangd/Inputs/symbols.test.yaml
new file mode 100644
index 00000000000..40068e3640a
--- /dev/null
+++ b/clang-tools-extra/test/clangd/Inputs/symbols.test.yaml
@@ -0,0 +1,17 @@
+---
+!Symbol
+ID:              057557CEBF6E6B2D
+Name:            'vector'
+Scope:           'std::'
+SymInfo:         
+  Kind:            Class
+  Lang:            Cpp
+CanonicalDeclaration: 
+  FileURI:         'file:///vector.h'
+  Start:           
+    Line:            215
+    Column:          10
+  End:             
+    Line:            215
+    Column:          16
+...
diff --git a/clang-tools-extra/test/clangd/symbols.test b/clang-tools-extra/test/clangd/symbols.test
index 5b07f8f5c3d..a15d7028b9c 100644
--- a/clang-tools-extra/test/clangd/symbols.test
+++ b/clang-tools-extra/test/clangd/symbols.test
@@ -1,9 +1,9 @@
-# RUN: env CPATH=%S/Inputs clangd -lit-test < %s | FileCheck %s

+# RUN: clangd --index-file=%S/Inputs/symbols.test.yaml -lit-test < %s | FileCheck %s

 {"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootPath":"clangd","capabilities":{"workspace":{"symbol":{"symbolKind":{"valueSet": [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26]}}}},"trace":"off"}}

 ---

-{"jsonrpc":"2.0","method":"textDocument/didOpen","params":{"textDocument":{"uri":"test:///main.cpp","languageId":"cpp","version":1,"text":"#include <sstream.h>\nvoid foo(); int main() { foo(); }\n"}}}

+{"jsonrpc":"2.0","method":"textDocument/didOpen","params":{"textDocument":{"uri":"test:///main.cpp","languageId":"cpp","version":1,"text":"void foo(); int main() { foo(); }\n"}}}

 ---

-{"jsonrpc":"2.0","id":1,"method":"workspace/symbol","params":{"query":"std::basic_ostringstream"}}

+{"jsonrpc":"2.0","id":1,"method":"workspace/symbol","params":{"query":"vector"}}

 #      CHECK:  "id": 1,

 # CHECK-NEXT:  "jsonrpc": "2.0",

 # CHECK-NEXT:    "result": [

@@ -21,9 +21,9 @@
 # CHECK-NEXT:              "line": {{.*}}

 # CHECK-NEXT:            }

 # CHECK-NEXT:          },

-# CHECK-NEXT:          "uri": "file://{{.*}}/sstream.h"

+# CHECK-NEXT:          "uri": "file:///vector.h"

 # CHECK-NEXT:        },

-# CHECK-NEXT:        "name": "basic_ostringstream"

+# CHECK-NEXT:        "name": "vector"

 # CHECK-NEXT:      }

 # CHECK-NEXT:    ]

 # CHECK-NEXT:}