More lsp support

This makes the LSP support complete for now:

- Completion
- Diagnostics
- Goto implementation/declaration
- Rename
- Documentation
- Find references

1 files changed, 18 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 9467872..cfb430a 100644
--- a/Makefile
+++ b/Makefile
@@ -22,15 +22,19 @@ HEADERS = src/dged/settings.h src/dged/minibuffer.h src/dged/keyboard.h src/dged
 	src/dged/vec.h src/dged/window.h src/dged/hash.h src/dged/undo.h src/dged/lang.h \
 	src/dged/settings-parse.h src/dged/utf8.h src/main/cmds.h src/main/bindings.h \
 	src/main/search-replace.h src/dged/location.h src/dged/buffer_view.h src/main/completion.h \
-	src/dged/timers.h src/dged/s8.h src/main/version.h src/config.h src/dged/process.h
+	src/dged/timers.h src/dged/s8.h src/main/version.h src/config.h src/dged/process.h src/dged/bufread.h \
+	src/dged/hook.h src/main/frame-hooks.h src/main/completion/buffer.h src/main/completion/command.h \
+	src/main/completion/path.h
 
 SOURCES = src/dged/binding.c src/dged/buffer.c src/dged/command.c src/dged/display.c \
 	src/dged/keyboard.c src/dged/minibuffer.c src/dged/text.c \
 	src/dged/utf8.c src/dged/buffers.c src/dged/window.c src/dged/allocator.c src/dged/undo.c \
 	src/dged/settings.c src/dged/lang.c src/dged/settings-parse.c src/dged/location.c \
-	src/dged/buffer_view.c src/dged/timers.c src/dged/s8.c src/dged/path.c src/dged/hash.c
+	src/dged/buffer_view.c src/dged/timers.c src/dged/s8.c src/dged/path.c src/dged/hash.c src/dged/bufread.c
 
-MAIN_SOURCES = src/main/main.c src/main/cmds.c src/main/bindings.c src/main/search-replace.c src/main/completion.c
+MAIN_SOURCES = src/main/main.c src/main/cmds.c src/main/bindings.c src/main/search-replace.c src/main/completion.c \
+			src/main/frame-hooks.c src/main/completion/buffer.c src/main/completion/command.c \
+			src/main/completion/path.c
 
 # HACK: added to MAIN_SOURCES to not be picked up in tests
 # since they have their own implementation
@@ -47,7 +51,7 @@ MAIN_SOURCES = src/main/main.c src/main/cmds.c src/main/bindings.c src/main/sear
 TEST_SOURCES = test/assert.c test/buffer.c test/text.c test/utf8.c test/main.c \
 	test/command.c test/keyboard.c test/fake-reactor.c test/allocator.c \
 	test/minibuffer.c test/undo.c test/settings.c test/container.c \
-	test/buflist.c
+	test/buflist.c test/bufread.c
 
 prefix ?= /usr/local
 DESTDIR ?= $(prefix)
@@ -57,11 +61,11 @@ datadir = share/dged
 .SUFFIXES: .c .o .d
 
 CFLAGS ?= -g -O2
-
 CFLAGS += -Werror -Wall -Wextra -std=c99\
 	-I $(.CURDIR)/src\
 	-I $(.CURDIR)/src/main\
-	-DDATADIR="$(prefix)/$(datadir)"
+	-DDATADIR="$(prefix)/$(datadir)"\
+	-DTEST_ROOT="$(.CURDIR)/test"
 
 ASAN ?= false
 
@@ -82,9 +86,14 @@ ASAN ?= false
 .endif
 
 .if $(LSP_ENABLE) == true
-  HEADERS += src/dged/lsp.h src/main/lsp.h src/dged/json.h
-  SOURCES += src/dged/lsp.c src/dged/json.c
-  MAIN_SOURCES += src/main/lsp.c
+  HEADERS += src/dged/lsp.h src/main/lsp.h src/dged/json.h src/dged/jsonrpc.h src/main/lsp/types.h \
+			src/main/lsp/choice-buffer.h src/main/lsp/actions.h src/main/lsp/diagnostics.h \
+			src/main/lsp/goto.h src/main/lsp/format.h src/main/lsp/completion.h src/main/lsp/rename.h \
+			src/main/lsp/help.h src/main/lsp/references.h
+  SOURCES += src/dged/lsp.c src/dged/json.c src/dged/jsonrpc.c
+  MAIN_SOURCES += src/main/lsp.c src/main/lsp/types.c src/main/lsp/choice-buffer.c src/main/lsp/actions.c \
+				src/main/lsp/diagnostics.c src/main/lsp/goto.c src/main/lsp/format.c src/main/lsp/completion.c \
+				src/main/lsp/rename.c src/main/lsp/help.c src/main/lsp/references.c
   TEST_SOURCES += test/json.c
   CFLAGS += -DLSP_ENABLED
 .endif