Update docs for Vim and Emacs on using ccls

Author: ivankravets

integration/ide/emacs.rst

@@ -37,19 +37,6 @@ Integration process consists of these steps:
 3. Generate a project using PlatformIO Core Project Generator (:option:`pio project init --ide`)
 4. Open project in Emacs.
 
-------------
-
-PlatformIO-Mode
-^^^^^^^^^^^^^^^
-
-An Emacs minor mode has been written to facilitate building and uploading from within Emacs.
-It can be installed from the MELPA repository using ``M-x package-install``.
-See the MELPA `Getting Started <https://melpa.org/#/getting-started>`_ page for more information.
-
-Setup instructions and an example config can be found at the `Github page <https://github.com/ZachMassia/platformio-mode>`_.
-
-Code completion can optionally be provided by installing `irony-mode <https://github.com/Sarcasm/irony-mode>`_
-
 
 Project Generator
 ^^^^^^^^^^^^^^^^^
@@ -61,6 +48,20 @@ command and generate project via :option:`pio project init --ide` command:
 
     pio project init --ide emacs --board <ID>
 
+.. warning::
+    The libraries which are added, installed or used in the project
+    after generating process won't be reflected in IDE. To fix it you
+    need to reinitialize project using :ref:`cmd_project_init` (repeat it).
+
+
+PlatformIO-Mode
+^^^^^^^^^^^^^^^
+
+An Emacs minor mode has been written to facilitate building and uploading from within Emacs.
+It can be installed from the MELPA repository using ``M-x package-install``.
+See the MELPA `Getting Started <https://melpa.org/#/getting-started>`_ page for more information.
+
+Setup instructions and an example config can be found at the `Github page <https://github.com/ZachMassia/platformio-mode>`_.
 
 There are 6 predefined targets for building.
 
@@ -71,7 +72,11 @@ There are 6 predefined targets for building.
 * ``platformio_spiffs_upload``  - Upload files to file system SPIFFS (see :ref:`platform_espressif_uploadfs`). (``C-c i s``)
 * ``platformio_update`` - Update installed platforms and libraries.    (``C-c i d``)
 
-.. warning::
-    The libraries which are added, installed or used in the project
-    after generating process won't be reflected in IDE. To fix it you
-    need to reinitialize project using :ref:`cmd_project_init` (repeat it).
+
+Code Completion and Navigation
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Please install the next:
+
+* `C/C++/ObjC language server supporting cross references, hierarchies, completion and semantic highlighting <https://github.com/MaskRay/ccls>`_
+* `Emacs client for ccls, a C/C++ language server <https://github.com/MaskRay/emacs-ccls>`_.

integration/ide/vim.rst

@@ -32,12 +32,6 @@ Integration process consists of these steps:
 3. Generate a project using PlatformIO Core Project Generator (:option:`pio project init --ide`)
 4. Import project in IDE.
 
-"Neomake-PlatformIO" Plugin
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Please visit `neomake-platformio <https://github.com/coddingtonbear/neomake-platformio>`_
-for the further installation steps and documentation.
-
 Project Generator
 ^^^^^^^^^^^^^^^^^
 
@@ -50,10 +44,9 @@ command and generate project via :option:`pio project init --ide` command:
 
 Recommended bundles:
 
-* C/C++/ language server supporting cross references, hierarchies, completion and semantic highlighting - `CCLS: vim lsp <https://github.com/MaskRay/ccls/wiki/vim-lsp>`_
-* Syntax highlight - `Arduino-syntax-file <https://github.com/vim-scripts/Arduino-syntax-file>`_
-* Code Completion - `YouCompleteMe <https://github.com/Valloric/YouCompleteMe>`_ (see configuration example by **Anthony Ford** `PlatformIO/YouCompleteMe Integration <https://gist.github.com/ajford/f551b2b6fd4d6b6e1ef2>`_)
-* Syntax checking - `Syntastic <https://github.com/scrooloose/syntastic>`_
+* `C/C++/ObjC language server supporting cross references, hierarchies, completion and semantic highlighting <https://github.com/MaskRay/ccls>`_
+* `Async language server protocol plugin for vim and neovim <https://github.com/prabirshrestha/vim-lsp>`_
+* `"Neomake-PlatformIO" Plugin <https://github.com/coddingtonbear/neomake-platformio>`_
 
 Put to the project directory ``Makefile`` wrapper with contents: