json highlighting

src/core/file_buffer.odin

@@ -743,6 +743,13 @@ new_file_buffer :: proc(allocator: mem.Allocator, file_path: string, base_dir: s
 
     extension := filepath.ext(fi.fullpath);
 
+    file_type: ts.LanguageType = .None
+    if extension == ".odin" {
+        file_type = .Odin
+    } else if extension == ".json" {
+        file_type = .Json
+    }
+
     if original_content, success := os.read_entire_file_from_handle(fd); success {
         defer delete(original_content)
 
@@ -763,7 +770,7 @@ new_file_buffer :: proc(allocator: mem.Allocator, file_path: string, base_dir: s
             extension = extension,
 
             // TODO: derive language type from extension
-            tree = ts.make_state(.Odin),
+            tree = ts.make_state(file_type),
             history = make_history(content),
 
             glyphs = make_glyph_buffer(width, height),

src/tree_sitter/ts.odin

@@ -42,7 +42,7 @@ foreign ts {
     node_is_null :: proc(self: Node) -> bool ---
     node_string :: proc(self: Node) -> cstring ---
 
-    query_new :: proc(language: Language, source: []u8, source_len: u32, error_offset: ^u32, error_type: ^QueryError) -> Query ---
+    query_new :: proc(language: Language, source: ^u8, source_len: u32, error_offset: ^u32, error_type: ^QueryError) -> Query ---
     query_delete :: proc(query: Query) ---
     query_cursor_new :: proc() -> QueryCursor ---
     query_cursor_exec :: proc(cursor: QueryCursor, query: Query, node: Node) ---
@@ -105,6 +105,7 @@ foreign ts_json {
 State :: struct {
     parser: Parser,
     language: Language,
+    language_type: LanguageType,
 
     tree: Tree,
     cursor: TreeCursor,
@@ -119,6 +120,7 @@ Highlight :: struct {
 }
 
 LanguageType :: enum {
+    None,
     Json,
     Odin,
 }
@@ -207,18 +209,20 @@ make_state :: proc(type: LanguageType, allocator := context.allocator) -> State
     language: Language
 
     switch (type) {
+        case .None: {}
         case .Odin: language = tree_sitter_odin()
         case .Json: language = tree_sitter_json()
     }
 
-    if !parser_set_language(parser, language) {
+    if language != nil && !parser_set_language(parser, language) {
         log.errorf("failed to set language to '%v'", type)
         return State {}
     }
 
     return State {
         parser = parser,
-        language = language
+        language = language,
+        language_type = type,
     }
 }
 
@@ -247,7 +251,10 @@ parse_buffer :: proc(state: ^State, input: Input) {
     }
 
     state.cursor = tree_cursor_new(tree_root_node(state.tree))
+
+    if state.language_type != .None {
         load_highlights(state)
+    }
 }
 
 update_cursor :: proc(state: ^State, line: int, col: int) {
@@ -274,6 +281,17 @@ update_cursor :: proc(state: ^State, line: int, col: int) {
 load_highlights :: proc(state: ^State) {
     // TODO: have this be language specific
     capture_to_color := make(map[string]theme.PaletteColor, allocator = context.temp_allocator)
+
+    switch state.language_type {
+        case .None: {}
+
+        case .Json: {
+            capture_to_color["string"] = .Green
+            capture_to_color["constant.builtin"] = .Yellow
+            capture_to_color["field"] = .Blue
+            capture_to_color["number"] = .Foreground
+        }
+        case .Odin: {
             capture_to_color["include"] = .Red
             capture_to_color["keyword.function"] = .Red
             capture_to_color["keyword.return"] = .Red
@@ -296,7 +314,22 @@ load_highlights :: proc(state: ^State) {
 
             capture_to_color["comment"] = .Gray
 
-    fd, err := os.open("../tree-sitter-odin/queries/highlights.scm")
+        }
+    }
+
+    path: string
+    switch state.language_type {
+        case .None: {}
+
+        case .Json: {
+            path = "../tree-sitter-json/queries/highlights.scm"
+        }
+        case .Odin: {
+            path = "../tree-sitter-odin/queries/highlights.scm"
+        }
+    }
+
+    fd, err := os.open(path)
     if err != nil {
         log.errorf("failed to open file: errno=%x", err)
         return
@@ -304,10 +337,10 @@ load_highlights :: proc(state: ^State) {
     defer os.close(fd);
 
     if highlight_query, success := os.read_entire_file_from_handle(fd); success {
-        error_offset: u32
+        error_offset: u32 = 0
-        error_type: QueryError
+        error_type: QueryError = .None
 
-        query := query_new(state.language, highlight_query, u32(len(highlight_query)), &error_offset, &error_type)
+        query := query_new(state.language, raw_data(highlight_query), u32(len(highlight_query)), &error_offset, &error_type)
         defer query_delete(query)
 
         if error_type != .None {