Use the filetype from neovim

Author: viccon

event.go

@@ -4,6 +4,7 @@ package pulse
 type Event struct {
 	EditorID string
 	Path     string
+	Filetype string
 	Editor   string
 	OS       string
 }

git/filetypes.go

@@ -117,7 +117,7 @@ func (f FileParser) extractRepositoryName(dirPath string) (string, error) {
 // ParseFile returns a ParseFile struct from an absolute path. It will return an
 // error if the path is empty, if the path is not a file or if it can't find
 // a parent .git file or folder before it reaches the root of the file tree.
-func (f FileParser) ParseFile(absolutePath string) (pulse.GitFile, error) {
+func (f FileParser) ParseFile(absolutePath, filetype string) (pulse.GitFile, error) {
 	if absolutePath == "" {
 		return pulse.GitFile{}, ErrEmptyPath
 	}
@@ -143,21 +143,16 @@ func (f FileParser) ParseFile(absolutePath string) (pulse.GitFile, error) {
 
 	// Tries to get the filetype from either the file extension or name.
 	filename := filepath.Base(absolutePath)
-	ft, err := Filetype(filename)
-	if err != nil {
-		return pulse.GitFile{}, err
-	}
-
 	gitFile := pulse.GitFile{
 		Name:       filename,
-		Filetype:   ft,
+		Filetype:   filetype,
 		Repository: repositoryName,
 		Path:       path,
 	}
 
 	return gitFile, nil
 }
 
-func ParseFile(absolutePath string) (pulse.GitFile, error) {
-	return New().ParseFile(absolutePath)
+func ParseFile(absolutePath, filetype string) (pulse.GitFile, error) {
+	return New().ParseFile(absolutePath, filetype)
 }

git/filetypes_test.go

@@ -132,7 +132,7 @@ func TestGetRepositoryFromPath(t *testing.T) {
 
 	// This is the absolute path of the file that we want to extract the repository name for.
 	path := "/Users/conner/code/dotfiles/editors/nvim/init.lua"
-	file, err := f.ParseFile(path)
+	file, err := f.ParseFile(path, "lua")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -209,7 +209,7 @@ func TestGetRepositoryFromPathBare(t *testing.T) {
 
 	// This is the absolute path of the file that we want to extract the repository name for.
 	path := "/Users/conner/code/ore-ui/main/src/index.ts"
-	file, err := f.ParseFile(path)
+	file, err := f.ParseFile(path, "typescript")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -286,7 +286,7 @@ func TestPathInBareProject(t *testing.T) {
 
 	// This is the absolute path of the file that we want to extract the repository name for.
 	path := "/Users/conner/code/ore-ui/main/src/index.ts"
-	file, err := f.ParseFile(path)
+	file, err := f.ParseFile(path, "typescript")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -361,7 +361,7 @@ func TestPathInProject(t *testing.T) {
 
 	// This is the absolute path of the file that we want to extract the repository name for.
 	path := "/Users/conner/code/dotfiles/editors/nvim/init.lua"
-	file, err := f.ParseFile(path)
+	file, err := f.ParseFile(path, "typescript")
 	if err != nil {
 		t.Fatal(err)
 	}

git/git.go

@@ -21,18 +21,18 @@ call remote#host#RegisterPlugin('pulse-client', '0', [
 
 " We only want track time for one instance nvim instance. We
 " need to let the server know which one we have focused.
-autocmd FocusGained * :call call("OnFocusGained", [g:pulse_session_id, expand('%:p')])
+autocmd FocusGained * :call call("OnFocusGained", [g:pulse_session_id, expand('%:p'), &filetype])
 
 " Send FocusGained when we enter.
-autocmd VimEnter * :call call("OnFocusGained", [g:pulse_session_id, expand('%:p')])
+autocmd VimEnter * :call call("OnFocusGained", [g:pulse_session_id, expand('%:p'), &filetype])
 
 " Let the server know the path of the buffer. Its not a problem to send
 " temporary buffers. The server will figure it out and exit early.
-autocmd BufEnter * :call call("OpenFile", [g:pulse_session_id, expand('%:p')])
+autocmd BufEnter * :call call("OpenFile", [g:pulse_session_id, expand('%:p'), &filetype])
 
 " We are sending a heartbeart each time we write a buffer.
 " This lets the server know that our session is still active.
-autocmd BufWrite * :call call("SendHeartbeat", [g:pulse_session_id, expand('%:p')])
+autocmd BufWrite * :call call("SendHeartbeat", [g:pulse_session_id, expand('%:p'), &filetype])
 
 " When we exit VIM we inform the server that our coding session has ended.
-autocmd VimLeave * :call call("EndSession", [g:pulse_session_id, expand('%:p')])
+autocmd VimLeave * :call call("EndSession", [g:pulse_session_id, expand('%:p'), &filetype])

git/git_test.go

@@ -52,7 +52,7 @@ func New(cfg *pulse.Config, segmentPath string, sessionWriter SessionWriter, opt
 }
 
 func (s *Server) openFile(event pulse.Event) {
-	gitFile, gitFileErr := git.ParseFile(event.Path)
+	gitFile, gitFileErr := git.ParseFile(event.Path, event.Filetype)
 	if gitFileErr != nil {
 		return
 	}