From 8f2160cf3cf8f9daf066c05400b3ce480e6a2155 Mon Sep 17 00:00:00 2001
From: Keenan Johns <keenanjj13@protonmail.com>
Date: Tue, 6 Jun 2023 15:03:27 -0500
Subject: [PATCH 1/5] refactor

---
 lua/bionic-reading/cmds.lua      | 31 ++++++++++++++++++-------------
 lua/bionic-reading/highlight.lua | 29 ++++++++++++-----------------
 lua/bionic-reading/init.lua      | 13 ++++++++-----
 3 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/lua/bionic-reading/cmds.lua b/lua/bionic-reading/cmds.lua
index 7b59fbb..1b27cdf 100644
--- a/lua/bionic-reading/cmds.lua
+++ b/lua/bionic-reading/cmds.lua
@@ -31,13 +31,14 @@ function CMDS:_setup()
 		callback = function(args)
 			local Buffers = require("bionic-reading.buffers")
 			local Config = require("bionic-reading.config")
+			local bufnr = args.buf
 
 			-- if buffer is active, we have already highlighted the file
-			if Buffers:check_active_buf(args.buf) or not Utils.check_file_types() or not Config.opts.auto_highlight then
+			if Buffers:check_active_buf(bufnr) or not Utils.check_file_types() or not Config.opts.auto_highlight then
 				return
 			end
 
-			Highlight:highlight(0, -1)
+			Highlight:highlight(0, -1, bufnr)
 		end,
 	})
 
@@ -47,8 +48,9 @@ function CMDS:_setup()
 		callback = function(args)
 			local Buffers = require("bionic-reading.buffers")
 			local Config = require("bionic-reading.config")
+			local bufnr = args.buf
 
-			if not Buffers:check_active_buf(args.buf) or not Utils.check_file_types() then
+			if not Buffers:check_active_buf(bufnr) or not Utils.check_file_types() then
 				return
 			end
 
@@ -63,7 +65,7 @@ function CMDS:_setup()
 				line_end = -1
 			end
 
-			Highlight:highlight(line_start, line_end)
+			Highlight:highlight(line_start, line_end, bufnr)
 		end,
 	})
 
@@ -73,11 +75,12 @@ function CMDS:_setup()
 		callback = function(args)
 			local Config = require("bionic-reading.config")
 			local Buffers = require("bionic-reading.buffers")
+			local bufnr = args.buf
 
 			if
-					not Buffers:check_active_buf(args.buf)
-					or not Config.opts.update_in_insert_mode
-					or not Utils.check_file_types()
+				not Buffers:check_active_buf(bufnr)
+				or not Config.opts.update_in_insert_mode
+				or not Utils.check_file_types()
 			then
 				return
 			end
@@ -93,14 +96,16 @@ function CMDS:_setup()
 				line_end = -1
 			end
 
-			Highlight:highlight(line_start, line_end)
+			Highlight:highlight(line_start, line_end, bufnr)
 		end,
 	})
 
-	create_user_command("BRToggle", function()
+	create_user_command("BRToggle", function(opts)
 		local Config = require("bionic-reading.config")
 		local Buffers = require("bionic-reading.buffers")
 		local bufnr = get_current_buf()
+		local line_start = opts.line1 or 0
+		local line_end = opts.line2 or -1
 
 		-- check if file type is in config
 		if not Utils.check_file_types() then
@@ -128,10 +133,10 @@ function CMDS:_setup()
 
 		if Buffers:check_active_buf(bufnr) then
 			Utils.notify("BionicReading disabled", "info", "")
-			Highlight:clear()
+			Highlight:clear(line_start, line_end, bufnr)
 		else
 			Utils.notify("BionicReading enabled", "info", "")
-			Highlight:highlight(0, -1)
+			Highlight:highlight(line_start, line_end, bufnr)
 		end
 	end, {})
 
@@ -143,7 +148,7 @@ function CMDS:_setup()
 
 		if success then
 			Utils.notify("Syllable algorithm is now " .. (new_value and "enabled" or "disabled"), "info", "")
-			Highlight:highlight(0, -1)
+			Highlight:highlight(0, -1, 0)
 		end
 	end, {})
 
@@ -161,7 +166,7 @@ function CMDS:_setup()
 
 		if success then
 			Utils.notify("Saccade cadence is now " .. new_value, "info", "")
-			Highlight:highlight(0, -1)
+			Highlight:highlight(0, -1, 0)
 		end
 	end, { nargs = 1 })
 
