From f2a766d1e6d7195d2bac11cc5c03fdd15c633900 Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Thu, 24 Oct 2019 12:35:49 -0700
Subject: [PATCH 1/2] Add pre-commit to run vint

---
 .gitignore              |  1 +
 .pre-commit-config.yaml | 12 ++++++++++++
 Makefile                | 19 +++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 .pre-commit-config.yaml

diff --git a/.gitignore b/.gitignore
index 5148618..ba76afd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ vim/tmp/*
 vim/tmp/viminfo.*
 .DS_Store
 vim/view/
+.pre_commit_env/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000..7ee6c81
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,12 @@
+---
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v1.2.3
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+  # After merging, this should change to the upstream and point to master
+  - repo: https://github.com/ViViDboarder/vint
+    rev: pre-commit-support
+    hooks:
+      - id: vint
diff --git a/Makefile b/Makefile
index 7778583..1916e9b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+PRE_COMMIT_ENV ?= .pre_commit_env
+PRE_COMMIT_ENV_BIN ?= $(PRE_COMMIT_ENV)/bin
+
 .PHONY: default
 default: install
 
@@ -21,3 +24,19 @@ uninstall:
 clean:
 	rm -fr ./vim/plugged
 	rm -fr ./vim/autoload/plug.vim
+
+# Installs pre-commit hooks
+$(PRE_COMMIT_ENV):
+	virtualenv $(PRE_COMMIT_ENV)
+
+$(PRE_COMMIT_ENV_BIN)/pre-commit: $(PRE_COMMIT_ENV)
+	$(PRE_COMMIT_ENV_BIN)/pip install pre-commit
+
+.PHONY: install-hooks
+install-hooks: $(PRE_COMMIT_ENV_BIN)/pre-commit
+	$(PRE_COMMIT_ENV_BIN)/pre-commit install-hooks
+
+# Checks files for encryption
+.PHONY: check
+check: $(PRE_COMMIT_ENV_BIN)/pre-commit
+	$(PRE_COMMIT_ENV_BIN)/pre-commit run --all-files

From bc1ac5ff717052589a8cba09240a8191bd678055 Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Thu, 24 Oct 2019 13:27:01 -0700
Subject: [PATCH 2/2] Improve vint compliance

---
 .pre-commit-config.yaml      | 4 ++++
 vim/after/indent/java.vim    | 2 +-
 vim/rc/plugins/tagbar.rc.vim | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7ee6c81..6a42918 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -10,3 +10,7 @@ repos:
     rev: pre-commit-support
     hooks:
       - id: vint
+        exclude: >
+          (?x)^(
+            vim/colors/.*\.vim
+          )$
diff --git a/vim/after/indent/java.vim b/vim/after/indent/java.vim
index 0ec6c6b..ddb6d68 100644
--- a/vim/after/indent/java.vim
+++ b/vim/after/indent/java.vim
@@ -2,7 +2,7 @@ function! GetJavaIndent_improved()
     let theIndent = GetJavaIndent()
     let lnum = prevnonblank(v:lnum - 1)
     let line = getline(lnum)
-    if line =~ '^\s*@.*$'
+    if line =~? '^\s*@.*$'
         let theIndent = indent(lnum)
     endif
 
diff --git a/vim/rc/plugins/tagbar.rc.vim b/vim/rc/plugins/tagbar.rc.vim
index 77ab60d..75fd1dd 100644
--- a/vim/rc/plugins/tagbar.rc.vim
+++ b/vim/rc/plugins/tagbar.rc.vim
@@ -1,4 +1,3 @@
 Plug 'majutsushi/tagbar', { 'on': 'TagbarToggle' }
 nnoremap <silent> <F8> :TagbarToggle<CR>
 let g:tagbar_autofocus = 1 " Autofocus tagbar
-