Index: clang-tools-extra/trunk/docs/clangd/Features.rst
===================================================================
--- clang-tools-extra/trunk/docs/clangd/Features.rst
+++ clang-tools-extra/trunk/docs/clangd/Features.rst
@@ -214,54 +214,58 @@
 part of the Language Server Protocol; those features might be eventually
 developed outside clangd or become clangd extensions to LSP.
 
-+-------------------------------------+------------+----------+
-| C/C++ Editor feature                |  LSP       |  Clangd  |
-+=====================================+============+==========+
-| Formatting                          | Yes        |   Yes    |
-+-------------------------------------+------------+----------+
-| Completion                          | Yes        |   Yes    |
-+-------------------------------------+------------+----------+
-| Diagnostics                         | Yes        |   Yes    |
-+-------------------------------------+------------+----------+
-| Fix-its                             | Yes        |   Yes    |
-+-------------------------------------+------------+----------+
-| Go to Definition                    | Yes        |   Yes    |
-+-------------------------------------+------------+----------+
-| Signature Help                      | Yes        |   Yes    |
-+-------------------------------------+------------+----------+
-| Document Highlights                 | Yes        |   Yes    |
-+-------------------------------------+------------+----------+
-| Rename                              | Yes        |   Yes    |
-+-------------------------------------+------------+----------+
-| Source hover                        | Yes        |   Yes    |
-+-------------------------------------+------------+----------+
-| Find References                     | Yes        |   Yes    |
-+-------------------------------------+------------+----------+
-| Document Symbols                    | Yes        |   Yes    |
-+-------------------------------------+------------+----------+
-| Workspace Symbols                   | Yes        |   Yes    |
-+-------------------------------------+------------+----------+
-| Code Lens                           | Yes        |   No     |
-+-------------------------------------+------------+----------+
-| Code folding                        | Yes        |   No     |
-+-------------------------------------+------------+----------+
-| Extract Local Variable              | Yes        |   No     |
-+-------------------------------------+------------+----------+
-| Extract Function/Method             | Yes        |   No     |
-+-------------------------------------+------------+----------+
-| Quick Assist                        | Yes        |   No     |
-+-------------------------------------+------------+----------+
-| Hide Method                         | Yes        |   No     |
-+-------------------------------------+------------+----------+
-| Implement Method                    | Yes        |   No     |
-+-------------------------------------+------------+----------+
-| Gen. Getters/Setters                | Yes        |   No     |
-+-------------------------------------+------------+----------+
-| Syntax and Semantic Coloring        | No         |   No     |
-+-------------------------------------+------------+----------+
-| Call hierarchy                      | No         |   No     |
-+-------------------------------------+------------+----------+
-| Type hierarchy                      | No         |   Yes    |
-+-------------------------------------+------------+----------+
-| Organize Includes                   | No         |   No     |
-+-------------------------------------+------------+----------+
++-------------------------------------+-------------+----------+
+| C/C++ Editor feature                |  LSP        |  Clangd  |
++=====================================+=============+==========+
+| Formatting                          | Yes         |   Yes    |
++-------------------------------------+-------------+----------+
+| Completion                          | Yes         |   Yes    |
++-------------------------------------+-------------+----------+
+| Diagnostics                         | Yes         |   Yes    |
++-------------------------------------+-------------+----------+
+| Fix-its                             | Yes         |   Yes    |
++-------------------------------------+-------------+----------+
+| Go to Definition                    | Yes         |   Yes    |
++-------------------------------------+-------------+----------+
+| Signature Help                      | Yes         |   Yes    |
++-------------------------------------+-------------+----------+
+| Document Highlights                 | Yes         |   Yes    |
++-------------------------------------+-------------+----------+
+| Rename                              | Yes         |   Yes    |
++-------------------------------------+-------------+----------+
+| Source hover                        | Yes         |   Yes    |
++-------------------------------------+-------------+----------+
+| Find References                     | Yes         |   Yes    |
++-------------------------------------+-------------+----------+
+| Document Symbols                    | Yes         |   Yes    |
++-------------------------------------+-------------+----------+
+| Workspace Symbols                   | Yes         |   Yes    |
++-------------------------------------+-------------+----------+
+| Code Lens                           | Yes         |   No     |
++-------------------------------------+-------------+----------+
+| Code folding                        | Yes         |   No     |
++-------------------------------------+-------------+----------+
+| Extract Local Variable              | Yes         |   No     |
++-------------------------------------+-------------+----------+
+| Extract Function/Method             | Yes         |   No     |
++-------------------------------------+-------------+----------+
+| Quick Assist                        | Yes         |   No     |
++-------------------------------------+-------------+----------+
+| Hide Method                         | Yes         |   No     |
++-------------------------------------+-------------+----------+
+| Implement Method                    | Yes         |   No     |
++-------------------------------------+-------------+----------+
+| Gen. Getters/Setters                | Yes         |   No     |
++-------------------------------------+-------------+----------+
+| Syntax and Semantic Coloring        |Proposed [1]_|   Yes    |
++-------------------------------------+-------------+----------+
+| Call hierarchy                      |Proposed [2]_|   No     |
++-------------------------------------+-------------+----------+
+| Type hierarchy                      |Proposed [3]_|   Yes    |
++-------------------------------------+-------------+----------+
+| Organize Includes                   | Yes         |   No     |
++-------------------------------------+-------------+----------+
+
+.. [1] https://github.com/microsoft/language-server-protocol/issues/18
+.. [2] https://github.com/microsoft/language-server-protocol/issues/468
+.. [3] https://github.com/microsoft/language-server-protocol/issues/136