From 4e4607f0cbba86dd3066f122a08c49b0f8d16ceb Mon Sep 17 00:00:00 2001
From: James Nguyen <james@jojojames.com>
Date: Sun, 5 Nov 2017 09:32:45 -0800
Subject: [PATCH] Add evil-xref

---
 evil-collection.el |  5 ++++-
 evil-xref.el       | 45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 evil-xref.el

diff --git a/evil-collection.el b/evil-collection.el
index 92e066b..92a5642 100644
--- a/evil-collection.el
+++ b/evil-collection.el
@@ -55,7 +55,10 @@
     (with-eval-after-load 'replace
       (require 'evil-occur)
       (evil-occur-set-keys)))
-  )
+
+  (with-eval-after-load 'xref
+    (require 'evil-xref)
+    (evil-xref-set-keys)))
 
 ;;;###autoload
 (defun evil-collection-extra-modes-init ()
diff --git a/evil-xref.el b/evil-xref.el
new file mode 100644
index 0000000..f852e2a
--- /dev/null
+++ b/evil-xref.el
@@ -0,0 +1,45 @@
+;;; evil-xref.el --- Evil integration for xref. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2017 James Nguyen
+
+;; Author: James Nguyen <james@jojojames.com>
+;; Maintainer: James Nguyen <james@jojojames.com>
+;; URL: https://github.com/jojojames/evil-collection
+;; Version: 0.0.1
+;; Package-Requires: ((emacs "25.1"))
+;; Keywords: emacs, evil, xref
+;; HomePage: https://github.com/jojojames/evil-collection
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;; Evil integration for `xref'.
+
+;;; Code:
+
+(require 'evil-collection-util)
+(require 'xref)
+
+(defun evil-xref-set-keys ()
+  (+evilify-map
+   xref--xref-buffer-mode-map
+   :mode xref--xref-buffer-mode
+   :bindings
+   "\C-j" #'xref-next-line
+   "\C-k" #'xref-prev-line
+   "gj" #'xref-next-line
+   "gk" #'xref-prev-line))
+
+(provide 'evil-xref)
+;;; evil-xref.el ends here