diff --git a/clang-tools-extra/docs/_templates/clangd_redirect.html b/clang-tools-extra/docs/_templates/clangd_redirect.html
new file mode 100644
--- /dev/null
+++ b/clang-tools-extra/docs/_templates/clangd_redirect.html
@@ -0,0 +1,14 @@
+
+{% set target = meta.redirect_target %}
+
+
+ The clangd documentation has moved to clangd.llvm.org
+
+
+
+
+ The clangd documentation has moved to clangd.llvm.org
+ The new site
+
+
+
diff --git a/clang-tools-extra/docs/_templates/layout.html b/clang-tools-extra/docs/_templates/layout.html
--- a/clang-tools-extra/docs/_templates/layout.html
+++ b/clang-tools-extra/docs/_templates/layout.html
@@ -1,3 +1,3 @@
-{% extends "!layout.html" %}
+{% extends (meta|default({})).template|default("!layout.html") %}
{% set css_files = css_files + ['_static/clang-tools-extra-styles.css'] %}
diff --git a/clang-tools-extra/docs/clangd.rst b/clang-tools-extra/docs/clangd.rst
--- a/clang-tools-extra/docs/clangd.rst
+++ b/clang-tools-extra/docs/clangd.rst
@@ -1,6 +1,3 @@
:orphan:
-
-.. meta::
- :http-equiv=refresh: 0;URL='clangd/'
-
-All :program:`clangd` documentation was moved to the :doc:`clangd/index` pages.
+:template: clangd_redirect.html
+:redirect_target: https://clangd.llvm.org/
diff --git a/clang-tools-extra/docs/clangd/ApplyClangTidyFixInVSCode.gif b/clang-tools-extra/docs/clangd/ApplyClangTidyFixInVSCode.gif
deleted file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@`__.
-
---query-driver
-==============
-
-Clangd makes use of clang behind the scenes, so it might fail to detect your
-standard library or built-in headers if your project is making use of a custom
-toolchain. That is quite common in hardware-related projects, especially for the
-ones making use of gcc (e.g. ARM's `arm-none-eabi-gcc`).
-
-You can specify your driver as a list of globs or full paths, then clangd will
-execute drivers and fetch necessary include paths to compile your code.
-
-For example if you have your compilers at:
- - `/path/to/my-custom/toolchain1/arm-none-eabi-gcc`,
- - `/path/to/my-custom/toolchain2/arm-none-eabi-g++`,
- - `/path/to/my-custom2/toolchain/arm-none-eabi-g++`,
-
-you can provide clangd with
-`--query-driver=/path/to/my-custom/**/arm-none-eabi*` to enable execution of
-any binary that has a name starting with `arm-none-eabi` and under
-`/path/to/my-custom/`. This won't allow execution of the last compiler.
-
-Full list of flags
-==================
-
-You can find out about the rest of the flags using `clangd --help`.
+:orphan:
+:template: clangd_redirect.html
+:redirect_target: https://clangd.llvm.org/installation.html
diff --git a/clang-tools-extra/docs/clangd/DeveloperDocumentation.rst b/clang-tools-extra/docs/clangd/DeveloperDocumentation.rst
--- a/clang-tools-extra/docs/clangd/DeveloperDocumentation.rst
+++ b/clang-tools-extra/docs/clangd/DeveloperDocumentation.rst
@@ -1,29 +1,3 @@
-==================================
-Developer documentation for clangd
-==================================
-
-.. toctree::
- :maxdepth: 1
-
- Extensions
-
-Compiling clangd
-================
-
-To build clangd from source, please follow the instructions for `building Clang
-`_ and include LLVM, Clang, and the
-"extra Clang tools" in your build.
-
-Contributing to clangd
-======================
-
-A good place for interested contributors is the `Clangd developer mailing list
-`_. For discussions with
-the broader community on topics not only related to Clangd, use `Clang
-developer mailing list `_. If
-you're also interested in contributing patches to clangd, take a look at the
-`LLVM Developer Policy `_ and `Code
-Reviews `_ page. Contributions of new
-features to the `Language Server Protocol
-`_ itself would also be
-very useful, so that clangd can eventually implement them in a conforming way.
+:orphan:
+:template: clangd_redirect.html
+:redirect_target: https://clangd.llvm.org/design.html
diff --git a/clang-tools-extra/docs/clangd/DiagnosticsInEmacsEglot.png b/clang-tools-extra/docs/clangd/DiagnosticsInEmacsEglot.png
deleted file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@`__.
-
-We cautious about adding extensions. The most important considerations are:
-
-- **Editor support**: How many users will the feature be available to?
-- **Standardization**: Is the feature stable? Is it likely to be adopted by more
- editors over time?
-- **Utility**: Does the feature provide a lot of value?
-- **Complexity**: Is this hard to implement in clangd, or constrain future work?
- Is the protocol complicated?
-
-These extensions may evolve or disappear over time. If you use them, try to
-recover gracefully if the structures aren't what's expected.
-
-Switch between the implementation file and the header
-=====================================================
-
-*This extension is supported in clangd 6 and newer.*
-
-Switching between the implementation file and the header is an important
-feature for C++. A language server that understands C++ can do a better job
-than the editor.
-
-**New client->server request**: ``textDocument/switchSourceHeader``.
-
-Lets editors switch between the main source file (``*.cpp``) and header (``*.h``).
-
-Parameter: ``TextDocumentIdentifier``: an open file.
-
-Result: ``string``: the URI of the corresponding header (if a source file was
-provided) or source file (if a header was provided).
-
-If the corresponding file can't be determined, ``""`` is returned.
-
-File status
-===========
-
-*This extension is supported in clangd 8 and newer.*
-
-It is important to provide feedback to the user when the UI is not responsive.
-
-This extension provides information about activity on clangd's per-file worker
-thread. This information can be displayed to users to let them know that the
-language server is busy with something. For example, in clangd, building the
-AST blocks many other operations.
-
-**New server->client notification**: ``textDocument/clangd.fileStatus``
-
-Sent when the current activity for a file changes. Replaces previous activity
-for that file.
-
-Parameter: ``FileStatus`` object with properties:
-
-- ``uri : string``: the document whose status is being updated.
-- ``state : string``: human-readable information about current activity.
-
-**New initialization option**: ``initializationOptions.clangdFileStatus : bool``
-
-Enables receiving ``textDocument/clangd.fileStatus`` notifications.
-
-Compilation commands
-====================
-
-*This extension is supported in clangd 8 and newer.*
-
-clangd relies on knowing accurate compilation options to correctly interpret a
-file. Typically they are found in a ``compile_commands.json`` file in a
-directory that contains the file, or an ancestor directory. The following
-extensions allow editors to supply the commands over LSP instead.
-
-**New initialization option**: ``initializationOptions.compilationDatabasePath : string``
-
-Specifies the directory containing the compilation database (e.g.,
-``compile_commands.json``). This path will be used for all files, instead of
-searching their ancestor directories.
-
-**New initialization option**: ``initializationOptions.fallbackFlags : string[]``
-
-Controls the flags used when no specific compile command is found. The compile
-command will be approximately ``clang $FILE $fallbackFlags`` in this case.
-
-**New configuration setting**: ``settings.compilationDatabaseChanges : {string: CompileCommand}``
-
-Provides compile commands for files. This can also be provided on startup as
-``initializationOptions.compilationDatabaseChanges``.
-
-Keys are file paths (Not URIs!)
-
-Values are ``{workingDirectory: string, compilationCommand: string[]}``.
-
-Force diagnostics generation
-============================
-
-*This extension is supported in clangd 7 and newer.*
-
-Clangd does not regenerate diagnostics for every version of a file (e.g., after
-every keystroke), as that would be too slow. Its heuristics ensure:
-
-- diagnostics do not get too stale,
-- if you stop editing, diagnostics will catch up.
-
-This extension allows editors to force diagnostics to be generated or not
-generated at a particular revision.
-
-**New property of** ``textDocument/didChange`` **request**: ``wantDiagnostics : bool``
-
-- if true, diagnostics will be produced for exactly this version.
-- if false, diagnostics will not be produced for this version, even if there
- are no further edits.
-- if unset, diagnostics will be produced for this version or some subsequent
- one in a bounded amount of time.
-
-Diagnostic categories
-=====================
-
-*This extension is supported in clangd 8 and newer.*
-
-Clang compiler groups diagnostics into categories (e.g., "Inline Assembly
-Issue"). Clangd can emit these categories for interested editors.
-
-**New property of** ``Diagnostic`` **object**: ``category : string``:
-
-A human-readable name for a group of related diagnostics. Diagnostics with the
-same code will always have the same category.
-
-**New client capability**: ``textDocument.publishDiagnostics.categorySupport``:
-
-Requests that clangd send ``Diagnostic.category``.
-
-Inline fixes for diagnostics
-============================
-
-*This extension is supported in clangd 8 and newer.*
-
-LSP specifies that code actions for diagnostics (fixes) are retrieved
-asynchronously using ``textDocument/codeAction``. clangd always computes fixes
-eagerly. Providing them alongside diagnostics can improve the UX in editors.
-
-**New property of** ``Diagnostic`` **object**: ``codeActions : CodeAction[]``:
-
-All the code actions that address this diagnostic.
-
-**New client capability**: ``textDocument.publishDiagnostics.codeActionsInline : bool``
-
-Requests clangd to send ``Diagnostic.codeActions``.
-
-Symbol info request
-===================
-
-*This extension is supported in clangd 8 and newer.*
-
-**New client->server request**: ``textDocument/symbolInfo``:
-
-This request attempts to resolve the symbol under the cursor, without
-retrieving further information (like definition location, which may require
-consulting an index). This request was added to support integration with
-indexes outside clangd.
-
-Parameter: ``TextDocumentPositionParams``
-
-Response: ``SymbolDetails``, an object with properties:
-
-- ``name : string`` the unqualified name of the symbol
-- ``containerName : string`` the enclosing namespace, class etc (without
- trailing ``::``)
-- ``usr : string``: the clang-specific "unified symbol resolution" identifier
-- ``id : string?``: the clangd-specific opaque symbol ID
+:orphan:
+:template: clangd_redirect.html
+:redirect_target: https://clangd.llvm.org/extensions.html
diff --git a/clang-tools-extra/docs/clangd/Features.rst b/clang-tools-extra/docs/clangd/Features.rst
--- a/clang-tools-extra/docs/clangd/Features.rst
+++ b/clang-tools-extra/docs/clangd/Features.rst
@@ -1,271 +1,4 @@
-========
-Features
-========
+:orphan:
+:template: clangd_redirect.html
+:redirect_target: https://clangd.llvm.org/features.html
-.. contents::
-
-.. role:: raw-html(raw)
- :format: html
-
-Here is what clangd can do for you. Screenshots below show `VSCode
-`__; the available features and UI depend on
-the editor.
-
-Errors and warnings
-===================
-
-clangd runs the clang compiler on your code as you type, and shows errors and
-warnings in-place. Some errors are suppressed: diagnostics that require
-expanding templates in headers are disabled for performance reasons.
-
-:raw-html:`Screenshot
`
-
-.. image:: ErrorsInVSCode.png
- :align: center
- :alt: Demonstration of errors
-
-:raw-html:`Animated demo
`
-
-.. image:: ApplyFixInVSCode.gif
- :align: center
- :alt: Applying a fix suggested by the compiler
-
-:raw-html:`Animated demo
`
-
-.. image:: ApplyClangTidyFixInVSCode.gif
- :align: center
- :alt: Applying a fix suggested by the compiler
-
-:raw-html:`Screenshot
`
-
-.. image:: CodeCompletionInVSCode.png
- :align: center
- :alt: Code completion demonstration
-
-:raw-html:`Animated demo
`
-
-.. image:: CodeCompletionInsertsNamespaceQualifiersInVSCode.gif
- :align: center
- :alt: Code completion inserts namespace qualifiers
-
-:raw-html:`Animated demo
`
-
-.. image:: SignatureHelpInVSCode.gif
- :align: center
- :alt: Demonstration of the signature help feature
-
-:raw-html:`Animated demo
`
-
-.. image:: GoToDefinitionInVSCode.gif
- :align: center
- :alt: Demonstration of the "Go to definition" feature
-
-:raw-html:`Animated demo
`
-
-.. image:: FindAllReferencesInVSCode.gif
- :align: center
- :alt: Demonstration of the "Find all references" feature
-
-:raw-html:`Screenshot
`
-
-.. image:: OutlineInVSCode.png
- :align: center
- :alt: Outline of a file
-
-:raw-html:`Animated demo
`
-
-.. image:: NavigationWithBreadcrumbsInVSCode.gif
- :align: center
- :alt: Navigation with breadcrumbs
-
-:raw-html:`Animated demo
`
-
-.. image:: FormatSelectionInVSCode.gif
- :align: center
- :alt: Formatting selected code
-
-:raw-html:`Windows
`
-
-Download and run the LLVM installer from `releases.llvm.org
-`__.
-
-:raw-html:`Debian/Ubuntu
`
-
-The ``clang-tools`` package usually contains an old version of clangd.
-
-Try to install the latest release (8.0):
-
-.. code-block:: console
-
- $ sudo apt-get install clang-tools-8
-
-If that is not found, at least ``clang-tools-7`` should be available.
-
-The ``clangd`` executable will be installed as ``/usr/bin/clangd-8``. Make it
-the default ``clangd``:
-
-.. code-block:: console
-
- $ sudo update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-8 100
-
-:raw-html:`Other systems
`
-
-Most distributions include clangd in a ``clang-tools`` package, or in the full
-``llvm`` distribution.
-
-For some platforms, binaries are also available at `releases.llvm.org
-`__.
-
-:raw-html:`YouCompleteMe for Vim
`
-
-`YouCompleteMe `__ supports clangd.
-However, clangd support is not turned on by default, so you must install
-YouCompleteMe with ``install.py --clangd-completer``.
-
-We recommend changing a couple of YCM's default settings. In ``.vimrc`` add:
-
-::
-
- " Let clangd fully control code completion
- let g:ycm_clangd_uses_ycmd_caching = 0
- " Use installed clangd, not YCM-bundled clangd which doesn't get updates.
- let g:ycm_clangd_binary_path = exepath("clangd")
-
-You should see errors highlighted and code completions as you type.
-
-.. image:: CodeCompletionInYCM.png
- :align: center
- :alt: Code completion in YouCompleteMe
-
-YouCompleteMe supports many of clangd's features:
-
-- code completion,
-- diagnostics and fixes (``:YcmCompleter FixIt``),
-- find declarations, references, and definitions (``:YcmCompleter GoTo`` etc),
-- rename symbol (``:YcmCompleter RefactorRename``).
-
-**Under the hood**
-
-- **Debug logs**: run ``:YcmDebugInfo`` to see clangd status, and ``:YcmToggleLogs``
- to view clangd's debug logs.
-- **Command-line flags**: Set ``g:ycm_clangd_args`` in ``.vimrc``, e.g.:
-
- ::
-
- let g:ycm_clangd_args = ['-log=verbose', '-pretty']
-
-- **Alternate clangd binary**: set ``g:ycm_clangd_binary_path`` in ``.vimrc``.
-
-:raw-html:`LanguageClient for Vim and Neovim
`
-
-`LanguageClient-neovim `__
-has `instructions for using clangd
-`__, and **may**
-be easier to install than YouCompleteMe.
-
-:raw-html:`Eglot for Emacs
`
-
-`eglot `__ can be configured to work with
-clangd.
-
-Install eglot with ``M-x package-install RET eglot RET``.
-
-Add the following to ``~/.emacs`` to enable clangd:
-
-::
-
- (require 'eglot)
- (add-to-list 'eglot-server-programs '((c++-mode c-mode) "clangd"))
- (add-hook 'c-mode-hook 'eglot-ensure)
- (add-hook 'c++-mode-hook 'eglot-ensure)
-
-After restarting you should see diagnostics for errors in your code, and ``M-x
-completion-at-point`` should work.
-
-.. image:: DiagnosticsInEmacsEglot.png
- :align: center
- :alt: Diagnostics in Emacs
-
-eglot supports many of clangd's features, with caveats:
-
-- code completion, though the interaction is quite poor (even with
- ``company-mode``, see below),
-- diagnostics and fixes,
-- find definitions and references (``M-x xref-find-definitions`` etc),
-- hover and highlights,
-- code actions (``M-x eglot-code-actions``).
-
-**company-mode**
-
-eglot does have basic integration with company-mode, which provides a more
-fluent completion UI.
-
-You can install it with ``M-x package-install RET company RET``, and enable it
-with ``M-x company-mode``.
-
-**company-clang is enabled by default**, and will interfere with clangd.
-Disable it in ``M-x customize-variable RET company-backends RET``.
-
-Completion still has some major limitations:
-
-- completions are alphabetically sorted, not ranked.
-- only pure-prefix completions are shown - no fuzzy matches.
-- completion triggering seems to be a bit hit-and-miss.
-
-.. image:: CodeCompletionInEmacsCompanyMode.png
- :align: center
- :alt: Completion in company-mode
-
-**Under the hood**
-
-- **Debug logs**: available in the ``EGLOT stderr`` buffer.
-- **Command-line flags and alternate binary**: instead of adding ``"clangd"``
- to ``eglot-server-programs``, add ``("/path/to/clangd" "-log=verbose")`` etc.
-
-:raw-html:`Visual Studio Code
`
-
-The official extension is `vscode-clangd
-`__
-and can be installed from within VSCode.
-
-Choose **View** --> **Extensions**, then search for "clangd". (Make sure the
-Microsoft C/C++ extension is **not** installed).
-
-After restarting, you should see red underlines underneath errors, and you
-should get rich code completions including e.g. function parameters.
-
-.. image:: CodeCompletionInVSCode.png
- :align: center
- :alt: Code completion in VSCode
-
-vscode-clangd has excellent support for all clangd features, including:
-
-- code completion
-- diagnostics and fixes
-- find declarations, references, and definitions
-- find symbol in file (``Ctrl-P @foo``) or workspace (``Ctrl-P #foo``)
-- hover and highlights
-- code actions
-
-**Under the hood**
-
-- **Debug logs**: when clangd is running, you should see "Clang Language
- Server" in the dropdown of the Output panel (**View** -> **Output**).
-
-- **Command-line flags**: these can be passed in the ``clangd.arguments`` array
- in your ``settings.json``. (**File** -> **Preferences** -> **Settings**).
-
-- **Alternate clangd binary**: set the ``clangd.path`` string in
- ``settings.json``.
-
-:raw-html:`Sublime Text
`
-
-`tomv564/LSP `__ works with clangd out of the box.
-
-Select **Tools** --> **Install Package Control** (if you haven't installed it
-yet).
-
-Press ``Ctrl-Shift-P`` and select **Package Control: Install Package**. Select
-**LSP**.
-
-Press ``Ctrl-Shift-P`` and select **LSP: Enable Language Server Globally**.
-Select **clangd**.
-
-Open a C++ file, and you should see diagnostics and completion:
-
-.. image:: CodeCompletionInSublimeText.png
- :align: center
- :alt: Code completion in Sublime Text
-
-
-The LSP package has excellent support for all most clangd features, including:
-
-- code completion (a bit noisy due to how snippets are presented)
-- diagnostics and fixes
-- find definition and references
-- hover and highlights
-- code actions
-
-**Under the hood**
-
-Settings can be tweaked under **Preferences** --> **Package Settings** -->
-**LSP**.
-
-- **Debug logs**: add ``"log_stderr": true``
-- **Command-line flags and alternate clangd binary**: inside the ``"clients":
- {"clangd": { ... } }`` section, add ``"command": ["/path/to/clangd",
- "-log=verbose"]`` etc.
-
-:raw-html:`Other editors
`
-
-There is a directory of LSP clients at `langserver.org
-`__.
-
-A generic client should be configured to run the command ``clangd``, and
-communicate via the language server protocol on standard input/output.
-
-If you don't have strong feelings about an editor, we suggest you try out
-`VSCode `__, it has excellent language server
-support and most faithfully demonstrates what clangd can do.
-
-:raw-html:`CMake-based projects
`
-
-If your project builds with CMake, it can generate ``compile_commands.json``.
-You should enable it with:
-
-::
-
- $ cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1
-
-``compile_commands.json`` will be written to your build directory. You should
-symlink it (or copy it) to the root of your source tree, if they are different.
-
-::
-
- $ ln -s ~/myproject-build/compile_commands.json ~/myproject/
-
-:raw-html:`Other build systems, using Bear
`
-
-`Bear `__ is a tool that generates a
-``compile_commands.json`` file by recording a complete build.
-
-For a ``make``-based build, you can run ``make clean; bear make`` to generate the
-file (and run a clean build!)
-
-:raw-html:`