checker_path is now an array

2 files changed, 157 insertions, 139 deletions

diff --git a/src/server/check.odin b/src/server/check.odin
index cae7587..b6d8e0e 100644
--- a/src/server/check.odin
+++ b/src/server/check.odin
@@ -21,7 +21,7 @@ import "shared:common"
 //Store uris we have reported on since last save. We use this to clear them on next save.
 uris_reported := make([dynamic]string)
 
-check :: proc(path: string, writer: ^Writer, config: ^common.Config) {
+check :: proc(paths: []string, writer: ^Writer, config: ^common.Config) {
 	data := make([]byte, mem.Kilobyte * 200, context.temp_allocator)
 
 	buffer: []byte
@@ -40,186 +40,195 @@ check :: proc(path: string, writer: ^Writer, config: ^common.Config) {
 		)
 	}
 
-	command: string
+	errors := make(map[string][dynamic]Diagnostic, 0, context.temp_allocator)
 
-	if config.odin_command != "" {
-		command = config.odin_command
-	} else {
-		command = "odin"
-	}
+	for path in paths {
+		command: string
 
-	entry_point_opt :=
-		filepath.ext(path) == ".odin" ? "-file" : "-no-entry-point"
-
-	if code, ok, buffer = common.run_executable(
-		fmt.tprintf(
-			"%v check %s %s %s %s %s",
-			command,
-			path,
-			strings.to_string(collection_builder),
-			entry_point_opt,
-			config.checker_args,
-			ODIN_OS == .Linux || ODIN_OS == .Darwin ? "2>&1" : "",
-		),
-		&data,
-	); !ok {
-		log.errorf("Odin check failed with code %v for file %v", code, path)
-		return
-	}
+		if config.odin_command != "" {
+			command = config.odin_command
+		} else {
+			command = "odin"
+		}
 
-	s: scanner.Scanner
+		entry_point_opt :=
+			filepath.ext(path) == ".odin" ? "-file" : "-no-entry-point"
+
+		if code, ok, buffer = common.run_executable(
+			fmt.tprintf(
+				"%v check %s %s %s %s %s",
+				command,
+				path,
+				strings.to_string(collection_builder),
+				entry_point_opt,
+				config.checker_args,
+				ODIN_OS == .Linux || ODIN_OS == .Darwin ? "2>&1" : "",
+			),
+			&data,
+		); !ok {
+			log.errorf(
+				"Odin check failed with code %v for file %v",
+				code,
+				path,
+			)
+			return
+		}
 
-	scanner.init(&s, string(buffer))
+		s: scanner.Scanner
 
-	s.whitespace = {'\t', ' '}
+		scanner.init(&s, string(buffer))
 
-	current: rune
+		s.whitespace = {'\t', ' '}
 
-	ErrorSeperator :: struct {
-		message: string,
-		line:    int,
-		column:  int,
-		uri:     string,
-	}
+		current: rune
 
-	error_seperators := make([dynamic]ErrorSeperator, context.temp_allocator)
+		ErrorSeperator :: struct {
+			message: string,
+			line:    int,
+			column:  int,
+			uri:     string,
+		}
 
-	//find all the signatures string(digit:digit)
-	loop: for scanner.peek(&s) != scanner.EOF {
+		error_seperators := make(
+			[dynamic]ErrorSeperator,
+			context.temp_allocator,
+		)
 
-		scan_line: {
-			error: ErrorSeperator
+		//find all the signatures string(digit:digit)
+		loop: for scanner.peek(&s) != scanner.EOF {
 
-			source_pos := s.src_pos
+			scan_line: {
+				error: ErrorSeperator
 
-			if source_pos == 1 {
-				source_pos = 0
-			}
+				source_pos := s.src_pos
 
-			for scanner.peek(&s) != '(' {
-				n := scanner.scan(&s)
+				if source_pos == 1 {
+					source_pos = 0
+				}
 
-				if n == scanner.EOF {
-					break loop
+				for scanner.peek(&s) != '(' {
+					n := scanner.scan(&s)
+
+					if n == scanner.EOF {
+						break loop
+					}
+					if n == '\n' {
+						source_pos = s.src_pos - 1
+					}
 				}
-				if n == '\n' {
-					source_pos = s.src_pos - 1
+
+				error.uri = string(buffer[source_pos:s.src_pos - 1])
+
+				left_paren := scanner.scan(&s)
+
+				if left_paren != '(' {
+					break scan_line
 				}
-			}
 
-			error.uri = string(buffer[source_pos:s.src_pos - 1])
+				lhs_digit := scanner.scan(&s)
 
-			left_paren := scanner.scan(&s)
+				if lhs_digit != scanner.Int {
+					break scan_line
+				}
 
-			if left_paren != '(' {
-				break scan_line
-			}
+				line, column: int
+				ok: bool
 
-			lhs_digit := scanner.scan(&s)
+				line, ok = strconv.parse_int(scanner.token_text(&s))
 
-			if lhs_digit != scanner.Int {
-				break scan_line
-			}
+				if !ok {
+					break scan_line
+				}
 
-			line, column: int
-			ok: bool
+				seperator := scanner.scan(&s)
 
-			line, ok = strconv.parse_int(scanner.token_text(&s))
+				if seperator != ':' {
+					break scan_line
+				}
 
-			if !ok {
-				break scan_line
-			}
+				rhs_digit := scanner.scan(&s)
 
-			seperator := scanner.scan(&s)
+				if rhs_digit != scanner.Int {
+					break scan_line
+				}
 
-			if seperator != ':' {
-				break scan_line
-			}
+				column, ok = strconv.parse_int(scanner.token_text(&s))
+
+				if !ok {
+					break scan_line
+				}
 
-			rhs_digit := scanner.scan(&s)
+				right_paren := scanner.scan(&s)
 
-			if rhs_digit != scanner.Int {
-				break scan_line
-			}
+				if right_paren != ')' {
+					break scan_line
+				}
 
-			column, ok = strconv.parse_int(scanner.token_text(&s))
+				source_pos = s.src_pos
 
-			if !ok {
-				break scan_line
-			}
+				for scanner.peek(&s) != '\n' {
+					n := scanner.scan(&s)
 
-			right_paren := scanner.scan(&s)
+					if n == scanner.EOF {
+						break
+					}
+				}
 
-			if right_paren != ')' {
-				break scan_line
-			}
+				if source_pos == s.src_pos {
+					continue
+				}
 
-			source_pos = s.src_pos
+				error.message = string(buffer[source_pos:s.src_pos - 1])
+				error.column = column
+				error.line = line
 
+				append(&error_seperators, error)
+				continue loop
+			}
+
+			// line scan failed, skip to the next line
 			for scanner.peek(&s) != '\n' {
 				n := scanner.scan(&s)
-
 				if n == scanner.EOF {
 					break
 				}
 			}
+		}
 
-			if source_pos == s.src_pos {
+		for error in error_seperators {
+			if strings.contains(
+				error.message,
+				"Redeclaration of 'main' in this scope",
+			) {
 				continue
 			}
 
-			error.message = string(buffer[source_pos:s.src_pos - 1])
-			error.column = column
-			error.line = line
-
-			append(&error_seperators, error)
-			continue loop
-		}
-
-		// line scan failed, skip to the next line
-		for scanner.peek(&s) != '\n' {
-			n := scanner.scan(&s)
-			if n == scanner.EOF {
-				break
+			if error.uri not_in errors {
+				errors[error.uri] = make(
+					[dynamic]Diagnostic,
+					context.temp_allocator,
+				)
 			}
-		}
-	}
-
-	errors := make(map[string][dynamic]Diagnostic, 0, context.temp_allocator)
-
-	for error in error_seperators {
-		if strings.contains(
-			error.message,
-			"Redeclaration of 'main' in this scope",
-		) {
-			continue
-		}
 
-		if error.uri not_in errors {
-			errors[error.uri] = make(
-				[dynamic]Diagnostic,
-				context.temp_allocator,
+			append(
+				&errors[error.uri],
+				Diagnostic {
+					code = "checker",
+					severity = .Error,
+					range =  {
+						start =  {
+							character = error.column,
+							line = error.line - 1,
+						},
+						end = {character = 0, line = error.line},
+					},
+					message = error.message,
+				},
 			)
 		}
-
-		append(
-			&errors[error.uri],
-			Diagnostic {
-				code = "checker",
-				severity = .Error,
-				range =  {
-					start = {character = error.column, line = error.line - 1},
-					end = {character = 0, line = error.line},
-				},
-				message = error.message,
-			},
-		)
 	}
 
 	for uri in uris_reported {
-
-		log.errorf("clear %v", uri)
-
 		params := NotificationPublishDiagnosticsParams {
 			uri         = uri,
 			diagnostics = {},
diff --git a/src/server/requests.odin b/src/server/requests.odin
index 3da2d6c..932e9d3 100644
--- a/src/server/requests.odin
+++ b/src/server/requests.odin
@@ -445,14 +445,23 @@ read_ols_initialize_options :: proc(
 
 	for profile in ols_config.profiles {
 		if ols_config.profile == profile.name {
+			config.profile.checker_path = make(
+				[dynamic]string,
+				len(profile.checker_path),
+			)
+
 			if filepath.is_abs(ols_config.profile) {
-				config.profile.checker_path = strings.clone(
-					profile.checker_path,
-				)
+				for checker_path, i in profile.checker_path {
+					config.profile.checker_path[i] = strings.clone(
+						checker_path,
+					)
+				}
 			} else {
-				config.profile.checker_path = path.join(
-					elems = {uri.path, profile.checker_path},
-				)
+				for checker_path, i in profile.checker_path {
+					config.profile.checker_path[i] = path.join(
+						elems = {uri.path, checker_path},
+					)
+				}
 			}
 		}
 	}
@@ -1160,10 +1169,10 @@ notification_did_save :: proc(
 		log.errorf("failed to collect symbols on save %v", ret)
 	}
 
-	if config.profile.checker_path != "" {
-		check(config.profile.checker_path, writer, config)
+	if len(config.profile.checker_path) > 0 {
+		check(config.profile.checker_path[:], writer, config)
 	} else {
-		check(config.workspace_folders[0].uri, writer, config)
+		check({config.workspace_folders[0].uri}, writer, config)
 	}
 
 	return .None