From 88fc3a0093bcb008a89e0bdc5c8624aeed24cbba Mon Sep 17 00:00:00 2001
From: Vincent Zhang <seagle0128@gmail.com>
Date: Tue, 18 Feb 2020 14:13:16 +0800
Subject: [PATCH] Fix compatibility issue between ccls and aggressive-indent.

See https://github.com/MaskRay/emacs-ccls/issues/30.

1. Disable lsp-enable-indent.
2. Disable lsp-enable-on-type-formatting.
---
 lisp/init-c.el       |  2 +-
 lisp/init-company.el |  4 ++--
 lisp/init-ivy.el     |  1 -
 lisp/init-lsp.el     | 10 +++++++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lisp/init-c.el b/lisp/init-c.el
index 528b09187..77d77db48 100644
--- a/lisp/init-c.el
+++ b/lisp/init-c.el
@@ -38,7 +38,7 @@
   :ensure nil
   :bind (:map c-mode-base-map
          ("C-c c" . compile))
-  :hook (c-mode-common . (lambda () (c-set-style "bsd")))
+  :hook (c-mode-common . (lambda () (c-set-style "stroustrup")))
   :init (setq-default c-basic-offset 4)
   :config
   (use-package modern-cpp-font-lock
diff --git a/lisp/init-company.el b/lisp/init-company.el
index 3ca48dfeb..53206431b 100644
--- a/lisp/init-company.el
+++ b/lisp/init-company.el
@@ -40,8 +40,8 @@
   :bind (("M-/" . company-complete)
          ("C-M-i" . company-complete)
          :map company-active-map
-         ;; ("C-p" . company-select-previous)
-         ;; ("C-n" . company-select-next)
+         ("C-p" . company-select-previous)
+         ("C-n" . company-select-next)
          ("<tab>" . company-complete-common-or-cycle)
          ("<backtab>" . my-company-yasnippet)
          :map company-search-map
diff --git a/lisp/init-ivy.el b/lisp/init-ivy.el
index e55bf013b..aeb7aec89 100644
--- a/lisp/init-ivy.el
+++ b/lisp/init-ivy.el
@@ -66,7 +66,6 @@
          ("C-c h" . counsel-command-history)
          ("C-c i" . counsel-git)
          ("C-c j" . counsel-git-grep)
-         ("C-c l" . counsel-locate)
          ("C-c o" . counsel-outline)
          ("C-c r" . counsel-rg)
          ("C-c z" . counsel-fzf)
diff --git a/lisp/init-lsp.el b/lisp/init-lsp.el
index 8b0c7a9bf..e85fee6d8 100644
--- a/lisp/init-lsp.el
+++ b/lisp/init-lsp.el
@@ -51,8 +51,9 @@
                           (lsp-enable-which-key-integration)
 
                           ;; Format and organize imports
-                          (add-hook 'before-save-hook #'lsp-format-buffer t t)
-                          (add-hook 'before-save-hook #'lsp-organize-imports t t))))
+                          (unless (derived-mode-p 'c-mode 'c++-mode)
+                            (add-hook 'before-save-hook #'lsp-format-buffer t t)
+                            (add-hook 'before-save-hook #'lsp-organize-imports t t)))))
      :bind (:map lsp-mode-map
             ("C-c C-d" . lsp-describe-thing-at-point)
             ([remap xref-find-definitions] . lsp-find-definition)
@@ -62,7 +63,10 @@
      (setq read-process-output-max (* 1024 1024)) ;; 1MB
 
      (setq lsp-auto-guess-root t        ; Detect project root
-           lsp-keep-workspace-alive nil) ; Auto-kill LSP server
+           lsp-keep-workspace-alive nil ; Auto-kill LSP server
+           lsp-enable-indentation nil
+           lsp-enable-on-type-formatting nil
+           lsp-keymap-prefix "C-c l")
 
      ;; For `lsp-clients'
      (setq lsp-clients-python-library-directories '("/usr/local/" "/usr/"))