diff --git a/lua/bionic-reading/highlight.lua b/lua/bionic-reading/highlight.lua
index 0565976..185fbc5 100644
--- a/lua/bionic-reading/highlight.lua
+++ b/lua/bionic-reading/highlight.lua
@@ -14,16 +14,14 @@ local Highlight = {
 --- Clear all highlights in current buffer by clearing namespace
 --- @param line_start number
 --- @param line_end number
+--- @param bufnr number
 --- @return nil
-function Highlight:clear(line_start, line_end)
-	-- default to clear highlighting for all lines
-	if not line_start or not line_end then
-		line_start = 0
-		line_end = -1
-	end
-
+function Highlight:clear(line_start, line_end, bufnr)
 	local Buffers = require("bionic-reading.buffers")
-	local bufnr = api.nvim_get_current_buf()
+
+	bufnr = bufnr or api.nvim_get_current_buf()
+	line_start = line_start or 0
+	line_end = line_end or -1
 
 	Buffers:deactivate_buf(bufnr)
 	api.nvim_buf_clear_namespace(bufnr, self.namespace, line_start, line_end)
@@ -32,21 +30,18 @@ end
 --- Highlight lines in current buffer
 --- @param line_start number
 --- @param line_end number
+--- @param bufnr number
 --- @return nil
-function Highlight:highlight(line_start, line_end)
+function Highlight:highlight(line_start, line_end, bufnr)
 	local Buffers = require("bionic-reading.buffers")
 	local Config = require("bionic-reading.config")
 	local saccade_cadence = Config.opts.saccade_cadence
 
-	-- default to highlight all lines
-	if not line_start or not line_end then
-		line_start = 0
-		line_end = -1
-	end
-
-	Highlight:clear(line_start, line_end)
+	bufnr = bufnr or api.nvim_get_current_buf()
+	line_start = line_start or 0
+	line_end = line_end or -1
 
-	local bufnr = api.nvim_get_current_buf()
+	Highlight:clear(line_start, line_end, bufnr)
 
 	Buffers:activate_buf(bufnr)
 
diff --git a/lua/bionic-reading/init.lua b/lua/bionic-reading/init.lua
index 3b749a7..d99855b 100644
--- a/lua/bionic-reading/init.lua
+++ b/lua/bionic-reading/init.lua
@@ -4,16 +4,19 @@ local initialized = false
 --- Highlight lines in current buffer
 --- @param line_start number
 --- @param line_end number
---- @param override boolean @clear all highlights before highlighting
+--- @param bufnr number
 --- @return nil
-function M.highlight(line_start, line_end, override)
-	require("bionic-reading.highlight"):highlight(line_start, line_end, override)
+function M.highlight(line_start, line_end, bufnr)
+	require("bionic-reading.highlight"):highlight(line_start, line_end, bufnr)
 end
 
 --- Clear all highlights in current buffer by clearing namespace
+--- @param line_start number
+--- @param line_end number
+--- @param bufnr number
 --- @return nil
-function M.clear()
-	require("bionic-reading.highlight"):clear()
+function M.clear(line_start, line_end, bufnr)
+	require("bionic-reading.highlight"):clear(line_start, line_end, bufnr)
 end
 
 --- Setup bionic-reading.nvim

From aa76ecb0272f0e8c2f6a0f467f6838450b150493 Mon Sep 17 00:00:00 2001
From: Keenan Johns <keenanjj13@protonmail.com>
Date: Fri, 9 Jun 2023 15:10:59 -0500
Subject: [PATCH 2/5] refactor: Rewrote using treesitter

---
 .DS_Store                        | Bin 0 -> 6148 bytes
 lua/.DS_Store                    | Bin 0 -> 6148 bytes
 lua/bionic-reading/cmds.lua      | 277 ++++++++++++-------------------
 lua/bionic-reading/config.lua    |  27 ++-
 lua/bionic-reading/highlight.lua | 148 ++++++++++-------
 lua/bionic-reading/init.lua      |  16 +-
 lua/bionic-reading/test.lua      |   2 +
 lua/bionic-reading/utils.lua     |  25 ++-
 plugin/bionic-reading.vim        |  14 ++
 9 files changed, 256 insertions(+), 253 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 lua/.DS_Store
 create mode 100644 lua/bionic-reading/test.lua

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..b3496066ab2902e8d17b6828e16c663467abef7a
GIT binary patch
literal 6148
zcmeHK!EVz)5Ph43#A&IN14z9fS>jry0ji3Mi<>5gN`*s>$^lTY>nJsKy;1CtLlntp
z_!zEy3IEa)%<OKZIBBm4wL8(wo1L9md!OT7F96Y<MlXOC0Ed*Zwn63=;eOUNsh9|N
z3N=QK>^PC<VIsq|Y#Xo)SO)$#2Ke2rBS1#KA<FMBFA9gG?LSJ?tv7IjV;rH6ckt0)
zdfPes=Sp@J38o0jS>oC4S>Y@jo0a2NI8Nd$?{t2PO11W=-f$Yurt{gqkTX9I@@du$
zCLg)=UdklA@q_Rz9?k}>Cr2{PgE$>dR6!gKDdp3LIF012E2n9csajumI8CQHXl>8u
zuU~d{+`aw1#g02aQ2wj^#iHpveZKqVba0tmrSiMt0D@LKC0hn>;0HNo&fok=n#goS
z5zc;$F|mA(OR^(kx{a^IxJ0_b4Ue$Qcb)2(!x7@O-0PLxCQj+O9HNJ}gl$|QDvw^_
zyICHcnpPex1Lj}sY(7{9?8GetmVvt%;Pt^JW%LXd8r9N4MjZhNYZO*OK7R;sjcd>|
zSZJgk5}`{8b*V5%457;@?wUN$V4+c$Lzu&dFjp4lgd)_{X?$0uLwFjkwG3DW$_!L>
zv&H*=|L*gDxyZIG1D1h%#ek^w{9c!)WcJpz$?;z6l71m&;k-hlDj{RGW99HxyiKZv
Z`doGhJ%fctijde30Y!r~mVtlDz+bK=l(7H+

literal 0
HcmV?d00001

diff --git a/lua/.DS_Store b/lua/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..812fd2ccd2616392593dde3ef13099e6acf638a1
GIT binary patch
literal 6148
zcmeHKO>fgc5S>j!<ESdip_O{H)N4yqh@wWlm=F%VVnh!V1v`#{g}WQ&gB+qrKEog4
zm+*Js&F%(-Qs}KjXhxcO<Jp<D_u1O@5RvN6vvZ;b5d~1jN*(47;c?atsrbkaP}w<h
z8qg_CXh_LMwgk430e*LnDW#kYY1m)yFT<6l(N$pvX<<_2@kjC;`sBM6c=yz%i|N?c
zeoe<kKAkn2-&AF%`e?Tn)PlX>UHri;;#o4APrJ$FEnmGhrbyR*lD^4@i+<zah0(Jl
z*Tab|$g?3*Zmx5knMK#kbvCuNu^R~LLA~ENS}rfnJ11eQ-CCW5%g)m#{AcaesvaC3
zpIyG{e=Kgb`D|A~3g54leUEGS0_U&%e2OQ!FnWZ%^&IP3L191`5C*oD0l!}bd)xYe
z@?64zF!0Y9;Qb+lGDaRthj#0Lu`K|wim(;<{F}%%p~uK$=@26j<w}9BRQVP|xpKrq
zpBH&79lCN-zWGr8&dPTv%HAFGhc=y5<WQ_IAPoG@0QY{72A}^g|J?uEBr(E(Fz|me
zpsKyN*TvfW*}AbxK5IkhdngO%l@5QFz_CX$a``Aef?7d5WCs{|EFB^Okskp|gBW4p
HK^gb~-h^LU

literal 0
HcmV?d00001

diff --git a/lua/bionic-reading/cmds.lua b/lua/bionic-reading/cmds.lua
index 1b27cdf..586d542 100644
--- a/lua/bionic-reading/cmds.lua
+++ b/lua/bionic-reading/cmds.lua
@@ -1,196 +1,135 @@
 local Highlight = require("bionic-reading.highlight")
 local Utils = require("bionic-reading.utils")
 
-local create_user_command = vim.api.nvim_create_user_command
 local get_current_buf = vim.api.nvim_get_current_buf
-local create_autocmd = vim.api.nvim_create_autocmd
 
---- Commands class
---- @class CMDS
---- @field group number
-local CMDS = {
-	group = vim.api.nvim_create_augroup("bionic_reading", { clear = true }),
-}
+--- Commands module
+--- @module CMDS
+local CMDS = {}
 
---- Setup commands
+--- highlight on colorscheme change
 --- @return nil
-function CMDS:_setup()
-	create_autocmd("ColorScheme", {
-		pattern = "*",
-		group = self.group,
-		callback = function()
-			local Config = require("bionic-reading.config")
-
-			vim.api.nvim_set_hl(0, Highlight.hl_group, Config.opts.hl_group_value)
-		end,
-	})
-
-	create_autocmd("FileType", {
-		pattern = "*",
-		group = self.group,
-		callback = function(args)
-			local Buffers = require("bionic-reading.buffers")
-			local Config = require("bionic-reading.config")
-			local bufnr = args.buf
-
-			-- if buffer is active, we have already highlighted the file
-			if Buffers:check_active_buf(bufnr) or not Utils.check_file_types() or not Config.opts.auto_highlight then
-				return
-			end
-
-			Highlight:highlight(0, -1, bufnr)
-		end,
-	})
-
-	create_autocmd("TextChanged", {
-		pattern = "*",
-		group = self.group,
-		callback = function(args)
-			local Buffers = require("bionic-reading.buffers")
-			local Config = require("bionic-reading.config")
-			local bufnr = args.buf
-
-			if not Buffers:check_active_buf(bufnr) or not Utils.check_file_types() then
-				return
-			end
-
-			-- getpos returns an array of [bufnr, lnum, col, off], 1 based index
-			local line_start = vim.fn.getpos("'[")[2] - 1
-			local line_end = vim.fn.getpos("']")[2]
-
-			-- because the saccade_cadence is not one. Not every word will be highlighted
-			-- so, we need to re-highlight everything after the paste to make sure the
-			-- cadence is kept
-			if Config.opts.saccade_cadence ~= 1 then
-				line_end = -1
-			end
-
-			Highlight:highlight(line_start, line_end, bufnr)
-		end,
-	})
-
-	create_autocmd("TextChangedI", {
-		pattern = "*",
-		group = self.group,
-		callback = function(args)
-			local Config = require("bionic-reading.config")
-			local Buffers = require("bionic-reading.buffers")
-			local bufnr = args.buf
-
-			if
-				not Buffers:check_active_buf(bufnr)
-				or not Config.opts.update_in_insert_mode
-				or not Utils.check_file_types()
-			then
-				return
-			end
-
-			-- nvim_win_get_cursor returns an array of [lnum, col], 1 based indexing
-			local line_start = vim.api.nvim_win_get_cursor(0)[1] - 1
-			local line_end = line_start + 1
-
-			-- because the saccade_cadence is not one. Not every word will be highlighted
-			-- so, we need to re-highlight everything after the paste to make sure the
-			-- cadence is kept
-			if Config.opts.saccade_cadence ~= 1 then
-				line_end = -1
-			end
-
-			Highlight:highlight(line_start, line_end, bufnr)
-		end,
-	})
-
-	create_user_command("BRToggle", function(opts)
-		local Config = require("bionic-reading.config")
-		local Buffers = require("bionic-reading.buffers")
-		local bufnr = get_current_buf()
-		local line_start = opts.line1 or 0
-		local line_end = opts.line2 or -1
-
-		-- check if file type is in config
-		if not Utils.check_file_types() then
-			local input = "n"
-
-			-- Prompt user if we can
-			if Config.opts.prompt_user then
-				input = vim.fn.input("Would you like to highlight the current file type? (y/n): ")
-			end
-
-			-- If user does not want to highlight current file type, return
-			if not Utils.prompt_answer(input) then
-				Utils.notify(
-					"Cannot highlight current buffer.\nPlease add file type to your config if you would like to",
-					"error",
-					""
-				)
-
-				return
-			else
-				-- Add file type to config
-				Config._update("file_types", { vim.bo.filetype })
-			end
-		end
+function CMDS._set_hl_on_colorscheme()
+	local Config = require("bionic-reading.config")
 
-		if Buffers:check_active_buf(bufnr) then
-			Utils.notify("BionicReading disabled", "info", "")
-			Highlight:clear(line_start, line_end, bufnr)
-		else
-			Utils.notify("BionicReading enabled", "info", "")
-			Highlight:highlight(line_start, line_end, bufnr)
-		end
-	end, {})
+	vim.api.nvim_set_hl(0, Highlight.hl_group, Config.opts.hl_group_value)
+end
 
-	create_user_command("BRToggleSyllableAlgorithm", function()
-		local Config = require("bionic-reading.config")
-		local new_value = not Config.opts.syllable_algorithm
+--- highlight on file type change
+--- @return nil
+function CMDS._highlight_on_filetype()
+	local Buffers = require("bionic-reading.buffers")
+	local Config = require("bionic-reading.config")
+	local bufnr = get_current_buf()
 
-		local success = Config._update("syllable_algorithm", new_value)
+	-- if buffer is active, we have already highlighted the file
+	if Buffers:check_active_buf(bufnr) or not Utils.check_file_types() or not Config.opts.auto_highlight then
+		return
+	end
 
-		if success then
-			Utils.notify("Syllable algorithm is now " .. (new_value and "enabled" or "disabled"), "info", "")
-			Highlight:highlight(0, -1, 0)
-		end
-	end, {})
+	Highlight.highlight(bufnr, 0, vim.api.nvim_buf_line_count(bufnr))
+end
 
-	create_user_command("BRSaccadeCadence", function(opts)
-		local Config = require("bionic-reading.config")
-		local new_value = tonumber(opts.fargs[1])
+--- highlight on text changed
+--- @return nil
+function CMDS._highlight_on_textchanged()
+	local Buffers = require("bionic-reading.buffers")
+	local Config = require("bionic-reading.config")
+	local bufnr = get_current_buf()
 
-		if not new_value then
-			Utils.notify("Invalid value", "error", "")
+	if not Buffers:check_active_buf(bufnr) or not Utils.check_file_types() or not Config.opts.update_in_insert_mode then
+		return
+	end
 
-			return
+	-- getpos returns an array of [bufnr, lnum, col, off], 1 based index
+	local line_start = vim.fn.getpos("'[")[2] - 1
+	local line_end = vim.fn.getpos("']")[2]
+
+	Highlight.highlight(bufnr, line_start, line_end)
+end
+
+--- highlight on text changed in insert mode
+--- @return nil
+function CMDS._highlight_on_textchangedI()
+	local Buffers = require("bionic-reading.buffers")
+	local Config = require("bionic-reading.config")
+	local bufnr = get_current_buf()
+
+	if not Buffers:check_active_buf(bufnr) or not Config.opts.update_in_insert_mode or not Utils.check_file_types() then
+		return
+	end
+
+	-- nvim_win_get_cursor returns an array of [lnum, col], 1 based indexing
+	local line_start = vim.api.nvim_win_get_cursor(0)[1] - 1
+	local line_end = line_start + 1
+
+	Highlight.highlight(bufnr, line_start, line_end)
+end
+
+--- toggle highlighting
+--- @return nil
+function CMDS._toggle()
+	local Config = require("bionic-reading.config")
+	local Buffers = require("bionic-reading.buffers")
+	local bufnr = get_current_buf()
+
+	-- check if file type is in config
+	if not Utils.check_file_types() then
+		local input = "n"
+
+		-- Prompt user if we can
+		if Config.opts.prompt_user then
+			input = vim.fn.input("Would you like to highlight the current file type? (y/n): ")
 		end
 
-		local success = Config._update("saccade_cadence", new_value)
+		-- If user does not want to highlight current file type, return
+		if not Utils.prompt_answer(input) then
+			Utils.notify(
+				"Cannot highlight current buffer.\nPlease add file type to your config if you would like to",
+				"error",
+				""
+			)
 
-		if success then
-			Utils.notify("Saccade cadence is now " .. new_value, "info", "")
-			Highlight:highlight(0, -1, 0)
+			return
+		else
+			-- Add file type to config
+			Config._update("file_types", { [vim.bo.filetype] = { "any" } })
 		end
-	end, { nargs = 1 })
+	end
+
+	if Buffers:check_active_buf(bufnr) then
+		Utils.notify("BionicReading disabled", "info", "")
+		Highlight.clear(bufnr)
+	else
+		Utils.notify("BionicReading enabled", "info", "")
+		Highlight.highlight(bufnr, 0, vim.api.nvim_buf_line_count(bufnr))
+	end
+end
 
-	create_user_command("BRToggleUpdateInsertMode", function()
-		local Config = require("bionic-reading.config")
-		local new_value = not Config.opts.update_in_insert_mode
+--- toggle update in insert mode
+--- @return nil
+function CMDS._toggle_update_insert_mode()
+	local Config = require("bionic-reading.config")
+	local new_value = not Config.opts.update_in_insert_mode
 
-		local success = Config._update("update_in_insert_mode", new_value)
+	local success = Config._update("update_in_insert_mode", new_value)
 
-		if success then
-			Utils.notify("Update while in insert mode is now " .. (new_value and "enabled" or "disabled"), "info", "")
-		end
-	end, {})
+	if success then
+		Utils.notify("Update while in insert mode is now " .. (new_value and "enabled" or "disabled"), "info", "")
+	end
+end
 
-	create_user_command("BRToggleAutoHighlight", function()
-		local Config = require("bionic-reading.config")
-		local new_value = not Config.opts.auto_highlight
+--- toggle auto highlight
+--- @return nil
+function CMDS._toggle_auto_highlight()
+	local Config = require("bionic-reading.config")
+	local new_value = not Config.opts.auto_highlight
 
-		local success = Config._update("auto_highlight", new_value)
+	local success = Config._update("auto_highlight", new_value)
 
-		if success then
-			Utils.notify("Auto highlight is now " .. (new_value and "enabled" or "disabled"), "info", "")
-		end
-	end, {})
+	if success then
+		Utils.notify("Auto highlight is now " .. (new_value and "enabled" or "disabled"), "info", "")
+	end
 end
 
 return CMDS
diff --git a/lua/bionic-reading/config.lua b/lua/bionic-reading/config.lua
index 59f66af..3d6bc11 100644
--- a/lua/bionic-reading/config.lua
+++ b/lua/bionic-reading/config.lua
@@ -8,28 +8,25 @@ local Config = {}
 --- @field auto_highlight (boolean) Enable/disable auto-highlighting
 --- @field file_types (table) File types to enable auto-highlighting
 --- @field hl_group_value (table) Highlight group value
---- @field hl_offsets (table) Highlight offsets
 --- @field prompt_user (boolean) Enable/disable prompting user
---- @field saccade_cadence (number) Saccade cadence
+--- @field treesitter (boolean) Enable/disable treesitter
 --- @field update_in_insert_mode (boolean) Enable/disable updating in insert mode
---- @field use_syllable_algorithm (boolean) Enable/disable syllable algorithm
 local defaults = {
 	auto_highlight = true,
-	file_types = { "text" },
+	file_types = {
+		["text"] = {
+			"any",
+		},
+		["lua"] = {
+			"comment",
+		},
+	},
 	hl_group_value = {
 		link = "Bold",
 	},
-	hl_offsets = {
-		["1"] = 1,
-		["2"] = 1,
-		["3"] = 2,
-		["4"] = 2,
-		["default"] = 0.4,
-	},
 	prompt_user = true,
-	saccade_cadence = 1,
+	treesitter = true,
 	update_in_insert_mode = true,
-	syllable_algorithm = true, -- BETA
 }
 
 --- Setup bionic-reading.nvim configuration
@@ -52,11 +49,9 @@ function Config._setup(opts)
 		auto_highlight = { Config.opts.auto_highlight, "boolean" },
 		file_types = { Config.opts.file_types, "table" },
 		hl_group_value = { Config.opts.hl_group_value, "table" },
-		hl_offsets = { Config.opts.hl_offsets, "table" },
 		prompt_user = { Config.opts.prompt_user, "boolean" },
-		saccade_cadence = { Config.opts.saccade_cadence, "number" },
+		treesitter = { Config.opts.treesitter, "boolean" },
 		update_in_insert_mode = { Config.opts.update_in_insert_mode, "boolean" },
-		syllable_algorithm = { Config.opts.syllable_algorithm, "boolean" },
 	})
 end
 
diff --git a/lua/bionic-reading/highlight.lua b/lua/bionic-reading/highlight.lua
index 185fbc5..d38eb9e 100644
--- a/lua/bionic-reading/highlight.lua
+++ b/lua/bionic-reading/highlight.lua
@@ -3,99 +3,131 @@ local Utils = require("bionic-reading.utils")
 local api = vim.api
 
 --- Highlight class
---- @class Highlight
---- @field namespace number
---- @field hl_group string
-local Highlight = {
-	namespace = api.nvim_create_namespace("bionic_reading"),
-	hl_group = "BionicReadingHL",
-}
+--- @module Highlight
+local Highlight = {}
 
---- Clear all highlights in current buffer by clearing namespace
+local namespace = api.nvim_create_namespace("bionic_reading")
+local hl_group = "BionicReadingHL"
+
+--- Apply highlighting to buffer
+--- @param bufnr number
 --- @param line_start number
 --- @param line_end number
---- @param bufnr number
 --- @return nil
-function Highlight:clear(line_start, line_end, bufnr)
-	local Buffers = require("bionic-reading.buffers")
-
+local function _apply_highlighting(bufnr, line_start, line_end)
 	bufnr = bufnr or api.nvim_get_current_buf()
 	line_start = line_start or 0
-	line_end = line_end or -1
+	line_end = line_end or api.nvim_buf_line_count(bufnr)
 
-	Buffers:deactivate_buf(bufnr)
-	api.nvim_buf_clear_namespace(bufnr, self.namespace, line_start, line_end)
+	local lines = api.nvim_buf_get_lines(bufnr, line_start, line_end, false)
+
+	for line_index, line in ipairs(lines) do
+		for word_index, word in string.gmatch(line, "()([^%s%p%d]+)") do
+			local line_to_hl = line_start + line_index - 1
+			local col_start = word_index - 1
+			local col_end = col_start
+
+			col_end = col_start + Utils.highlight_on_first_syllable(word)
+
+			api.nvim_buf_add_highlight(bufnr, namespace, hl_group, line_to_hl, col_start, col_end)
+		end
+	end
 end
 
---- Highlight lines in current buffer
+--- Highlight buffer using treesitter
+--- @param bufnr number
 --- @param line_start number
 --- @param line_end number
---- @param bufnr number
---- @return nil
-function Highlight:highlight(line_start, line_end, bufnr)
-	local Buffers = require("bionic-reading.buffers")
+--- @return boolean true if treesitter parser is available, false otherwise
+local function _treesitter_highlight(bufnr, line_start, line_end)
 	local Config = require("bionic-reading.config")
-	local saccade_cadence = Config.opts.saccade_cadence
 
 	bufnr = bufnr or api.nvim_get_current_buf()
 	line_start = line_start or 0
-	line_end = line_end or -1
+	line_end = line_end or vim.api.nvim_buf_line_count(bufnr)
 
-	Highlight:clear(line_start, line_end, bufnr)
+	local ok = pcall(vim.treesitter.get_parser, bufnr)
 
-	Buffers:activate_buf(bufnr)
+	if not ok then
+		return false
+	end
 
-	-- zero based indexing, end is exclusive
-	local lines = api.nvim_buf_get_lines(bufnr, line_start, line_end, false)
-	local saccade_count = 0
+	-- pos is 0-indexed
+	local root = vim.treesitter.get_node({ bufnr = bufnr, pos = { line_start, line_end } })
 
-	-- iterate over lines and words and highlight
-	for line_index, line in ipairs(lines) do
-		for word_index, word in string.gmatch(line, "()([^%s%p%d]+)") do
-			saccade_count = saccade_count + 1
+	if not root then
+		return false
+	end
+
+	-- Make sure we have the top-level node
+	if line_start == 0 and line_end == vim.api.nvim_buf_line_count(bufnr) then
+		local parent = root:parent()
 
-			if saccade_count ~= saccade_cadence then
-				goto continue
-			elseif saccade_count == saccade_cadence then
-				saccade_count = 0
+		while parent do
+			root = parent
+			parent = parent:parent()
+		end
+	end
+
+	Utils.navigate_tree(root, function(node)
+		for _, node_type in ipairs(Config.opts.file_types[vim.bo.filetype]) do
+			if node_type == node:type() then
+				local row_start = node:range()
+
+				_apply_highlighting(bufnr, row_start, row_start + 1)
 			end
+		end
+	end)
 
-			local word_length = string.len(word)
-			local word_length_str = tostring(word_length)
-			-- cannot just use line_index because line_start is not always 0, zero based indexing
-			local line_to_hl = line_start + line_index - 1
-			local col_start = word_index - 1
-			local col_end = col_start
+	return true
+end
+
+--- Clear all highlights in current buffer by clearing namespace
+--- @param bufnr number
+--- @return nil
+function Highlight.clear(bufnr)
+	local Buffers = require("bionic-reading.buffers")
+
+	bufnr = bufnr or api.nvim_get_current_buf()
 
-			if Config.opts.syllable_algorithm then
-				col_end = col_start + Utils.highlight_on_first_syllable(word)
-			else
-				local hl_end = 0
+	Buffers:deactivate_buf(bufnr)
+	api.nvim_buf_clear_namespace(bufnr, namespace, 0, -1)
+end
 
-				-- offset tells us how many characters to highlight
-				local hl_offset = Config.opts.hl_offsets[word_length_str]
+--- Highlight lines in current buffer
+--- @param bufnr number
+--- @param line_start number
+--- @param line_end number
+--- @return nil
+function Highlight.highlight(bufnr, line_start, line_end)
+	local Config = require("bionic-reading.config")
+	local Buffers = require("bionic-reading.buffers")
+	local ok = false
 
-				if hl_offset then
-					hl_end = hl_offset
-				else
-					hl_end = math.floor(word_length * Config.opts.hl_offsets["default"] + 0.5)
-				end
+	bufnr = bufnr or api.nvim_get_current_buf()
+	line_start = line_start or 0
+	line_end = line_end or api.nvim_buf_line_count(bufnr)
 
-				col_end = col_start + hl_end
-			end
+	Buffers:activate_buf(bufnr)
 
-			-- Applies highlight to the word, zero based indexing
-			api.nvim_buf_add_highlight(bufnr, self.namespace, self.hl_group, line_to_hl, col_start, col_end)
+	if Config.opts.treesitter then
+		ok = _treesitter_highlight(bufnr, line_start, line_end)
 
-			::continue::
+		if ok then
+			return
 		end
 	end
+
+	-- If treesitter is not enabled or it failed to highlight, fallback to regex
+	if not ok then
+		_apply_highlighting(bufnr, line_start, line_end)
+	end
 end
 
 local function init()
 	local Config = require("bionic-reading.config")
 
-	api.nvim_set_hl(0, Highlight.hl_group, Config.opts.hl_group_value)
+	api.nvim_set_hl(0, hl_group, Config.opts.hl_group_value)
 end
 
 init()
diff --git a/lua/bionic-reading/init.lua b/lua/bionic-reading/init.lua
index d99855b..2fbc45f 100644
--- a/lua/bionic-reading/init.lua
+++ b/lua/bionic-reading/init.lua
@@ -2,21 +2,20 @@ local M = {}
 local initialized = false
 
 --- Highlight lines in current buffer
---- @param line_start number
---- @param line_end number
 --- @param bufnr number
 --- @return nil
-function M.highlight(line_start, line_end, bufnr)
-	require("bionic-reading.highlight"):highlight(line_start, line_end, bufnr)
+function M.highlight(bufnr, line_start, line_end)
+	line_start = line_start or 0
+	line_end = line_end or vim.api.nvim_buf_line_count(bufnr)
+
+	require("bionic-reading.highlight").highlight(bufnr, line_start, line_end)
 end
 
 --- Clear all highlights in current buffer by clearing namespace
---- @param line_start number
---- @param line_end number
 --- @param bufnr number
 --- @return nil
-function M.clear(line_start, line_end, bufnr)
-	require("bionic-reading.highlight"):clear(line_start, line_end, bufnr)
+function M.clear(bufnr)
+	require("bionic-reading.highlight").clear(bufnr)
 end
 
 --- Setup bionic-reading.nvim
@@ -30,7 +29,6 @@ function M.setup(opts)
 	opts = opts or {}
 
 	require("bionic-reading.config")._setup(opts)
-	require("bionic-reading.cmds"):_setup()
 
 	initialized = true
 end
diff --git a/lua/bionic-reading/test.lua b/lua/bionic-reading/test.lua
new file mode 100644
index 0000000..af6eb79
--- /dev/null
+++ b/lua/bionic-reading/test.lua
@@ -0,0 +1,2 @@
+--- Clear all highlights in current buffer by clearing namespace
+--- Apply highlighting to buffer
diff --git a/lua/bionic-reading/utils.lua b/lua/bionic-reading/utils.lua
index 0f686aa..0f72c45 100644
--- a/lua/bionic-reading/utils.lua
+++ b/lua/bionic-reading/utils.lua
@@ -9,7 +9,7 @@ function Utils.check_file_types()
 	local Config = require("bionic-reading.config")
 	local correct_file_type = false
 
-	for _, file_type in ipairs(Config.opts.file_types) do
+	for file_type, _ in pairs(Config.opts.file_types) do
 		if vim.bo.filetype == file_type then
 			correct_file_type = true
 			break
@@ -28,6 +28,9 @@ function Utils.notify(content, type, fallback)
 	local has_notify, notify = pcall(require, "notify")
 	local title = "Bionic Reading"
 
+	type = type or "info"
+	fallback = fallback or nil
+
 	if has_notify then
 		notify.notify(content, type, {
 			title = title,
@@ -97,6 +100,10 @@ function Utils.highlight_on_first_syllable(word)
 		return 0
 	end
 
+	if #word == 1 then
+		return 1
+	end
+
 	if #word <= 4 then
 		return math.floor(#word / 2)
 	end
@@ -146,4 +153,20 @@ function Utils.highlight_on_first_syllable(word)
 	return 1
 end
 
+local function _navigate_tree(node, callback)
+	local child_count = node:named_child_count()
+
+	if child_count ~= 0 then
+		for child, _ in node:iter_children() do
+			_navigate_tree(child, callback)
+		end
+	end
+
+	return callback(node)
+end
+
+function Utils.navigate_tree(node, callback)
+	_navigate_tree(node, callback)
+end
+
 return Utils
diff --git a/plugin/bionic-reading.vim b/plugin/bionic-reading.vim
index 9f16e99..938b933 100644
--- a/plugin/bionic-reading.vim
+++ b/plugin/bionic-reading.vim
@@ -3,3 +3,17 @@ if exists('g:loaded_bionic_reading')
 endif
 
 let g:loaded_bionic_reading = 1
+
+" HACK: use defer_fn since TreeSitter is doing something that's removing
+" highlight on TextChange/BufWritePost
+augroup bionic_reading
+	autocmd!
+	autocmd ColorScheme * lua require("bionic-reading.cmds")._set_hl_on_colorscheme()
+	autocmd FileType * lua require("bionic-reading.cmds")._highlight_on_filetype()
+	autocmd TextChanged * lua vim.defer_fn(function()require("bionic-reading.cmds")._highlight_on_textchanged()end, 0)
+	autocmd TextChangedI * lua require("bionic-reading.cmds")._highlight_on_textchangedI()
+augroup end
+
+command! BRToggle lua require("bionic-reading.cmds")._toggle()
+command! BRToggleUpdateInsertMode lua require("bionic-reading.cmds")._toggle_update_insert_mode()
+command! BRToggleAutoHighlight lua require("bionic-reading.cmds")._toggle_auto_highlight()

From 3a9443e24a1ffcb984623c7d322fe192d3de62b1 Mon Sep 17 00:00:00 2001
From: Keenan Johns <keenanjj13@protonmail.com>
Date: Fri, 9 Jun 2023 15:12:11 -0500
Subject: [PATCH 3/5] removed DS files

---
 .DS_Store     | Bin 6148 -> 0 bytes
 lua/.DS_Store | Bin 6148 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .DS_Store
 delete mode 100644 lua/.DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index b3496066ab2902e8d17b6828e16c663467abef7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK!EVz)5Ph43#A&IN14z9fS>jry0ji3Mi<>5gN`*s>$^lTY>nJsKy;1CtLlntp
z_!zEy3IEa)%<OKZIBBm4wL8(wo1L9md!OT7F96Y<MlXOC0Ed*Zwn63=;eOUNsh9|N
z3N=QK>^PC<VIsq|Y#Xo)SO)$#2Ke2rBS1#KA<FMBFA9gG?LSJ?tv7IjV;rH6ckt0)
zdfPes=Sp@J38o0jS>oC4S>Y@jo0a2NI8Nd$?{t2PO11W=-f$Yurt{gqkTX9I@@du$
zCLg)=UdklA@q_Rz9?k}>Cr2{PgE$>dR6!gKDdp3LIF012E2n9csajumI8CQHXl>8u
zuU~d{+`aw1#g02aQ2wj^#iHpveZKqVba0tmrSiMt0D@LKC0hn>;0HNo&fok=n#goS
z5zc;$F|mA(OR^(kx{a^IxJ0_b4Ue$Qcb)2(!x7@O-0PLxCQj+O9HNJ}gl$|QDvw^_
zyICHcnpPex1Lj}sY(7{9?8GetmVvt%;Pt^JW%LXd8r9N4MjZhNYZO*OK7R;sjcd>|
zSZJgk5}`{8b*V5%457;@?wUN$V4+c$Lzu&dFjp4lgd)_{X?$0uLwFjkwG3DW$_!L>
zv&H*=|L*gDxyZIG1D1h%#ek^w{9c!)WcJpz$?;z6l71m&;k-hlDj{RGW99HxyiKZv
Z`doGhJ%fctijde30Y!r~mVtlDz+bK=l(7H+

diff --git a/lua/.DS_Store b/lua/.DS_Store
deleted file mode 100644
index 812fd2ccd2616392593dde3ef13099e6acf638a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKO>fgc5S>j!<ESdip_O{H)N4yqh@wWlm=F%VVnh!V1v`#{g}WQ&gB+qrKEog4
zm+*Js&F%(-Qs}KjXhxcO<Jp<D_u1O@5RvN6vvZ;b5d~1jN*(47;c?atsrbkaP}w<h
z8qg_CXh_LMwgk430e*LnDW#kYY1m)yFT<6l(N$pvX<<_2@kjC;`sBM6c=yz%i|N?c
zeoe<kKAkn2-&AF%`e?Tn)PlX>UHri;;#o4APrJ$FEnmGhrbyR*lD^4@i+<zah0(Jl
z*Tab|$g?3*Zmx5knMK#kbvCuNu^R~LLA~ENS}rfnJ11eQ-CCW5%g)m#{AcaesvaC3
zpIyG{e=Kgb`D|A~3g54leUEGS0_U&%e2OQ!FnWZ%^&IP3L191`5C*oD0l!}bd)xYe
z@?64zF!0Y9;Qb+lGDaRthj#0Lu`K|wim(;<{F}%%p~uK$=@26j<w}9BRQVP|xpKrq
zpBH&79lCN-zWGr8&dPTv%HAFGhc=y5<WQ_IAPoG@0QY{72A}^g|J?uEBr(E(Fz|me
zpsKyN*TvfW*}AbxK5IkhdngO%l@5QFz_CX$a``Aef?7d5WCs{|EFB^Okskp|gBW4p
HK^gb~-h^LU


From 4848d61746c9dba97e008fe180e4cb87e74bf54f Mon Sep 17 00:00:00 2001
From: Keenan Johns <keenanjj13@protonmail.com>
Date: Fri, 9 Jun 2023 15:15:56 -0500
Subject: [PATCH 4/5] refactor(test): removed

---
 lua/bionic-reading/test.lua | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 lua/bionic-reading/test.lua

diff --git a/lua/bionic-reading/test.lua b/lua/bionic-reading/test.lua
deleted file mode 100644
index af6eb79..0000000
--- a/lua/bionic-reading/test.lua
+++ /dev/null
@@ -1,2 +0,0 @@
---- Clear all highlights in current buffer by clearing namespace
---- Apply highlighting to buffer

From f27d5a112a536cdf757488d8e68dbb51a3d41101 Mon Sep 17 00:00:00 2001
From: Keenan Johns <keenanjj13@protonmail.com>
Date: Fri, 9 Jun 2023 15:30:03 -0500
Subject: [PATCH 5/5] refactor(README): updated to reflect treesitter changes

---
 README.md | 78 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/README.md b/README.md
index 2ee48dc..accf6ae 100644
--- a/README.md
+++ b/README.md
@@ -7,13 +7,17 @@
                                                              /____/   
 ```
 
-Togglable and customizable bionic reading for Neovim using syllable based highlighting!
+Togglable and customizable bionic reading for Neovim using syllable based highlighting
+and TreeSitter!
 
 ## What is BionicReading?
 
 `bionic-reading.nvim` is a simple but powerful Neovim plugin designed to improve
 reading and writing efficiency. By highlighting the first syllable of each word,
-it aims to aid comprehension and to highlight on logical sections of the code
+it aims to aid comprehension and to highlight on logical sections of the code. By
+using the power of TreeSitter you have complete control over what is highlighted
+in your files. Just highlight comments? Sure! Strings? Of course! Function names?
+Why not! Or just highlight the whole file! The choice is yours
 
 ### Syllable Algorithm
 
@@ -44,7 +48,7 @@ Font is [VictorMono](https://rubjo.github.io/victor-mono/) and my NeoVim setup u
 
 ## Features
  - No dependencies!
- - Custom highlighting amounts and highlighting style
+ - Custom highlighting style
  - Toggable update while in insert mode
  - File types restricted
  - Highlighting stays after colorscheme changes
@@ -52,9 +56,8 @@ Font is [VictorMono](https://rubjo.github.io/victor-mono/) and my NeoVim setup u
  - Uses [nvim-notify](https://github.com/rcarriga/nvim-notify) for notifications if available 
  - Now prompts to highlight file if file type is not in your config
  - Can enable/disable prompting ^
- - *NEW*: Added saccade_cadence to control how often words are highlighted
- - *NEW*: Added user command to set saccade_cadence
- - *NEW*: Can now use a syllable algorithm to highlight the first syllable in a word
+ - *NEW*: Now use a syllable algorithm to highlight the first syllable in a word
+ - *NEW*: You can now highlight on node type thanks to treesitter!
 
 ## Getting Started
 
@@ -117,45 +120,52 @@ Example using lazy.nvim
       -- determines if the file types below will be
       -- automatically highlighted on buffer open
       auto_highlight = true,
-      -- the file types you want to highlight
-      file_types = { 'text' },
+      -- the file types you want to highlight with
+      -- the node types you would like to target
+      -- using treesitter
+      file_types = {
+        ["text"] = {
+            "any", -- highlight any node
+        },
+        -- EX: only highlights comments in lua files
+        ["lua"] = {
+            "comment",
+        },
+      },
       -- the highlighting styles applied
       -- IMPORTANT - if link is present, no other
       -- styles are applied
       hl_group_value = {
         link = "Bold",
       },
-      -- dictates the characters highlighted based
-      -- off of word length. key is word length and
-      -- value is the number of characters highlighted
-      -- note used if syllable_algorithm is on
-      hl_offsets = {
-        ['1'] = 1,
-	['2'] = 1,
-	['3'] = 2,
-	['4'] = 2,
-	['default'] = 0.4, -- defaults to 40% of the word
-      },
       -- Flag used to control if the user is prompted
       -- if BRToggle is called on a file type that is not
       -- explicitly defined above
       prompt_user = true,
-      -- The cadence of highlight word. Defaults to ever
-      -- word. Example: 2 would be every other word
-      saccade_cadence = 1,
-      -- Flag used to control if the highlighting is
-      -- applied while typing
+      -- Enable or disable the use of treesitter
+      treesitter = true,
+      -- Flag used to control if highlighting is applied as
+      -- you type
       update_in_insert_mode = true,
-      -- Flag used to dicate if the syllable_algorithm
-      -- is used. Highlights on syllables instead of 
-      -- characters based on word length. Disables the
-      -- use of hl_offset if on
-      syllable_algorithm = true,
     })
   end,
 }
 ```
 
+### TreeSitter
+
+TreeSitter is used to target node types listed in your config above. This
+allows for BionicReading to highlight as much code or as little as you would
+like. For instance, the default config highlights only comments for Lua files.
+This allows you to tweak what is highlighted on a filetype bases.
+
+NOTE: you need to have a the language parser installed for TreeSitter to work
+
+```lua
+-- example
+:TSInstall lua
+```
+
 ## Mappings
 
 No mapping are added. Feel free to map as you would like
@@ -176,12 +186,6 @@ Please see autocmd code [here](lua/bionic-reading/cmds.lua)
 
 " Toggles the auto_highlight flag
 :BRToggleAutoHighlight
-
-" Used to set the saccade_cadence
-:BRSaccadeCadence
-
-" Toggles the syllable_algorithm flag
-:BRToggleSyllableAlgorithm
 ```
 
 ## TODO
@@ -189,9 +193,7 @@ Please see autocmd code [here](lua/bionic-reading/cmds.lua)
 - [x] Add support for nvim-notify
 - [x] Prompt user to highlight file IF file type is not in config
 - [x] Add ability to toggle user prompt
-- [ ] Investigate treesitter highlighting
-- [x] Add saccade cadence
-- [x] Add user command to set saccade cadence
+- [x] Investigate treesitter highlighting
 - [x] Add syllable algorithm
 - [x] Expose highlight and clear
 - [ ] ????